Merge lp:~nik90/podbird/devel-branch-sync-5 into lp:podbird

[Nekhelesh Ramananthan]

Cherry-pick final fixes from lp:podbird/devel

This MP cherrypicks the following fixes from lp:podbird/devel,
- Add instructions for viewing hidden actions by right clicking for desktop users (rev 148)
- Add missing action text entries (rev 149)
- Fix spelling of ok (rev 151)
- Updated framework to 15.04.5 (rev 152)
- Store download related data that needs to persist across app reboots in that download's custom metadata (rev 154)
- Added settings option to disable downloads over cellular data (rev 155)
- Fix for download duplication when restarting Podbird (rev 156)
- Updated pot file

[Michael Sheldon (michael-sheldon)]

Couple of small string fixes needed (see inline diffs), otherwise this looks good :)

review: Needs Fixing

[lp:~nik90/podbird/devel-branch-sync-5]

168. By Nekhelesh Ramananthan on 2016-12-05

Fixed few strings pointed by Michael for consistency reasons (rev 158)

[Nekhelesh Ramananthan (nik90)]

Hi Mike, Fixed all the strings as you pointed out. I think this MP is ready. Working to get the prerequisite branch lp:~nik90/podbird/devel-branch-sync-4 ready as well.

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2016-12-05 17:43:50 +0000
+++ app/podbird.qml	2016-12-05 17:43:50 +0000
@@ -43,7 +43,6 @@
                                                  : "Ubuntu.Components.Themes.Ambiance"
 
     Component.onDestruction: {
-        console.log("[LOG]: Download cancelled");
         var db = Podcasts.init()
         db.transaction(function (tx) {
             tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
@@ -79,12 +78,21 @@
             settings.lastCheck = today
         }
 
-        if (!NetworkingStatus.online || settings.maxEpisodeDownload === -1) {
-            console.log("[LOG]: Skipped autodownloading of new episodes...")
-            console.log("[LOG]: Online connectivity: " + NetworkingStatus.online)
-            console.log("[LOG]: User settings (maxEpisodeDownload): " + settings.maxEpisodeDownload)
-        } else {
-            Podcasts.autoDownloadEpisodes(settings.maxEpisodeDownload)
+        delayStartTimer.start();
+    }
+
+    Timer {
+        id: delayStartTimer
+        interval: 500
+        repeat: false
+        onTriggered: {
+            if (!NetworkingStatus.online || podbird.settings.maxEpisodeDownload === -1) {
+                console.log("[LOG]: Skipped autodownloading of new episodes...")
+                console.log("[LOG]: Online connectivity: " + NetworkingStatus.online)
+                console.log("[LOG]: User settings (maxEpisodeDownload): " + podbird.settings.maxEpisodeDownload)
+            } else {
+                Podcasts.autoDownloadEpisodes(podbird.settings.maxEpisodeDownload)
+            }
         }
     }
 
@@ -118,6 +126,7 @@
         property bool showListView: true
         property int skipForward: 30
         property int skipBack: 10
+        property bool downloadOverWifiOnly: true
     }
 
     FileManager {
@@ -167,27 +176,43 @@
             metadata: Metadata {
                 showInIndicator: true
                 title: singleDownloadObject.title
+                custom: {"guid": singleDownloadObject.guid, "image" : singleDownloadObject.image}
             }
         }
     }
 
-    function downloadEpisode(image, title, guid, url) {
-        var singleDownload = singleDownloadComponent.createObject(podbird, {"image": image, "title": title, "guid": guid})
+    function downloadEpisode(image, title, guid, url, disableMobileDownload) {
+        if(downloader.isDownloadInQueue(guid)) {
+            console.log("[LOG]: Download with GUID of :"+guid+ " is already in the download queue.")
+            return false;
+        }
+
+        var singleDownload = singleDownloadComponent.createObject(podbird, {"image": image, "title": title, "guid": guid, allowMobileDownload : !disableMobileDownload })
         singleDownload.download(url)
     }
 
     DownloadManager {
         id: downloader
 
-        property string downloadingGuid: downloads.length > 0 ? downloads[0].guid : "NULL"
+        property string downloadingGuid: downloads.length > 0 ? downloads[0].metadata.custom.guid : "NULL"
         property int progress: downloads.length > 0 ? downloads[0].progress : 0
 
         cleanDownloads: true
+
+        function isDownloadInQueue ( guid ) {
+            for( var i=0; i < downloads.length; i++) {
+                if( downloads[i].metadata.custom.guid && guid === downloads[i].metadata.custom.guid) {
+                    return true ;
+                }
+            }
+            return false;
+        }
+
         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, download.guid]);
+                tx.executeSql("UPDATE Episode SET downloadedfile=?, queued=0 WHERE guid=?", [finalLocation, download.metadata.custom.guid]);
             });
         }
 

=== modified file 'app/podcasts.js'
--- app/podcasts.js	2016-03-28 22:38:59 +0000
+++ app/podcasts.js	2016-12-05 17:43:50 +0000
@@ -356,12 +356,13 @@
         var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
         for (var i=0; i < rs.rows.length; i++) {
             var podcast = rs.rows.item(i);
-            var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
+            var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [podcast.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 && 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]);
+                var  episode = rs2.rows.item(j);
+                if ( !episode.downloadedfile && !episode.listened && episode.audiourl && !episode.queued ) {
+                    podbird.downloadEpisode(podcast.image, episode.name, episode.guid, episode.audiourl, podbird.settings.downloadOverWifiOnly)
+                    tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episode.guid]);
                 }
             }
         }

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-28 20:51:01 +0000
+++ app/ui/EpisodesPage.qml	2016-12-05 17:43:50 +0000
@@ -166,7 +166,7 @@
                                     episodeModel.setProperty(index, "queued", 1)
                                     tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodeModel.get(index).guid]);
                                     if (episodeModel.get(index).audiourl) {
-                                        podbird.downloadEpisode(episodeModel.get(index).image, episodeModel.get(index).name, episodeModel.get(index).guid, episodeModel.get(index).audiourl)
+                                        podbird.downloadEpisode(episodeModel.get(index).image, episodeModel.get(index).name, episodeModel.get(index).guid, episodeModel.get(index).audiourl, false)
                                     } else {
                                         console.log("[ERROR]: Invalid download url: " + episodeModel.get(index).audiourl)
                                     }
@@ -602,6 +602,7 @@
                 actions: [
                     Action {
                         iconName: model.listened ? "view-collapse" : "select"
+                        text: model.listened ? i18n.tr("Mark as unheard") : i18n.tr("Mark as listened")
                         onTriggered: {
                             var db = Podcasts.init();
                             db.transaction(function (tx) {
@@ -617,6 +618,7 @@
                     Action {
                         enabled: downloader.downloadingGuid !== model.guid
                         iconName: model.downloadedfile ? "delete" : (model.queued && downloader.downloadingGuid !== model.guid ? "history" : "save")
+                        text: model.downloadedfile ? i18n.tr("Delete downloaded file") : (model.queued && downloader.downloadingGuid !== model.guid ? i18n.tr("Queued") : i18n.tr("Download"))
                         onTriggered: {
                             var db = Podcasts.init();
                             if (model.downloadedfile) {
@@ -631,7 +633,7 @@
                                 });
                                 episodeModel.setProperty(model.index, "queued", 1)
                                 if (model.audiourl) {
-                                    podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl)
+                                    podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl, false)
                                 } else {
                                     console.log("[ERROR]: Invalid download url: " + model.audiourl)
                                 }
@@ -641,6 +643,7 @@
 
                     Action {
                         iconName: "add-to-playlist"
+                        text: i18n.tr("Add to playlist")
                         onTriggered: {
                             var url = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl
                             player.addEpisodeToQueue(model.guid, model.image, model.name, model.artist, url)
@@ -649,6 +652,7 @@
 
                     Action {
                         iconName: model.favourited ? "unlike" : "like"
+                        text: model.favourited ? i18n.tr("Unfavourite") : i18n.tr("Favourite")
                         onTriggered: {
                             var db = Podcasts.init();
                             db.transaction(function (tx) {
@@ -663,6 +667,7 @@
 
                     Action {
                         iconName: "info"
+                        text: i18n.tr("Show episode description")
                         onTriggered: {
                             var popup = PopupUtils.open(episodeDescriptionDialog, episodesPage);
                             popup.description = model.description

=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2016-03-19 13:54:27 +0000
+++ app/ui/EpisodesTab.qml	2016-12-05 17:43:50 +0000
@@ -183,7 +183,7 @@
                                         episodesModel.setProperty(index, "queued", 1)
                                         tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodesModel.get(index).guid]);
                                         if (episodesModel.get(index).audiourl) {
-                                            podbird.downloadEpisode(episodesModel.get(index).image, episodesModel.get(index).name, episodesModel.get(index).guid, episodesModel.get(index).audiourl)
+                                            podbird.downloadEpisode(episodesModel.get(index).image, episodesModel.get(index).name, episodesModel.get(index).guid, episodesModel.get(index).audiourl, false)
                                         } else {
                                             console.log("[ERROR]: Invalid download url: " + episodesModel.get(index).audiourl)
                                         }
@@ -468,7 +468,7 @@
                             Image {
                                 height: width
                                 width: units.gu(6)
-                                source: modelData.image !== undefined ? modelData.image : Qt.resolvedUrl("../graphics/podbird.png")
+                                source: modelData.metadata.custom.image !== undefined ? modelData.metadata.custom.image : Qt.resolvedUrl("../graphics/podbird.png")
                                 SlotsLayout.position: SlotsLayout.Leading
                                 sourceSize { width: width; height: height }
                             }
@@ -477,7 +477,7 @@
                                 spacing: units.gu(0.5)
 
                                 Label {
-                                    text: modelData.title
+                                    text: modelData.metadata.title
                                     width: parent.width
                                     elide: Text.ElideRight
                                 }
@@ -597,7 +597,7 @@
                                     });
                                     episodesModel.setProperty(model.index, "queued", 1)
                                     if (model.audiourl) {
-                                        podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl)
+                                        podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl, false)
                                     } else {
                                         console.log("[ERROR]: Invalid download url: " + model.audiourl)
                                     }

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2016-12-05 17:43:50 +0000
+++ app/ui/SettingsPage.qml	2016-12-05 17:43:50 +0000
@@ -74,7 +74,7 @@
                 }
 
                 Button {
-                    text: i18n.tr("Ok")
+                    text: i18n.tr("OK")
                     color: podbird.appTheme.positiveActionButton
                     onClicked: {
                         podbird.settings.skipForward = Math.round(slider.value)
@@ -109,7 +109,7 @@
                 }
 
                 Button {
-                    text: i18n.tr("Ok")
+                    text: i18n.tr("OK")
                     color: podbird.appTheme.positiveActionButton
                     onClicked: {
                         podbird.settings.skipBack = Math.round(slider.value)
@@ -212,6 +212,23 @@
                 onClicked: mainStack.push(Qt.resolvedUrl("../settings/DownloadSetting.qml"))
             }
 
+ 	ListItem {
+                ListItemLayout {
+                    id: downloadWifiOnlyLayout
+                    title.text: i18n.tr("Only download over WiFi")
+                    title.color: podbird.appTheme.baseText
+                    summary.text: i18n.tr("Download episodes only when the device is using WiFi")
+                    summary.color: podbird.appTheme.baseSubText
+                    Switch {
+                        SlotsLayout.position: SlotsLayout.Last
+                        checked: podbird.settings.downloadOverWifiOnly
+                        onClicked: podbird.settings.downloadOverWifiOnly = checked
+                    }
+                }
+                divider.visible: false
+                height: downloadWifiOnlyLayout.height
+            }
+
             ListItem {
                 id: refreshArtListItem
 

=== modified file 'app/welcomewizard/Slide5.qml'
--- app/welcomewizard/Slide5.qml	2016-03-19 13:54:27 +0000
+++ app/welcomewizard/Slide5.qml	2016-12-05 17:43:50 +0000
@@ -61,7 +61,7 @@
             wrapMode: Text.WordWrap
             horizontalAlignment: Text.AlignHCenter
             linkColor: podbird.appTheme.linkText
-            text: i18n.tr("Episodes can be swiped left to reveal more actions. You can also multi-select them by long-pressing on an episode.")
+            text: i18n.tr("Episodes can be swiped left to reveal more actions (or right click if you're using a mouse). You can also multi-select them by long-pressing on an episode.")
             onLinkActivated: Qt.openUrlExternally(link)
         }
     }

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-02-19 20:58:55 +0000
+++ manifest.json.in	2016-12-05 17:43:50 +0000
@@ -11,5 +11,5 @@
     },
     "version": "0.7",
     "maintainer": "Michael Sheldon <[e-mail]>",
-    "framework": "ubuntu-sdk-15.04.3"
+    "framework": "ubuntu-sdk-15.04.5"
 }

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2016-12-05 17:43:50 +0000
+++ po/com.mikeasoft.podbird.pot	2016-12-05 17:43:50 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-29 16:55+0530\n"
+"POT-Creation-Date: 2016-12-03 17:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -55,7 +55,7 @@
 
 #. TRANSLATORS: About as in information about the app
 #: ../app/settings/About.qml:28 ../app/settings/About.qml:46
-#: ../app/ui/SettingsPage.qml:321
+#: ../app/ui/SettingsPage.qml:338
 msgid "About"
 msgstr ""
 
@@ -223,7 +223,7 @@
 msgstr ""
 
 #: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418
-#: ../app/ui/SearchPage.qml:179 ../app/ui/SettingsPage.qml:303
+#: ../app/ui/SearchPage.qml:179 ../app/ui/SettingsPage.qml:320
 msgid "Close"
 msgstr ""
 
@@ -247,6 +247,42 @@
 msgid "Downloaded"
 msgstr ""
 
+#: ../app/ui/EpisodesPage.qml:605
+msgid "Make as unheard"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:605
+msgid "Mark as listened"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:621
+msgid "Delete downloaded file"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:621
+msgid "Queued"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:621
+msgid "Download"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:646
+msgid "Add to playlist"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:655
+msgid "Unfavourite"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:655
+msgid "Favourite"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:670
+msgid "Show episode description"
+msgstr ""
+
 #: ../app/ui/EpisodesTab.qml:82
 msgid "Recent"
 msgstr ""
@@ -432,7 +468,7 @@
 msgstr ""
 
 #: ../app/ui/SettingsPage.qml:77 ../app/ui/SettingsPage.qml:112
-msgid "Ok"
+msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
@@ -476,43 +512,51 @@
 msgid "Default number of new episodes to download for each podcast"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:223
+#: ../app/ui/SettingsPage.qml:218
+msgid "Only download over wifi"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:220
+msgid "Download episodes only when the device is using WiFi"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:240
 msgid "Refresh podcast artwork"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:225
+#: ../app/ui/SettingsPage.qml:242
 msgid ""
 "Update all podcasts artwork and fix missing ones (this only works with "
 "podcasts added via iTunes® search)"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:254
+#: ../app/ui/SettingsPage.qml:271
 msgid "Storage Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:265
+#: ../app/ui/SettingsPage.qml:282
 msgid "Delete orphaned files and links"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:267
+#: ../app/ui/SettingsPage.qml:284
 msgid "Free space by removing orphaned downloaded files and links"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:297
+#: ../app/ui/SettingsPage.qml:314
 msgid "Removed Orphaned files and links"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:297
+#: ../app/ui/SettingsPage.qml:314
 msgid "No Orphans found!"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:298
+#: ../app/ui/SettingsPage.qml:315
 msgid ""
 "All orphaned files have been deleted to recover disk space. Orphaned links "
 "pointing at invalid files have also been cleaned up."
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:300
+#: ../app/ui/SettingsPage.qml:317
 msgid ""
 "No orphaned files have been found to recover disk space. Podbird database is "
 "clean."
@@ -520,11 +564,11 @@
 
 #. TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options
 #. that doesn't fit into any other category.
-#: ../app/ui/SettingsPage.qml:315
+#: ../app/ui/SettingsPage.qml:332
 msgid "Misc."
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:331
+#: ../app/ui/SettingsPage.qml:348
 msgid "Report Bug"
 msgstr ""
 
@@ -584,8 +628,9 @@
 
 #: ../app/welcomewizard/Slide5.qml:64
 msgid ""
-"Episodes can be swiped left to reveal more actions. You can also multi-"
-"select them by long-pressing on an episode."
+"Episodes can be swiped left to reveal more actions (or right click if you're "
+"using a mouse). You can also multi-select them by long-pressing on an "
+"episode."
 msgstr ""
 
 #: ../app/welcomewizard/Slide6.qml:45
@@ -612,10 +657,10 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-sync-4-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/build-devel-branch-sync-5-UbuntuSDK_for_desktop_GCC_amd64_ubuntu_sdk_15_04-Default/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-sync-4-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/build-devel-branch-sync-5-UbuntuSDK_for_desktop_GCC_amd64_ubuntu_sdk_15_04-Default/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""