Merge lp:~nik90/podbird/add-favourites-view into lp:podbird/devel

[Nekhelesh Ramananthan]

Added the ability to favourite episodes and see a list of all favourited episodes.

Added the ability to favourite episodes and see a list of all favourited episodes.

=== modified file 'app/podcasts.js'
--- app/podcasts.js	2016-03-04 10:04:32 +0000
+++ app/podcasts.js	2016-03-05 21:27:27 +0000
@@ -21,17 +21,18 @@
 
     db.transaction(function(tx) {
         tx.executeSql('CREATE TABLE IF NOT EXISTS Podcast(artist TEXT, name TEXT, description TEXT, feed TEXT, image TEXT, lastupdate TIMESTAMP)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, queued BOOLEAN, listened BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, queued BOOLEAN, listened BOOLEAN, favourited BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
     });
 
     /*
-     Schema Upgrade to v1.1 which adds a new queued boolean variable which is needed to track the queued status
-     of a episode properly.
+     Schema Upgrade to v1.2 which adds a new favourited boolean variable which is needed to track the favourite status
+     of an episode.
     */
-    if (db.version == "1.0") {
-        db.changeVersion("1.0", "1.1", function(tx) {
-            tx.executeSql('ALTER TABLE Episode ADD queued BOOLEAN');
-            tx.executeSql('UPDATE Episode SET queued=0');
+    if (db.version != "1.2") {
+        console.log("Upgrading database from %1 -> v1.2".arg(db.version))
+        db.changeVersion(db.version, "1.2", function(tx) {
+            tx.executeSql('ALTER TABLE Episode ADD favourited BOOLEAN');
+            tx.executeSql('UPDATE Episode SET favourited=?', [false]);
         });
     }
 
@@ -110,13 +111,14 @@
                                             db.transaction(function(tx2) {
                                                 var ers = tx2.executeSql("SELECT rowid FROM Episode WHERE guid=?", [track.guid]);
                                                 if (ers.rows.length === 0) {
-                                                    tx2.executeSql("INSERT INTO Episode(podcast, name, description, audiourl, guid, listened, queued, duration, published) VALUES(?, ?, ? , ?, ?, ?, ?, ?, ?)", [pid,
+                                                    tx2.executeSql("INSERT INTO Episode(podcast, name, description, audiourl, guid, listened, queued, favourited, duration, published) VALUES(?, ?, ? , ?, ?, ?, ?, ?, ?, ?)", [pid,
                                                                                                                                                                                                                  track.name,
                                                                                                                                                                                                                  track.description,
                                                                                                                                                                                                                  track.audiourl,
                                                                                                                                                                                                                  track.guid,
                                                                                                                                                                                                                  false,
                                                                                                                                                                                                                  false,
+                                                                                                                                                                                                                 false,
                                                                                                                                                                                                                  track.duration,
                                                                                                                                                                                                                  track.published]);
                                                 }
 
=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-05 17:07:27 +0000
+++ app/ui/EpisodesPage.qml	2016-03-05 21:27:27 +0000
@@ -523,6 +523,20 @@
                     },
 
                     Action {
+                        iconName: model.favourited ? "unlike" : "like"
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                if (model.favourited)
+                                    tx.executeSql("UPDATE Episode SET favourited=0 WHERE guid=?", [model.guid])
+                                else
+                                    tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [model.guid])
+                                refreshModel();
+                            });
+                        }
+                    },
+
+                    Action {
                         iconName: "info"
                         onTriggered: {
                             var popup = PopupUtils.open(episodeDescriptionDialog, episodesPage);
@@ -581,10 +595,10 @@
             for(i = 0; i < rs.rows.length; i++) {
                 episode = rs.rows.item(i);
                 if (!episode.listened) {
-                    episodeModel.insert(newCount, {"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued});
+                    episodeModel.insert(newCount, {"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited});
                     newCount++;
                 } else {
-                    episodeModel.insert(i,{"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued});
+                    episodeModel.insert(i,{"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited});
                 }
             }
         });
 
=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2016-03-05 17:07:27 +0000
+++ app/ui/EpisodesTab.qml	2016-03-05 21:27:27 +0000
@@ -132,7 +132,7 @@
                     selectedSectionColor: podbird.appTheme.focusText
                 }
 
-                model: [i18n.tr("What's New"), i18n.tr("Downloaded")]
+                model: [i18n.tr("What's New"), i18n.tr("Downloaded"), i18n.tr("Favourites")]
                 onSelectedIndexChanged: {
                     refreshModel();
                 }
@@ -192,8 +192,30 @@
             id: emptyStateComponent
             EmptyState {
                 icon.source: episodesModel.count === 0 ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
-                title: episodesModel.count === 0 ? i18n.tr("No New Episodes") : i18n.tr("No Episodes Found")
-                subTitle: episodesModel.count === 0 ? i18n.tr("No more episodes to listen to!") : i18n.tr("No Episodes found matching the search term.")
+                title: {
+                    if (episodesModel.count === 0 && episodesPage.header === standardHeader) {
+                        if (episodesPageHeaderSections.selectedIndex === 0)
+                            return i18n.tr("No New Episodes")
+                        else if (episodesPageHeaderSections.selectedIndex === 1)
+                            return i18n.tr("No Downloaded Episodes")
+                        else if (episodesPageHeaderSections.selectedIndex === 2)
+                            return i18n.tr("No Favourited Episodes")
+                    } else {
+                        return i18n.tr("No Episodes Found")
+                    }
+                }
+                subTitle: {
+                    if (episodesModel.count === 0 && episodesPage.header === standardHeader) {
+                        if (episodesPageHeaderSections.selectedIndex === 0)
+                            return i18n.tr("No more episodes to listen to!")
+                        else if (episodesPageHeaderSections.selectedIndex === 1)
+                            return i18n.tr("No episodes have been downloaded for offline listening")
+                        else if (episodesPageHeaderSections.selectedIndex === 2)
+                            return i18n.tr("No episodes have been favourited.")
+                    } else {
+                        return i18n.tr("No Episodes found matching the search term.")
+                    }
+                }
             }
         }
 
@@ -440,9 +462,29 @@
                                     else {
                                         tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [model.guid])
                                         episodesModel.setProperty(model.index, "listened", 1)
-                                        if (episodesPage.head.sections.selectedIndex === 0) {
-                                            episodesModel.remove(model.index, 1)
-                                        }
+                                        if (episodesPageHeaderSections.selectedIndex === 0) {
+                                            episodesModel.remove(model.index, 1)
+                                        }
+                                    }
+                                });
+                            }
+                        },
+
+                        Action {
+                            iconName: model.favourited ? "unlike" : "like"
+                            onTriggered: {
+                                var db = Podcasts.init();
+                                db.transaction(function (tx) {
+                                    if (model.favourited) {
+                                        tx.executeSql("UPDATE Episode SET favourited=0 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "favourited", 0)
+                                        if (episodesPageHeaderSections.selectedIndex === 2) {
+                                            episodesModel.remove(model.index, 1)
+                                        }
+                                    }
+                                    else {
+                                        tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "favourited", 1)
                                     }
                                 });
                             }
@@ -515,13 +557,13 @@
                         diff = Math.floor((today - episode.published)/dayToMs)
                         if (diff < 7 && !episode.listened) {
                             if (diff < 1) {
-                                episodesModel.insert(todayCount, {"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, "diff": "Today"})
+                                episodesModel.insert(todayCount, {"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": "Today"})
                                 todayCount++;
                             } else if (diff < 2) {
-                                episodesModel.insert(todayCount + yesterdayCount, {"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, "diff": "Yesterday"})
+                                episodesModel.insert(todayCount + yesterdayCount, {"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": "Yesterday"})
                                 yesterdayCount++;
                             } else {
-                                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, "diff": "Older"})
+                                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){
                             break
@@ -545,7 +587,28 @@
                     for (j=0; j < rs2.rows.length; j++) {
                         episode = rs2.rows.item(j)
                         if (episode.downloadedfile) {
-                            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, "diff": "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": "Null"})
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
+
+        // Episode Model for the favourites view
+        else if (episodesPageHeaderSections.selectedIndex === 2) {
+            db.transaction(function (tx) {
+                var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
+                for (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]);
+                    for (j=0; j < rs2.rows.length; j++) {
+                        episode = rs2.rows.item(j)
+                        if (episode.favourited) {
+                            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": "Null"})
                         }
                     }
 
 
=== modified file 'po/podbird.nik90.pot'
--- po/podbird.nik90.pot	2016-03-05 17:30:32 +0000
+++ po/podbird.nik90.pot	2016-03-05 21:27:27 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-05 22:39+0530\n"
+"POT-Creation-Date: 2016-03-06 01:51+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"
@@ -44,17 +44,17 @@
 msgid "No podcasts listened to today"
 msgstr ""
 
-#: ../app/podcasts.js:180
+#: ../app/podcasts.js:182
 #, no-c-format, qt-format
 msgid "%1 hr %2 min"
 msgstr ""
 
-#: ../app/podcasts.js:189
+#: ../app/podcasts.js:191
 #, no-c-format, qt-format
 msgid "%1 hr"
 msgstr ""
 
-#: ../app/podcasts.js:197
+#: ../app/podcasts.js:199
 #, no-c-format, qt-format
 msgid "%1 min"
 msgstr ""
@@ -195,11 +195,11 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:224 ../app/ui/EpisodesTab.qml:273
+#: ../app/ui/EpisodesPage.qml:224 ../app/ui/EpisodesTab.qml:295
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:236 ../app/ui/EpisodesTab.qml:285
+#: ../app/ui/EpisodesPage.qml:236 ../app/ui/EpisodesTab.qml:307
 #: ../app/ui/SearchPage.qml:170
 msgid "Close"
 msgstr ""
@@ -236,31 +236,51 @@
 msgid "What's New"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:195
+#: ../app/ui/EpisodesTab.qml:135
+msgid "Favourites"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:198
 msgid "No New Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:195
+#: ../app/ui/EpisodesTab.qml:200
+msgid "No Downloaded Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:202
+msgid "No Favourited Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:204
 msgid "No Episodes Found"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:196
+#: ../app/ui/EpisodesTab.qml:210
 msgid "No more episodes to listen to!"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:196
+#: ../app/ui/EpisodesTab.qml:212
+msgid "No episodes have been downloaded for offline listening"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:214
+msgid "No episodes have been favourited."
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:216
 msgid "No Episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:332
+#: ../app/ui/EpisodesTab.qml:354
 msgid "Today"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:336
+#: ../app/ui/EpisodesTab.qml:358
 msgid "Yesterday"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:340
+#: ../app/ui/EpisodesTab.qml:362
 msgid "Older"
 msgstr ""
 
@@ -509,10 +529,10 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/add-favourites-view-build/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/add-favourites-view-build/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""