test ci

.github/workflows/01_make_patch.yml → .github/workflows/make_patch.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Create diff
         run: |
@@ -17,19 +17,20 @@ jobs:
           cp patch/*.qml patch/*.png patch/*.js patch/*.svg patch/*.qm .github/patch_data |:
 
       - name: Upload build result
-        uses: actions/upload-artifact@v2
+        id: artifact-upload-step
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.head_ref }}
           path: .github/patch_data
 
       - name: 'Comment PR'
-        uses: actions/github-script@v3
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            github.issues.createComment({
+            github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'Hello @${{ github.event.pull_request.user.login }}\nYour patch is ready as Artifact inside of [Checks](https://github.com/sailfishos-patches/sailfish-qml/pull/${{ github.event.pull_request.number }}/checks)\n\nTrying to get direct download link in couple of seconds...'
+              body: 'Hello @${{ github.event.pull_request.user.login }}\nYour patch is ready!\n\n[Download link](${{ steps.artifact-upload-step.outputs.artifact-url }})'
             })

usr/lib/jolla-mediaplayer/plugins/jolla/AlbumPage.qml

@@ -0,0 +1,151 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Media 1.0
+import com.jolla.mediaplayer 1.0
+
+Page {
+    id: albumPage
+
+    property var media
+
+    Loader {
+        active: albumPage.isLandscape && coverArt.source != ""
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: parent.horizontalCenter
+            right: parent.right
+        }
+
+        Component.onCompleted: setSource("CoverArtHolder.qml", { "view": view, "coverArt": coverArt })
+    }
+
+    CoverArt {
+        id: coverArt
+
+        // re-evaluate when state changes
+        source: (albumArtProvider.extracting || true) ? albumArtProvider.albumArt(media.title, media.author) : ""
+    }
+
+    MediaPlayerListView {
+        id: view
+
+        model: GriloTrackerModel {
+            query: {
+                //: placeholder string for albums without a known name
+                //% "Unknown album"
+                var unknownAlbum = qsTrId("mediaplayer-la-unknown-album")
+
+                //: placeholder string to be shown for media without a known artist
+                //% "Unknown artist"
+                var unknownArtist = qsTrId("mediaplayer-la-unknown-artist")
+
+                return AudioTrackerHelpers.getSongsQuery(albumHeader.searchText,
+                                                         {"unknownArtist": unknownArtist,
+                                                             "unknownAlbum": unknownAlbum,
+                                                             "authorId": media.get("tracker-urn"),
+                                                             "albumId": media.id})
+            }
+        }
+
+        contentWidth: albumPage.width
+
+        PullDownMenu {
+            MenuItem {
+                //: Shuffle all menu entry in album page
+                //% "Shuffle all"
+                text: qsTrId("mediaplayer-me-album-shuffle-all")
+                onClicked: AudioPlayer.shuffleAndPlay(view.model, view.count)
+            }
+
+            NowPlayingMenuItem { }
+
+            MenuItem {
+                //: Search menu entry
+                //% "Search"
+                text: qsTrId("mediaplayer-me-search")
+                onClicked: albumHeader.enableSearch()
+                enabled: view.count > 0 || albumHeader.searchText !== ''
+            }
+        }
+
+        ViewPlaceholder {
+            //: Placeholder text for an empty search view
+            //% "No items found"
+            text: qsTrId("mediaplayer-la-empty-search")
+            enabled: view.count === 0 && !busyIndicator.running
+        }
+
+        PageBusyIndicator {
+            id: busyIndicator
+
+            running: view.model.fetching
+        }
+
+        Component {
+            id: addPageComponent
+            AddToPlaylistPage { }
+        }
+
+        header: SearchPageHeader {
+            id: albumHeader
+            width: albumPage.isLandscape ? view.contentWidth : view.width
+
+            //: header for the page showing the songs that don't belong to a known album
+            //% "Unknown album"
+            title: media.title !== "" ? media.title : qsTrId("mediaplayer-la-unknown-album")
+
+            //: All songs search field placeholder text
+            //% "Search song"
+            placeholderText: qsTrId("mediaplayer-tf-album-search")
+
+            coverArt: albumPage.isLandscape ? null : coverArt
+        }
+
+        delegate: MediaListDelegate {
+            id: delegate
+
+            property var itemMedia: media
+
+            formatFilter: albumHeader.searchText
+            menu: menuComponent
+            onClicked: AudioPlayer.play(view.model, index)
+
+            ListView.onAdd: AddAnimation { target: delegate }
+            ListView.onRemove: animateRemoval()
+
+            function remove() {
+                AudioPlayer.remove(itemMedia, delegate, playlists)
+            }
+
+            Component {
+                id: menuComponent
+
+                ContextMenu {
+                    width: view.contentWidth
+
+                    MenuItem {
+                        //: Add to playlist context menu item in album page
+                        //% "Add to playlist"
+                        text: qsTrId("mediaplayer-me-album-add-to-playlist")
+                        onClicked: pageStack.animatorPush(addPageComponent, {media: itemMedia})
+                    }
+                    MenuItem {
+                        //: Add to playing queue context menu item in album page
+                        //% "Add to playing queue"
+                        text: qsTrId("mediaplayer-me-album-add-to-playing-queue")
+                        onClicked: AudioPlayer.addToQueue(itemMedia)
+                    }
+                    MenuItem {
+                        //: Delete item
+                        //% "Delete"
+                        text: qsTrId("mediaplayer-me-all-songs-delete")
+                        onClicked: remove()
+                    }
+                }
+            }
+        }
+    }
+}

usr/lib/jolla-mediaplayer/plugins/jolla/AlbumsPage.qml

@@ -0,0 +1,104 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import com.jolla.mediaplayer 1.0
+import Nemo.Thumbnailer 1.0
+
+Page {
+    id: albumsPage
+
+    property var model
+    property string searchText
+
+    TrackerQueriesBuilder {
+        id: queriesBuilder
+    }
+
+    MediaPlayerListView {
+        id: view
+
+        property string query: queriesBuilder.getAlbumsQuery(albumsHeader.searchText)
+
+        model: albumsPage.model
+
+        Binding {
+            target: albumsPage.model.source
+            property: "query"
+            value: view.query
+        }
+
+        PullDownMenu {
+            NowPlayingMenuItem { }
+
+            MenuItem {
+                //: Search menu entry
+                //% "Search"
+                text: qsTrId("mediaplayer-me-search")
+                onClicked: albumsHeader.enableSearch()
+                enabled: view.count > 0 || albumsHeader.searchText !== ''
+            }
+        }
+
+        ViewPlaceholder {
+            text: {
+                if (albumsHeader.searchText !== '') {
+                    //: Placeholder text for an empty search view
+                    //% "No items found"
+                    return qsTrId("mediaplayer-la-empty-search")
+                } else {
+                    //: Placeholder text for an empty view
+                    //% "Get some media"
+                    return qsTrId("mediaplayer-la-get-some-media")
+                }
+            }
+            enabled: view.count === 0 && !busyIndicator.running
+        }
+
+        PageBusyIndicator {
+            id: busyIndicator
+
+            running: albumsPage.model.source.fetching
+        }
+
+        header: SearchPageHeader {
+            id: albumsHeader
+            width: parent.width
+
+            //: title for the Albums page
+            //% "Albums"
+            title: qsTrId("mediaplayer-he-albums")
+
+            //: Albums search field placeholder text
+            //% "Search album"
+            placeholderText: qsTrId("mediaplayer-tf-albums-search")
+
+            searchText: albumsPage.searchText
+            Component.onCompleted: if (searchText !== '') enableSearch()
+        }
+
+        delegate: MediaContainerListDelegate {
+            id: delegate
+
+            contentHeight: albumArt.height
+            leftPadding: albumArt.width + Theme.paddingLarge
+            formatFilter: albumsHeader.searchText
+            title: media.title
+            subtitle: media.author
+            titleFont.pixelSize: Theme.fontSizeLarge
+            subtitleFont.pixelSize: Theme.fontSizeMedium
+            onClicked: pageStack.animatorPush(Qt.resolvedUrl("AlbumPage.qml"), {media: media})
+
+            ListView.onAdd: AddAnimation { target: delegate }
+            ListView.onRemove: animateRemoval()
+
+            AlbumArt {
+                id: albumArt
+
+                // re-evaluate when state changes
+                source: (albumArtProvider.extracting || true) ? albumArtProvider.albumThumbnail(title, subtitle) : ""
+                highlighted: delegate.highlighted
+            }
+        }
+    }
+}