Merge lp:~arashbm/cliffhanger/empty-fields into lp:~flashback-dev/cliffhanger/trunk

[Arash Badie Modiri]

this mp fixes the following:

* empty fields now hide whenever possible (fixes #1253039)
* fixes a problem with PersonCast, PersonCrew and ui/PersonPage which prevented TV shows from viewing and linking correctly

[Nekhelesh Ramananthan (nik90)]

nice work! It now works more reliably thanks to your effort!

review: Approve

=== modified file 'models/Movie.qml'
--- models/Movie.qml	2013-11-20 10:58:27 +0000
+++ models/Movie.qml	2013-11-25 20:49:29 +0000
@@ -9,9 +9,9 @@
       'tagline': '',
       'overview': '',
       'releaseDate': '',
-      'runtime': '',
-      'voteAverage': '',
-      'voteCount': '',
+      'runtime': 0,
+      'voteAverage': 0.0,
+      'voteCount': 0,
       'genres': [],
       'thumb_url': ''
     }
@@ -21,13 +21,13 @@
         attributes = {
             'id': ob.id,
             'title': ob.title,
-            'homepage': ob.homepage,
-            'tagline': ob.tagline,
-            'overview': ob.overview,
-            'releaseDate': ob.release_date,
-            'runtime': ob.runtime,
-            'voteAverage': ob.vote_average,
-            'voteCount': ob.vote_count,
+            'homepage': (ob.homepage || "") ,
+            'tagline': (ob.tagline || ""),
+            'overview': (ob.overview || ""),
+            'releaseDate': (ob.release_date || ""),
+            'runtime': parseInt(ob.runtime),
+            'voteAverage': parseFloat(ob.vote_average),
+            'voteCount': parseInt(ob.vote_count),
             'genres': ob.genres,
             'thumb_url': thumbnail_url(ob.poster_path, "movie"),
             'creditsJson': JSON.stringify(ob.credits || {}),

=== modified file 'models/Person.qml'
--- models/Person.qml	2013-11-20 10:58:27 +0000
+++ models/Person.qml	2013-11-25 20:49:29 +0000
@@ -18,11 +18,11 @@
         attributes = {
             'id': ob.id,
             'name': ob.name,
-            'biography': ob.biography,
-            'birthday': ob.birthday,
-            'deathday': ob.deathday,
-            'homepage': ob.homepage,
-            'placeOfBirth': ob.place_of_birth,
+            'biography': ob.biography || "",
+            'birthday': ob.birthday || "",
+            'deathday': ob.deathday || "",
+            'homepage': ob.homepage || "",
+            'placeOfBirth': ob.place_of_birth || "",
             'thumb_url': thumbnail_url(ob.profile_path, "person"),
             'combinedCreditsJson': JSON.stringify(ob.combined_credits || {})
         };

=== modified file 'models/PersonCast.qml'
--- models/PersonCast.qml	2013-11-20 10:58:27 +0000
+++ models/PersonCast.qml	2013-11-25 20:49:29 +0000
@@ -11,11 +11,11 @@
             var jo = objectArray[key];
             model.append({
                 'id': jo.id,
-                'title': jo.title,
-                'character': jo.character,
-                'releaseDate': jo.release_date,
+                'title': jo.title || jo.name || "",
+                'character': jo.character || "",
+                'releaseDate': jo.release_date || "",
                 'mediaType': jo.media_type,
-                'thumb_url': thumbnail_url(jo.profile_path, "person")
+                'thumb_url': thumbnail_url(jo.poster_path, "person")
             });
         }
     }

=== modified file 'models/PersonCrew.qml'
--- models/PersonCrew.qml	2013-11-20 10:58:27 +0000
+++ models/PersonCrew.qml	2013-11-25 20:49:29 +0000
@@ -10,11 +10,12 @@
             var jo = objectArray[key];
             model.append({
                 'id': jo.id,
-                'title': jo.title,
-                'department': jo.department,
-                'releaseDate': jo.release_date,
+                'title': jo.title || jo.name || "",
+                'department': jo.department || "",
+                'job': jo.job || "",
+                'releaseDate': jo.release_date || "",
                 'mediaType': jo.media_type,
-                'thumb_url': thumbnail_url(jo.profile_path, "person")
+                'thumb_url': thumbnail_url(jo.poster_path, "person")
             });
         }
     }

=== modified file 'models/Season.qml'
--- models/Season.qml	2013-11-20 12:24:35 +0000
+++ models/Season.qml	2013-11-25 20:49:29 +0000
@@ -6,17 +6,17 @@
     property variant attributes: {
       'name': '',
       'overview': '',
-      'air_date': '',
+      'airDate': '',
       'thumb_url': ''
     }
 
     function updateJSONModel() {
         var ob = JSON.parse(json);
         attributes = {
-            'id': ob.id,
-            'name': ob.name,
-            'overview': ob.overview,
-            'air_date': ob.air_date,
+            'id': ob.id || "",
+            'name': ob.name || "",
+            'overview': ob.overview || "",
+            'airDate': ob.air_date || "",
             'thumb_url': thumbnail_url(ob.poster_path, "show"),
             'episodesJson': JSON.stringify(ob.episodes || {})
         };

=== modified file 'models/Show.qml'
--- models/Show.qml	2013-11-20 11:37:49 +0000
+++ models/Show.qml	2013-11-25 20:49:29 +0000
@@ -9,10 +9,9 @@
       'overview': '',
       'first_air_date': '',
       'episode_run_time': [],
-      'voteAverage': '',
-      'voteCount': '',
-      'in_production': '',
-      'number_of_seasons': '',
+      'voteAverage': 0.0,
+      'voteCount': 0,
+      'number_of_seasons': 0,
       'networks': [],
       'genres': [],
       'thumb_url': ''
@@ -27,10 +26,10 @@
             'overview': ob.overview,
             'first_air_date': ob.first_air_date,
             'episode_run_time': ob.episode_run_time,
-            'voteAverage': ob.vote_average,
-            'voteCount': ob.vote_count,
+            'voteAverage': parseFloat(ob.vote_average),
+            'voteCount': parseInt(ob.vote_count),
             'in_production': ob.in_production,
-            'number_of_seasons': ob.number_of_seasons,
+            'number_of_seasons': parseInt(ob.number_of_seasons),
             'networks': ob.networks,
             'genres': ob.genres,
             'thumb_url': thumbnail_url(ob.poster_path, "show"),

=== modified file 'models/ShowSeasons.qml'
--- models/ShowSeasons.qml	2013-11-20 11:37:49 +0000
+++ models/ShowSeasons.qml	2013-11-25 20:49:29 +0000
@@ -10,7 +10,8 @@
         for ( var key in objectArray ) {
             var jo = objectArray[key];
             model.append({
-                'name': "Season " + jo.season_number,
+                'seasonNumber': parseInt(jo.season_number),
+                'airDate': jo.air_date || "",
                 'thumb_url': thumbnail_url(jo.poster_path, "show")
             });
         }

=== modified file 'ui/MoviePage.qml'
--- ui/MoviePage.qml	2013-11-22 15:50:53 +0000
+++ ui/MoviePage.qml	2013-11-25 20:49:29 +0000
@@ -104,6 +104,7 @@
             Label {
                 id: overview
                 text: movie.attributes.overview
+                visible: movie.attributes.overview
                 fontSize: "medium"
                 width: movieColumn.width
                 height: movieColumn.height/2
@@ -121,13 +122,14 @@
                     image: Qt.resolvedUrl("../graphics/calendar.png")
                     size: units.gu(2)
                     label: movie.attributes.releaseDate.split('-')[0]
+                    visible: movie.attributes.releaseDate
                 }
 
                 ImageLabel {
                     image: Qt.resolvedUrl("../graphics/duration.png")
                     size: units.gu(2)
                     label: movie.attributes.runtime + " minutes"
-                    visible: movie.attributes.runtime != '0'
+                    visible: movie.attributes.runtime > 0
                 }
             }
         }
@@ -143,7 +145,9 @@
             }
 
             image: Qt.resolvedUrl("../graphics/star.png")
-            label: JSON.stringify(movie.attributes.voteAverage).substring(0,3) + "\n" + movie.attributes.voteCount
+            // minimum acceptable number of votes, currently set to 1
+            visible: movie.attributes.voteCount > 0
+            label: movie.attributes.voteAverage.toFixed()+"\n"+movie.attributes.voteCount
         }
 
         // Movie Details - Release dates, genre, movie theme etc.
@@ -162,12 +166,14 @@
               id: genres
               text: "Genres"
               subText: movie.attributes.genres.map(function(o) { return o.name }).join(', ')
+              visible: movie.attributes.genres.length > 0
             }
 
             Subtitled {
               id: releaseDate
               text: "Release Date"
               subText: movie.attributes.releaseDate
+              visible: movie.attributes.releaseDate
             }
 
             Subtitled {
@@ -219,6 +225,7 @@
             Carousel {
                 id: similarMovies
                 dataModel: similarMoviesModel.model
+                visible: similarMoviesModel.count > 0
                 header: i18n.tr("Similar Movies")
                 onThumbClicked: pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": model.id})
             }

=== modified file 'ui/PersonPage.qml'
--- ui/PersonPage.qml	2013-11-16 20:52:42 +0000
+++ ui/PersonPage.qml	2013-11-25 20:49:29 +0000
@@ -89,6 +89,7 @@
                 Label {
                     id: birthPlace
                     text: person.attributes.placeOfBirth
+                    visible: person.attributes.placeOfBirth
                     fontSize: "medium"
                     width: personColumn.width
                     elide: Text.ElideRight
@@ -118,6 +119,7 @@
                 Label {
                     id: contact
                     text: person.attributes.homepage
+                    visible: person.attributes.homepage
                     fontSize: "medium"
                     width: personColumn.width
                     elide: Text.ElideRight
@@ -134,6 +136,7 @@
         Label {
             id: biography
             text: person.attributes.biography
+            visible: person.attributes.biography
             anchors {
                 top: personColumn.bottom
                 left: parent.left
@@ -176,7 +179,7 @@
                     icon: thumb_url
                     text: title
                     subText: character
-                    onClicked: mediaType == "movie" ? pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": id}) : console.log("Not a movie")
+                    onClicked: mediaType == "movie" ? pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": id}) : pageStack.push(Qt.resolvedUrl("TvPage.qml"), {"tv_id": id})
                 }
             }
 
@@ -200,7 +203,7 @@
                     icon: thumb_url
                     text: title
                     subText: department
-                    onClicked: mediaType == "movie" ? pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": id}) : console.log("Not a movie")
+                    onClicked: mediaType == "movie" ? pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": id}) : pageStack.push(Qt.resolvedUrl("TvPage.qml"), {"tv_id": id})
                 }
             }
         }

=== modified file 'ui/SeasonPage.qml'
--- ui/SeasonPage.qml	2013-11-21 11:11:54 +0000
+++ ui/SeasonPage.qml	2013-11-25 20:49:29 +0000
@@ -76,6 +76,7 @@
                 maximumLineCount: 2
                 elide: Text.ElideRight
                 wrapMode: Text.WordWrap
+                visible: season.attributes.name
             }
 
             Label {
@@ -90,6 +91,7 @@
                     anchors.fill: parent
                     onClicked: pageStack.push(Qt.resolvedUrl("SummaryPage.qml"), {"overlayTitle": "Summary", "summary": season.attributes.overview, "background": thumb.source})
                 }
+                visible: season.attributes.overview
             }
 
             Column {
@@ -97,7 +99,8 @@
                 ImageLabel {
                     image: Qt.resolvedUrl("../graphics/calendar.png")
                     size: units.gu(2)
-                    label: season.attributes.air_date.split('-')[0]
+                    label: season.attributes.airDate.split('-')[0]
+                    visible: season.attributes.airDate
                 }
             }
         }

=== modified file 'ui/TvPage.qml'
--- ui/TvPage.qml	2013-11-22 15:50:53 +0000
+++ ui/TvPage.qml	2013-11-25 20:49:29 +0000
@@ -118,28 +118,33 @@
             Column {
                 spacing: units.gu(1)
                 ImageLabel {
+                    id: networks
                     image: Qt.resolvedUrl("../graphics/network.png")
                     size: units.gu(2)
                     label: show.attributes.networks.map(function(o) { return o.name }).join(', ')
+                    visible: show.attributes.networks.length > 0
                 }
 
                 ImageLabel {
+                    id: firstAir
                     image: Qt.resolvedUrl("../graphics/calendar.png")
                     size: units.gu(2)
                     label: show.attributes.first_air_date.split('-')[0]
+                    visible: show.attributes.first_air_date != ''
                 }
 
                 ImageLabel {
                     image: Qt.resolvedUrl("../graphics/list.png")
                     size: units.gu(2)
                     label: show.attributes.number_of_seasons + " Seasons"
+                    visible: show.attributes.number_of_seasons > 0
                 }
 
                 ImageLabel {
                     image: Qt.resolvedUrl("../graphics/duration.png")
                     size: units.gu(2)
                     label: show.attributes.episode_run_time[0] + " minutes"
-                    visible: show.attributes.episode_run_time[0] != '0'
+                    visible: (show.attributes.episode_run_time.length > 0 && show.attributes.episode_run_time[0] != '0')
                 }
             }
         }
@@ -155,7 +160,9 @@
             }
 
             image: Qt.resolvedUrl("../graphics/star.png")
-            label: JSON.stringify(show.attributes.voteAverage).substring(0,3) + "\n" + show.attributes.voteCount
+            label: show.attributes.voteAverage.toFixed()+"\n"+show.attributes.voteCount
+            // minimum acceptable number of votes, currently set to 1
+            visible: show.attributes.voteCount > 0
         }
 
         UbuntuShape {
@@ -165,7 +172,7 @@
                 right: parent.right
                 rightMargin: units.gu(2)
             }
-            color: status.text === "<b>Continuing</b>" ? "#27AE60" : "#C0392B"
+            color: show.attributes.in_production ? "#27AE60" : "#C0392B"
             width: units.gu(10)
             height: ratingsRow.height
 
@@ -177,7 +184,8 @@
                 }
                 text: show.attributes.in_production ? "<b>Continuing</b>" : "<b>Ended</b>"
             }
-        }
+            visible: show.attributes.in_production !== undefined
+          }
 
         // Tv Details - Release dates, genre, movie theme etc.
         Column {
@@ -195,12 +203,14 @@
               id: genres
               text: "Genres"
               subText: show.attributes.genres.map(function(o) { return o.name }).join(', ')
+              visible: show.attributes.genres.length > 0
             }
 
             Subtitled {
               id: releaseDate
               text: "First Air Date"
               subText: show.attributes.first_air_date
+              visible: show.attributes.first_air_date
             }
 
             Header { text: "Casts" }

=== modified file 'ui/TvSeasons.qml'
--- ui/TvSeasons.qml	2013-11-20 12:24:35 +0000
+++ ui/TvSeasons.qml	2013-11-25 20:49:29 +0000
@@ -38,9 +38,9 @@
         clip: true
 
         delegate: Standard {
-            text: name
+          text: seasonNumber == 0 ? "Season Specials" : "Season " + seasonNumber
             icon: thumb_url
-            onClicked: pageStack.push(Qt.resolvedUrl("SeasonPage.qml"), {"tv_id": tv_id, "season_number": name.split(' ')[1]})
+            onClicked: pageStack.push(Qt.resolvedUrl("SeasonPage.qml"), {"tv_id": tv_id, "season_number": seasonNumber})
         }
     }