Merge lp:~nik90/podbird/migrate-to-download-manager into lp:podbird/devel

[Nekhelesh Ramananthan]

- Migrated to DownloadManager to support truly multiple downloads while app is suspended.
- Integrated with the files indicator.
- Added "Downloads in Progress" to the Downloads view to keep track of all episodes that are being downloaded.

Screenshots -> http://imgur.com/a/gVnz0

[lp:~nik90/podbird/migrate-to-download-manager]

133. By Nekhelesh Ramananthan on 2016-03-15

Added Downloads in progress list in the downloaded view

134. By Nekhelesh Ramananthan on 2016-03-15

Added safety nets to ensure download manager doesn't crash podbird

135. By Nekhelesh Ramananthan on 2016-03-15

Renamed Downloaded to Downloads

[Nekhelesh Ramananthan (nik90)]

@Mike, There was a critical bug where Podbird on crashing would send the DownloadManager to misbehave. It turns out that when you send an empty url to DownloadManager, it crashes the app and also causes the internal SingleDownload{} objects to not be destroyed until you restart the udm service.

I added a safety check to ensure we never send an empty url to DownloadManager which puts the critical bug to rest. I will nonetheless report this bug upstream against udm since it should handle this better imo.

[lp:~nik90/podbird/migrate-to-download-manager]

136. By Nekhelesh Ramananthan on 2016-03-15

Added Download all button in the favourites view

137. By Nekhelesh Ramananthan on 2016-03-15

Log download errors when errorFound signal is fired

138. By Nekhelesh Ramananthan on 2016-03-15

Remove critical bug fixme since it was fixed

[Nekhelesh Ramananthan (nik90)]

The critical bug that caused Podbird to crash has been reported at https://bugs.launchpad.net/ubuntu-download-manager/+bug/1557771.

[lp:~nik90/podbird/migrate-to-download-manager]

139. By Nekhelesh Ramananthan on 2016-03-15

Merged lp:podbird/devel

140. By Nekhelesh Ramananthan on 2016-03-16

Updated all UDM imports to 1.2

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2016-03-15 23:22:35 +0000
+++ app/podbird.qml	2016-03-16 11:55:29 +0000
@@ -18,13 +18,12 @@
 
 import QtQuick 2.4
 import Podbird 1.0
-import UserMetrics 0.1
 import QtMultimedia 5.6
 import Ubuntu.Connectivity 1.0
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import "ui"
 import "themes" as Themes
 import "podcasts.js" as Podcasts
@@ -45,7 +44,6 @@
 
     Component.onDestruction: {
         console.log("[LOG]: Download cancelled");
-        downloader.cancel();
         var db = Podcasts.init()
         db.transaction(function (tx) {
             tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
@@ -139,32 +137,42 @@
         }
     }
 
-    SingleDownload {
+    Component {
+        id: singleDownloadComponent
+        SingleDownload {
+            id: singleDownloadObject
+            property string image
+            property string title
+            property string guid
+            metadata: Metadata {
+                showInIndicator: true
+                title: singleDownloadObject.title
+            }
+        }
+    }
+
+    function downloadEpisode(image, title, guid, url) {
+        var singleDownload = singleDownloadComponent.createObject(podbird, {"image": image, "title": title, "guid": guid})
+        singleDownload.download(url)
+    }
+
+    DownloadManager {
         id: downloader
-        property var queue: []
-        property string downloadingGuid
-
-        onFinished: {
+
+        property string downloadingGuid: downloads.length > 0 ? downloads[0].guid : "NULL"
+        property int progress: downloads.length > 0 ? downloads[0].progress : 0
+
+        cleanDownloads: true
+        onDownloadFinished: {
             var db = Podcasts.init();
             var finalLocation = fileManager.saveDownload(path);
             db.transaction(function (tx) {
-                tx.executeSql("UPDATE Episode SET downloadedfile=?, queued=0 WHERE guid=?", [finalLocation, downloadingGuid]);
-                queue.shift();
-                if (queue.length > 0) {
-                    downloadingGuid = queue[0][0];
-                    download(queue[0][1]);
-                } else {
-                    downloadingGuid = "";
-                }
+                tx.executeSql("UPDATE Episode SET downloadedfile=?, queued=0 WHERE guid=?", [finalLocation, download.guid]);
             });
         }
 
-        function addDownload(guid, url) {
-            queue.push([guid, url]);
-            if (queue.length == 1) {
-                downloadingGuid = guid;
-                download(url);
-            }
+        onErrorFound: {
+            console.log("[ERROR]: " + download.errorMessage)
         }
     }
 

=== modified file 'app/podcasts.js'
--- app/podcasts.js	2016-03-14 00:16:15 +0000
+++ app/podcasts.js	2016-03-16 11:55:29 +0000
@@ -342,8 +342,8 @@
             var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
             var loopCount = maxEpisodeDownload > rs2.rows.length ? rs2.rows.length : maxEpisodeDownload
             for (var j=0; j < loopCount; j++) {
-                if (!rs2.rows.item(j).downloadedfile && !rs2.rows.item(j).listened) {
-                    downloader.addDownload(rs2.rows.item(j).guid, rs2.rows.item(j).audiourl)
+                if (!rs2.rows.item(j).downloadedfile && !rs2.rows.item(j).listened && rs2.rows.item(j).audiourl) {
+                    podbird.downloadEpisode(rs.rows.item(i).image, rs2.rows.item(j).name, rs2.rows.item(j).guid, rs2.rows.item(j).audiourl)
                     tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [rs2.rows.item(j).guid]);
                 }
             }

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-14 23:06:06 +0000
+++ app/ui/EpisodesPage.qml	2016-03-16 11:55:29 +0000
@@ -20,7 +20,7 @@
 import QtMultimedia 5.6
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import Ubuntu.Components.Popups 1.3
 import "../podcasts.js" as Podcasts
 import "../components"
@@ -506,7 +506,11 @@
                                     tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
                                 });
                                 episodeModel.setProperty(model.index, "queued", 1)
-                                downloader.addDownload(model.guid, model.audiourl);
+                                if (model.audiourl) {
+                                    podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl)
+                                } else {
+                                    console.log("[ERROR]: Invalid download url: " + model.audiourl)
+                                }
                             }
                         }
                     },

=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2016-03-14 00:41:21 +0000
+++ app/ui/EpisodesTab.qml	2016-03-16 11:55:29 +0000
@@ -20,7 +20,7 @@
 import QtMultimedia 5.6
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import Ubuntu.Components.Popups 1.3
 import "../podcasts.js" as Podcasts
 import "../components"
@@ -83,7 +83,7 @@
 
                 Action {
                     iconName: "save"
-                    visible: episodesPageHeaderSections.selectedIndex === 0
+                    visible: episodesPageHeaderSections.selectedIndex !== 1
                     text: i18n.tr("Download all")
                     onTriggered: {
                         var db = Podcasts.init();
@@ -92,7 +92,11 @@
                                 if (!episodesModel.get(i).downloadedfile) {
                                     episodesModel.setProperty(i, "queued", 1)
                                     tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodesModel.get(i).guid]);
-                                    downloader.addDownload(episodesModel.get(i).guid, episodesModel.get(i).audiourl);
+                                    if (episodesModel.get(i).audiourl) {
+                                        podbird.downloadEpisode(episodesModel.get(i).image, episodesModel.get(i).name, episodesModel.get(i).guid, episodesModel.get(i).audiourl)
+                                    } else {
+                                        console.log("[ERROR]: Invalid download url: " + episodesModel.get(i).audiourl)
+                                    }
                                 }
                             }
                         });
@@ -131,7 +135,7 @@
                     selectedSectionColor: podbird.appTheme.focusText
                 }
 
-                model: [i18n.tr("Recent"), i18n.tr("Downloaded"), i18n.tr("Favourites")]
+                model: [i18n.tr("Recent"), i18n.tr("Downloads"), i18n.tr("Favourites")]
                 onSelectedIndexChanged: {
                     refreshModel();
                 }
@@ -184,7 +188,7 @@
                 verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
             }
 
-            sourceComponent: episodesModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
+            sourceComponent: (episodesModel.count === 0 || sortedEpisodeModel.count === 0) && downloader.downloads.length === 0 ? emptyStateComponent : undefined
         }
 
         Component {
@@ -332,9 +336,60 @@
 
             clip: true
             model: sortedEpisodeModel
+
+            header: Column {
+                width: episodeList.width
+                visible: height !== 0
+                height: downloader.downloads.length > 0 && episodesPageHeaderSections.selectedIndex === 1 ? childrenRect.height : 0
+
+                HeaderListItem {
+                    title.text: i18n.tr("Downloads in progress")
+                }
+
+                Repeater {
+                    model: downloader.downloads
+                    delegate: ListItem {
+                        divider.visible: false
+                        height: inProgressLayout.height
+                        SlotsLayout {
+                            id: inProgressLayout
+
+                            Image {
+                                height: width
+                                width: units.gu(6)
+                                source: modelData.image !== undefined ? modelData.image : Qt.resolvedUrl("../graphics/podbird.png")
+                                SlotsLayout.position: SlotsLayout.Leading
+                                sourceSize { width: width; height: height }
+                            }
+
+                            mainSlot: Column {
+                                spacing: units.gu(0.5)
+
+                                Label {
+                                    text: modelData.title
+                                    width: parent.width
+                                    elide: Text.ElideRight
+                                }
+
+                                CustomProgressBar {
+                                    width: parent.width
+                                    height: modelData.progress > 0 ? units.dp(5) : 0
+                                    progress: modelData.progress
+                                    indeterminateProgress: modelData.progress < 0 || modelData.progress > 100
+                                }
+                            }
+                        }
+                    }
+                }
+
+                HeaderListItem {
+                    title.text: i18n.tr("Downloaded episodes")
+                    visible: sortedEpisodeModel.count !== 0 || episodesModel.count !== 0
+                }
+            }
+
             section.property: "diff"
             section.labelPositioning: ViewSection.InlineLabels
-
             section.delegate: ListItem {
                 height: headerText.title.text !== "" ? headerText.height + divider.height : units.gu(0)
                 divider.anchors.leftMargin: units.gu(2)
@@ -439,7 +494,11 @@
                                         tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
                                     });
                                     episodesModel.setProperty(model.index, "queued", 1)
-                                    downloader.addDownload(model.guid, model.audiourl);
+                                    if (model.audiourl) {
+                                        podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl)
+                                    } else {
+                                        console.log("[ERROR]: Invalid download url: " + model.audiourl)
+                                    }
                                 }
                             }
                         },

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-03-14 12:21:24 +0000
+++ app/ui/PodcastsTab.qml	2016-03-16 11:55:29 +0000
@@ -20,7 +20,7 @@
 import QtMultimedia 5.6
 import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import Ubuntu.Components.Popups 1.0
 import "../podcasts.js" as Podcasts
 import "../components"

=== modified file 'po/podbird.nik90.pot'
--- po/podbird.nik90.pot	2016-03-15 23:22:35 +0000
+++ po/podbird.nik90.pot	2016-03-16 11:55:29 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-16 04:49+0530\n"
+"POT-Creation-Date: 2016-03-16 04:57+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -167,7 +167,7 @@
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:172
+#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:176
 msgid "Search episode"
 msgstr ""
 
@@ -185,11 +185,11 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:294
+#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:298
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:235 ../app/ui/EpisodesTab.qml:306
+#: ../app/ui/EpisodesPage.qml:235 ../app/ui/EpisodesTab.qml:310
 #: ../app/ui/SearchPage.qml:170
 msgid "Close"
 msgstr ""
@@ -210,7 +210,7 @@
 msgid "Listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:414 ../app/ui/EpisodesTab.qml:134
+#: ../app/ui/EpisodesPage.qml:414
 msgid "Downloaded"
 msgstr ""
 
@@ -218,59 +218,71 @@
 msgid "Download all"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:104
+#: ../app/ui/EpisodesTab.qml:108
 msgid "Delete all"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:134
+#: ../app/ui/EpisodesTab.qml:138
 msgid "Recent"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:134
+#: ../app/ui/EpisodesTab.qml:138
+msgid "Downloads"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:138
 msgid "Favourites"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:197
+#: ../app/ui/EpisodesTab.qml:201
 msgid "No New Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:199
+#: ../app/ui/EpisodesTab.qml:203
 msgid "No Downloaded Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:201
+#: ../app/ui/EpisodesTab.qml:205
 msgid "No Favourited Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:203
+#: ../app/ui/EpisodesTab.qml:207
 msgid "No Episodes Found"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:209
+#: ../app/ui/EpisodesTab.qml:213
 msgid "No more episodes to listen to!"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:211
+#: ../app/ui/EpisodesTab.qml:215
 msgid "No episodes have been downloaded for offline listening"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:213
+#: ../app/ui/EpisodesTab.qml:217
 msgid "No episodes have been favourited."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:215
+#: ../app/ui/EpisodesTab.qml:219
 msgid "No Episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:347
+#: ../app/ui/EpisodesTab.qml:346
+msgid "Downloads in progress"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:386
+msgid "Downloaded episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:402
 msgid "Today"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:351
+#: ../app/ui/EpisodesTab.qml:406
 msgid "Yesterday"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:355
+#: ../app/ui/EpisodesTab.qml:410
 msgid "Older"
 msgstr ""
 
@@ -527,10 +539,10 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/fix-playlist-source-truncation-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/add-download-manager-build/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/fix-playlist-source-truncation-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/add-download-manager-build/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""