Merge lp:~nik90/cliffhanger/add-watchlist-feature into lp:~flashback-dev/cliffhanger/trunk

[Nekhelesh Ramananthan]

Added user watchlist feature

Added user watchlist feature

[lp:~nik90/cliffhanger/add-watchlist-feature]

34. By Nekhelesh Ramananthan on 2014-01-20

Small fixes

=== modified file 'Flashback.qml'
--- Flashback.qml	2014-01-03 14:01:43 +0000
+++ Flashback.qml	2014-01-20 22:13:50 +0000
@@ -117,6 +117,15 @@
         }
     }
 
+    // Document to store the user's watchlist activity on Trakt
+    U1db.Document {
+        id: watchlistActivityDocument
+        database: db
+        docId: "traktWatchlistActivity"
+        create: true
+        defaults: { "movie": "default", "show": "default" }
+    }
+
     Loader { id: userActivityLoader }
 
     Component {
 
=== modified file 'backend/backend.js'
--- backend/backend.js	2014-01-19 23:00:52 +0000
+++ backend/backend.js	2014-01-20 22:13:50 +0000
@@ -169,6 +169,14 @@
     return credentials.trakt_baseUrl + "/user/calendar/shows.json/" + credentials.trakt_apiKey + "/" + username + "/" + startDate + "/" + noOfDays
 }
 
+function traktWatchlistUrl(type) {
+    return credentials.trakt_baseUrl + "/" + type + "/watchlist/" + credentials.trakt_apiKey
+}
+
+function traktUnwatchlistUrl(type) {
+    return credentials.trakt_baseUrl + "/" + type + "/unwatchlist/" + credentials.trakt_apiKey
+}
+
 function userWatchlistMovies(username) {
     return credentials.trakt_baseUrl + "/user/watchlist/movies.json/" + credentials.trakt_apiKey + "/" + username
 }
 
=== modified file 'components/TraktPopup.qml'
--- components/TraktPopup.qml	2013-12-28 18:30:08 +0000
+++ components/TraktPopup.qml	2014-01-20 22:13:50 +0000
@@ -15,10 +15,14 @@
     // Property to set the seen message
     property alias seenMessage: _seenAction.text
 
+    // Property to set the watchlist message
+    property alias watchlistMessage: _watchlistAction.text
+
     // Properties to set the visibility of the individual actions
     property bool showConfigureAction: traktLogin.contents.status === "disabled"
     property bool showCheckInAction: traktLogin.contents.status !== "disabled"
     property bool showSeenAction: traktLogin.contents.status !== "disabled"
+    property bool showWatchlistAction: traktLogin.contents.status !== "disabled"
     property bool showCommentAction: true
 
     // Signal triggered when the checked-in action is triggered
@@ -30,6 +34,9 @@
     // Signal triggered when the comments action is triggered
     signal commented()
 
+    // Signal triggered when the watchlist action is triggered
+    signal watchlisted()
+
     Column {
         id: containerLayout
         anchors {
@@ -61,6 +68,17 @@
         }
 
         Standard {
+            id: _watchlistAction
+            visible: showWatchlistAction
+            iconSource: Qt.resolvedUrl("../graphics/watchlist_black.png")
+            iconFrame: false
+            onClicked: {
+                popover.watchlisted()
+                PopupUtils.close(popover)
+            }
+        }
+
+        Standard {
             id: _seenAction
             visible: showSeenAction
             iconSource: Qt.resolvedUrl("../graphics/watched_black.png")
 
=== added file 'graphics/watchlist_black.png'
 Binary files graphics/watchlist_black.png	1970-01-01 00:00:00 +0000 and graphics/watchlist_black.png	2014-01-20 22:13:50 +0000 differ
=== modified file 'models/AiringShows.qml'
--- models/AiringShows.qml	2014-01-02 14:31:26 +0000
+++ models/AiringShows.qml	2014-01-20 22:13:50 +0000
@@ -4,6 +4,8 @@
 BasePostModel {
     id: airingShowsModel
 
+    property string lastUpdated: "default"
+
     function fetchData(username, password, date, days) {
         source = Backend.userShows(username, date, days)
         createMessage(username, password)
 
=== modified file 'models/Show.qml'
--- models/Show.qml	2013-12-30 15:03:51 +0000
+++ models/Show.qml	2014-01-20 22:13:50 +0000
@@ -16,6 +16,7 @@
       'voteUp': 0,
       'voteDown': 0,
       'userVote': 0,
+      'in_watchlist': '',
       'number_of_seasons': 0,
       'networks': '',
       'genres': [],
@@ -38,6 +39,7 @@
             'voteUp': parseInt(reply.ratings.loved),
             'voteDown': parseInt(reply.ratings.hated),
             'userVote': parseInt(reply.rating_advanced),
+            'in_watchlist': reply.in_watchlist ? reply.in_watchlist.toString() : "",
             'in_production': reply.status,
             'networks': reply.network,
             'genres': reply.genres,
 
=== modified file 'models/TraktUserWatchlist.qml'
--- models/TraktUserWatchlist.qml	2014-01-02 21:25:37 +0000
+++ models/TraktUserWatchlist.qml	2014-01-20 22:13:50 +0000
@@ -1,8 +1,17 @@
 import QtQuick 2.0
+import "../backend/backend.js" as Backend
 
 BasePostModel {
     id: traktUserWatchlist
 
+    property string lastUpdated: "default"
+
+    function fetchData(username, password) {
+        source = Backend.userWatchlistMovies(username)
+        createMessage(username, password)
+        sendMessage()
+    }
+
     function updateJSONModel() {
         model.clear()
         for ( var key in reply ) {
 
=== added file 'models/TraktWatchlist.qml'
--- models/TraktWatchlist.qml	1970-01-01 00:00:00 +0000
+++ models/TraktWatchlist.qml	2014-01-20 22:13:50 +0000
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+
+BasePostModel {
+    id: traktWatchlist
+
+    // Function to create a JSON String with movie information
+    function createMovieMessage(username, password, imdb_id, title, year) {
+        message = JSON.stringify({username: username, password: password, movies: [{imdb_id: imdb_id, title: title, year: year}]})
+    }
+
+    // Function to create a JSON String with tv show information
+    function createShowMessage(username, password, tvdb_id, title, year) {
+        message = JSON.stringify({username: username, password: password, shows: [{tvdb_id: tvdb_id, title: title, year: year}]})
+    }
+}
 
=== modified file 'ui/EpisodePage.qml'
--- ui/EpisodePage.qml	2014-01-04 15:06:19 +0000
+++ ui/EpisodePage.qml	2014-01-20 22:13:50 +0000
@@ -127,6 +127,7 @@
     Component {
         id: sharePopoverComponent
         TraktPopup {
+            showWatchlistAction: false
             checkInMessage: showActivityDocument.contents.name !== "default" ? i18n.tr("Cancel current episode check-in") : i18n.tr("Check-in episode into Trakt")
             seenMessage: isEpisodeSeen ? i18n.tr("Mark episode an unseen") : i18n.tr("Mark episode as seen")
             onCheckedIn: {
 
=== modified file 'ui/HomeTab.qml'
--- ui/HomeTab.qml	2014-01-02 21:25:37 +0000
+++ ui/HomeTab.qml	2014-01-20 22:13:50 +0000
@@ -8,6 +8,8 @@
 Page {
     id: homePage
 
+    flickable: null
+
     Component.onCompleted: console.log("[LOG]: Home Tab Loaded")
 
     actions: [
@@ -30,11 +32,16 @@
         id: userWatchlistModel
         username: traktLogin.contents.username
         password: traktLogin.contents.password
+        lastUpdated: watchlistActivityDocument.contents.movie
         onPasswordChanged: {
             console.log("[LOG]: Retrieving user movie watchlist")
-            source = Backend.userWatchlistMovies(username)
-            createMessage(username, password)
-            sendMessage()
+            fetchData(username, password)
+        }
+        onLastUpdatedChanged: {
+            if(username !== "") {
+                console.log("[LOG]: Retrieving user movie watchlist")
+                fetchData(username, password)
+            }
         }
     }
 
@@ -42,10 +49,17 @@
         id: airingShowsModel
         username: traktLogin.contents.username
         password: traktLogin.contents.password
+        lastUpdated: watchlistActivityDocument.contents.show
         onPasswordChanged: {
             console.log("[LOG]: Retrieving shows airing today")
             fetchData(username, password, Qt.formatDate(new Date(), "yyyyMMdd"), 1)
         }
+        onLastUpdatedChanged: {
+            if(username !== "") {
+                console.log("[LOG]: Retrieving shows airing today")
+                fetchData(username, password, Qt.formatDate(new Date(), "yyyyMMdd"), 1)
+            }
+        }
     }
 
     LoadingIndicator {
 
=== modified file 'ui/MoviePage.qml'
--- ui/MoviePage.qml	2014-01-04 15:06:19 +0000
+++ ui/MoviePage.qml	2014-01-20 22:13:50 +0000
@@ -14,6 +14,7 @@
 
     property string movie_id
     property bool isMovieSeen
+    property bool isMovieWatchlisted
 
     property int upVotes: 0
     property int downVotes: 0
@@ -54,6 +55,7 @@
             averageVote = reply.ratings.percentage
             if (traktLogin.contents.status !== "disabled") {
                 isMovieSeen = reply.watched
+                isMovieWatchlisted = reply.in_watchlist
                 userVote = reply.rating_advanced
             }
         }
@@ -109,10 +111,31 @@
         }
     }
 
+    TraktWatchlist {
+        id: movieWatchlist
+        function updateJSONModel() {
+            if(reply.status === "success") {
+                loadingIndicator.visible = false
+                if(!isMovieWatchlisted) {
+                    console.log("[LOG]: Movie watchlist success")
+                    isMovieWatchlisted = true
+                }
+                else {
+                    console.log("[LOG]: Movie Unwatchlist success")
+                    isMovieWatchlisted = false
+                }
+                var tempData = watchlistActivityDocument.contents
+                tempData.movie = Qt.formatDateTime(new Date(), "yyyyMMdd hh:mm:ss")
+                watchlistActivityDocument.contents = tempData
+            }
+        }
+    }
+
     Component {
         id: sharePopoverComponent
         TraktPopup {
             checkInMessage: movieActivityDocument.contents.name !== "default" ? i18n.tr("Cancel current movie check-in") : i18n.tr("Check-in movie into Trakt")
+            watchlistMessage: isMovieWatchlisted ? i18n.tr("Remove movie from watchlist") : i18n.tr("Add movie to watchlist")
             seenMessage: isMovieSeen ? i18n.tr("Mark movie as unseen") : i18n.tr("Mark movie as seen")
             onCheckedIn: {
                 if(movieActivityDocument.contents.name !== "default") {
@@ -137,6 +160,19 @@
                     movieUnsee.sendMessage()
                 }
             }
+            onWatchlisted:  {
+                loadingIndicator.loadingText = !isMovieWatchlisted ? i18n.tr("Adding movie to watchlist") : i18n.tr("Removing movie from watchlist")
+                loadingIndicator.visible = true
+                if(!isMovieWatchlisted) {
+                    movieWatchlist.source = Backend.traktWatchlistUrl("movie")
+                    movieWatchlist.createMovieMessage(traktLogin.contents.username, traktLogin.contents.password, movie.attributes.imdb_id, movie.attributes.title, movie.attributes.releaseDate.split('-')[0])
+                }
+                else {
+                    movieWatchlist.source = Backend.traktUnwatchlistUrl("movie")
+                    movieWatchlist.createMovieMessage(traktLogin.contents.username, traktLogin.contents.password, movie.attributes.imdb_id, movie.attributes.title, movie.attributes.releaseDate.split('-')[0])
+                }
+                movieWatchlist.sendMessage()
+            }
             onCommented: pagestack.push(Qt.resolvedUrl("CommentsPage.qml"), {id: movie_id, type: "Movie", name: movie.attributes.title, year: movie.attributes.releaseDate.split('-')[0]})
         }
     }
 
=== modified file 'ui/SeasonPage.qml'
--- ui/SeasonPage.qml	2014-01-04 15:06:19 +0000
+++ ui/SeasonPage.qml	2014-01-20 22:13:50 +0000
@@ -74,6 +74,7 @@
         TraktPopup {
             showCheckInAction: false
             showCommentAction: false
+            showWatchlistAction: false
             seenMessage: !isSeasonSeen ? i18n.tr("Mark season as seen") : i18n.tr("Season has been watched!")
             onWatched: {
                 if(!isSeasonSeen) {
 
=== modified file 'ui/TvPage.qml'
--- ui/TvPage.qml	2014-01-04 15:06:19 +0000
+++ ui/TvPage.qml	2014-01-20 22:13:50 +0000
@@ -14,6 +14,7 @@
 
     property string tv_id
     property int userVote: 0
+    property bool isShowWatchlisted
 
     actions: [
         Action {
@@ -41,6 +42,26 @@
         }
     }
 
+    TraktWatchlist {
+        id: showWatchlist
+        function updateJSONModel() {
+            if(reply.status === "success") {
+                loadingIndicator.visible = false
+                if(!isShowWatchlisted) {
+                    console.log("[LOG]: Show watchlist success")
+                    isShowWatchlisted = true
+                }
+                else {
+                    console.log("[LOG]: Show Unwatchlist success")
+                    isShowWatchlisted = false
+                }
+                var tempData = watchlistActivityDocument.contents
+                tempData.show = Qt.formatDateTime(new Date(), "yyyyMMdd hh:mm:ss")
+                watchlistActivityDocument.contents = tempData
+            }
+        }
+    }
+
     LoadingIndicator {
         id: loadingIndicator
         visible: false
@@ -51,6 +72,7 @@
         TraktPopup {
             showCheckInAction: false
             seenMessage: i18n.tr("Mark show as seen")
+            watchlistMessage: isShowWatchlisted ? i18n.tr("Remove show from watchlist") : i18n.tr("Add show to watchlist")
             onWatched: {
                 loadingIndicator.loadingText = i18n.tr("Marking show as seen")
                 loadingIndicator.visible = true
@@ -58,6 +80,19 @@
                 showSee.createShowMessage(traktLogin.contents.username, traktLogin.contents.password, tv_id, show.imdb_id, show.name, show.year)
                 showSee.sendMessage()
             }
+            onWatchlisted:  {
+                loadingIndicator.loadingText = !isShowWatchlisted ? i18n.tr("Adding show to watchlist") : i18n.tr("Removing show from watchlist")
+                loadingIndicator.visible = true
+                if(!isShowWatchlisted) {
+                    showWatchlist.source = Backend.traktWatchlistUrl("show")
+                    showWatchlist.createShowMessage(traktLogin.contents.username, traktLogin.contents.password, tv_id, show.name, show.year)
+                }
+                else {
+                    showWatchlist.source = Backend.traktUnwatchlistUrl("show")
+                    showWatchlist.createShowMessage(traktLogin.contents.username, traktLogin.contents.password, tv_id, show.name, show.year)
+                }
+                showWatchlist.sendMessage()
+            }
             onCommented: pagestack.push(Qt.resolvedUrl("CommentsPage.qml"), {id: tv_id, type: "Show", name: show.name, year: show.year})
         }
     }
@@ -80,8 +115,10 @@
         }
         onUpdated: {
             tvCast.json = show.attributes.creditsJson;
-            if(traktLogin.contents.status !== "disabled")
+            if(traktLogin.contents.status !== "disabled") {
                 userVote = show.attributes.userVote
+                isShowWatchlisted = show.attributes.in_watchlist
+            }
         }
     }
 
 
=== modified file 'ui/TvTab.qml'
--- ui/TvTab.qml	2014-01-18 20:35:22 +0000
+++ ui/TvTab.qml	2014-01-20 22:13:50 +0000
@@ -35,10 +35,17 @@
         id: airingShowsModel
         username: traktLogin.contents.username
         password: traktLogin.contents.password
+        lastUpdated: watchlistActivityDocument.contents.show
         onPasswordChanged: {
             console.log("[LOG]: Retrieving upcoming shows")
             fetchData(username, password, Qt.formatDate(new Date(), "yyyyMMdd"), 7)
         }
+        onLastUpdatedChanged: {
+            if(username !== "") {
+                console.log("[LOG]: Retrieving upcoming shows")
+                fetchData(username, password, Qt.formatDate(new Date(), "yyyyMMdd"), 7)
+            }
+        }
     }
 
     LoadingIndicator {