Merge lp:~dano6/podbird/podbird into lp:podbird

[Daniel Kutka]

Implemented restoring queue, resuming of episode where stopped and fixed some playback issues

This MR brings restoring queue after restart and restoring playback position (optional). Seeking slider behavior was ported from music-app, that fixes some playback issues - sluggish seeking, getting weird loop after seeking, brings overall better responsiveness of controlling audio.

[Michael Sheldon (michael-sheldon)]

Overall this has some excellent improvements, thanks very much! There's a couple of minor things to address that I've added as diff comments

review: Needs Fixing

[Daniel Kutka (dano6)]

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Excellent, thanks very much!

review: Approve

[lp:~dano6/podbird/podbird]

210. By Michael Sheldon on 2020-07-09

Merge lp:~dano6/podbird/podbird:

* Restore queue after restart
* Fix resuming playback
* Fix some playback/seeking issues

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2020-06-30 11:10:05 +0000
+++ app/podbird.qml	2020-07-09 11:20:38 +0000
@@ -42,13 +42,6 @@
     theme.name: settings.themeName == "Dark.qml" ? "Ubuntu.Components.Themes.SuruDark"
                                                  : "Ubuntu.Components.Themes.Ambiance"
 
-    Component.onDestruction: {
-        var db = Podcasts.init()
-        db.transaction(function (tx) {
-            tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
-        })
-        Podcasts.clearQueue()
-    }
 
     // RefreshModel function to call refreshModel() function of the tab currently
     // visible on application start.
@@ -62,9 +55,6 @@
 
     Component.onCompleted: {
         var db = Podcasts.init()
-        db.transaction(function (tx) {
-            tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
-        })
 
         var today = new Date()
         // Only automatically check for podcasts on launch once every 12 hours
@@ -126,6 +116,8 @@
         property bool showListView: true
         property int skipForward: 30
         property int skipBack: 10
+        property bool continueWhereStopped: true
+        property int playlistIndex: -1
         property bool downloadOverWifiOnly: true
     }
 
@@ -232,14 +224,15 @@
             // but media-hub doesn't report it correctly
             console.log("Starting playback")
             player.play()
-            player.restorePosition()
         }
     }
 
     MediaPlayer {
         id: player
 
-        onPositionChanged: console.log("DEBUG: player position changed to: ", position)
+        onPositionChanged: {
+            restorePosition()
+        }
 
         // Wrapper function around decodeURIComponent() to prevent exceptions
         // from bubbling up to the app.
@@ -277,26 +270,41 @@
                 savePosition()
             } else {
                 play()
-                // Clear the last saved position when we start playing again
-                clearPosition()
             }
         }
 
         function savePosition() {
+            podbird.settings.playlistIndex = playlist.currentIndex
             if (currentGuid) {
                 var db = Podcasts.init()
                 db.transaction(function (tx) {
                     tx.executeSql("UPDATE Episode SET position=? WHERE guid=?", [player.position, currentGuid])
                     tx.executeSql("UPDATE Queue SET position=? WHERE guid=?", [player.position, currentGuid])
+                    if(player.position / player.duration > 0.90)
+                        tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [currentGuid])
                 })
             }
         }
 
+        function restoreFromQueue() {
+            var db = Podcasts.init()
+            db.transaction(function (tx) {
+                var rs = tx.executeSql("SELECT * FROM Queue")
+                for (var i=0; i<rs.rows.length;i++) {
+                    var episode = rs.rows.item(i)
+                    player.playlist.addItem(episode.url)
+                }
+            })
+            if(playlist.itemCount > podbird.settings.playlistIndex)
+                playlist.currentIndex = podbird.settings.playlistIndex
+        }
+
         function restorePosition() {
-            if (playbackState === MediaPlayer.PlayingState && pendingSeek !== 0) {
-                player.seek(pendingSeek)
-                player.clearPosition()
-                pendingSeek = 0;
+            if(playbackState === MediaPlayer.PlayingState && status === MediaPlayer.Loaded && pendingSeek){
+                //ugly hack because seek function does not seems to work async
+                var p = pendingSeek
+                pendingSeek = 0
+                player.seek(p)
             }
         }
 
@@ -345,7 +353,6 @@
         }
 
         property bool endOfMedia: false
-        property double progress: 0
         property int pendingSeek: 0
 
         playlist: Playlist {
@@ -361,16 +368,10 @@
                 currentArtist = meta.artist
                 currentImage = meta.image
                 currentGuid = meta.guid
-                player.pendingSeek = meta.position
-                console.log("DEBUG: player.pendingSeek: ", player.pendingSeek, " meta.position ", meta.position)
+                player.pendingSeek = podbird.settings.continueWhereStopped && meta.position > 5000 ? meta.position : 0
             }
         }
 
-        onPlaybackStateChanged: {
-            console.log("DEBUG: Restoring Position to: ", player.position)
-            restorePosition()
-        }
-
         onStatusChanged: {
             if (status === MediaPlayer.EndOfMedia) {
                 console.log("[LOG]: End of Media. Stopping.")
@@ -399,6 +400,10 @@
         Component.onDestruction: {
             savePosition()
         }
+
+        Component.onCompleted: {
+            restoreFromQueue()
+        }
     }
 
     PageStack {
 
=== modified file 'app/podcasts.js'
--- app/podcasts.js	2017-01-03 00:02:16 +0000
+++ app/podcasts.js	2020-07-09 11:20:38 +0000
@@ -104,6 +104,10 @@
     db.transaction(function(tx) {
         tx.executeSql("DELETE FROM Queue");
     });
+
+    db.transaction(function (tx) {
+        tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
+    });
 }
 
 function lookup(source) {
 
=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2019-10-18 11:56:16 +0000
+++ app/ui/EpisodesPage.qml	2020-07-09 11:20:38 +0000
@@ -574,8 +574,8 @@
 
                 subtitle.text: model.duration === 0 || model.duration === undefined ? model.downloadedfile ? "📎 " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
                                                                                                            : Qt.formatDate(new Date(model.published), "MMM d, yyyy")
-                                                                                    : model.downloadedfile ? "📎 " + Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
-                                                                                                           : Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
+                : model.downloadedfile ? "📎 " + (model.position ? Podcasts.formatEpisodeTime(model.position/1000) + "/" : "") + Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
+                : (model.position ? Podcasts.formatEpisodeTime(model.position/1000) + "/" : "") + Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
                 subtitle.color: podbird.appTheme.baseSubText
 
                 padding.top: units.gu(1)
 
=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2019-03-26 10:39:53 +0000
+++ app/ui/EpisodesTab.qml	2020-07-09 11:20:38 +0000
@@ -544,8 +544,8 @@
 
                     subtitle.text: model.duration === 0 || model.duration === undefined ? model.downloadedfile ? "📎 " + model.artist
                                                                                                                : model.artist
-                                                                                        : model.downloadedfile ? "📎 " + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
-                                                                                                               : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
+                    : model.downloadedfile ? "📎 " + (model.position ? Podcasts.formatEpisodeTime(model.position/1000) + "/" : "") + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
+                    : (model.position ? Podcasts.formatEpisodeTime(model.position/1000) + "/" : "") + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
                     subtitle.color: podbird.appTheme.baseSubText
 
                     Image {
@@ -747,9 +747,9 @@
                                 episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
                             }
                         } else if (diff >= 7) {
-                          if (episode.downloadedfile != null) {
-                            episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
-                          }
+                            if (episode.downloadedfile != null) {
+                                episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
+                            }
                         }
                     }
 
 
=== modified file 'app/ui/FullPlayingView.qml'
--- app/ui/FullPlayingView.qml	2017-01-01 14:28:51 +0000
+++ app/ui/FullPlayingView.qml	2020-07-09 11:20:38 +0000
@@ -133,10 +133,24 @@
             maximumValue: player.duration
             value: player.position
             height: units.gu(2)
-            
-            onValueChanged: {
-                if (pressed) {
-                    player.seek(value);
+
+            property bool seeking: false
+            property bool seeked: false
+
+            onSeekingChanged: {
+                if (seeking === false) {
+                    startTime.text = Podcasts.formatTime(player.position / 1000)
+                }
+            }
+
+            onPressedChanged: {
+                seeking = pressed
+
+                if (!pressed) {
+                    seeked = true
+                    player.seek(value)
+
+                    startTime.text = Podcasts.formatTime(value / 1000)
                 }
             }
             
@@ -146,7 +160,16 @@
         
         Connections {
             target: player
-            onPositionChanged: scrubber.value = player.position
+            onPositionChanged: {
+                // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)
+                if (scrubber.seeking === false && !scrubber.seeked) {
+                    startTime.text = Podcasts.formatTime(player.position / 1000)
+                    endTime.text = Podcasts.formatTime(player.duration / 1000)
+
+                    scrubber.value = player.position
+                }
+                scrubber.seeked = false;
+            }
         }
         
         Label {
 
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2016-12-11 21:23:21 +0000
+++ app/ui/SettingsPage.qml	2020-07-09 11:20:38 +0000
@@ -180,6 +180,20 @@
                 onClicked: PopupUtils.open(skipBackDialog, settingsPage);
             }
 
+            ListItem {
+                ListItemLayout {
+                    id: continueWhereStopped
+                    title.text: i18n.tr("Continue where stopped")
+                    Switch {
+                        SlotsLayout.position: SlotsLayout.Last
+                        checked: podbird.settings.continueWhereStopped
+                        onClicked: podbird.settings.continueWhereStopped = checked
+                    }
+                }
+                divider.visible: false
+                height: gridViewLayout.height
+            }
+
             HeaderListItem {
                 title.text: i18n.tr("Podcast Episode Settings")
             }