Merge lp:~arashbm/cliffhanger/person-movie-backend into lp:~flashback-dev/cliffhanger/trunk

[Arash Badie Modiri]

* Added models for Movie and Person, PersonCast, PersonCrew
* Removed `PersonDetails.js` and `MovieDetails,js`
* Optimized MoviePage (and PersonPage) to do one request only

[Nekhelesh Ramananthan (nik90)]

As usual great work! I have one question regarding the Movie.qml and Person.qml Models. In their model definition why do you define default_attributes if you are anyway going to add additional items to the attribute variable? I feel like the defaultAttributes variables is just unnecessary. Thoughts?

180 + property variant defaultAttributes: {
181 + 'title': '',
182 + 'homepage': '',
183 + 'tagline': '',
184 + 'overview': '',
185 + 'releaseDate': '',
186 + 'runtime': '',
187 + 'voteAverage': '',
188 + 'voteCount': '',
189 + 'genres': [],
190 + 'thumb_url': ''
191 + }

202 + attributes = {
203 + 'id': ob.id,
204 + 'title': ob.title,
205 + 'homepage': ob.homepage,
206 + 'tagline': ob.tagline,
207 + 'overview': ob.overview,
208 + 'releaseDate': ob.release_date,
209 + 'runtime': ob.runtime,
210 + 'voteAverage': ob.vote_average,
211 + 'voteCount': ob.vote_count,
212 + 'genres': ob.genres,
213 + 'thumb_url': thumbnail_url(ob.poster_path),
214 + 'creditsJson': JSON.stringify(ob.credits || {}),
215 + 'similarMoviesJson': JSON.stringify(ob.similar_movies || {})
216 + };

review: Needs Information

[Arash Badie Modiri (arashbm)]

oops! I thought I had removed them. I'll fix it in a moment.

[lp:~arashbm/cliffhanger/person-movie-backend]

17. By Arash Badie Modiri on 2013-11-17

* refactoring json === ''
* removing unused defaultAttributes property

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

=== removed file 'backend/MovieDetails.js'
--- backend/MovieDetails.js	2013-11-15 09:48:33 +0000
+++ backend/MovieDetails.js	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-WorkerScript.onMessage = function(message) {
-
-    var XHR = new XMLHttpRequest();    
-    var thumb_url;
-
-    XHR.open("GET", message.movie_url);
-    XHR.setRequestHeader("Accept", "application/json");
-
-    XHR.onreadystatechange = function() {
-        if(XHR.readyState != XHR.DONE)
-            return;
-        if(XHR.status != 200)
-            return;
-
-        var obj = JSON.parse(XHR.responseText);
-
-        WorkerScript.sendMessage({ 'poster': obj.poster_path,
-                                     "title": obj.original_title,
-                                     "description": obj.overview,
-                                     "runtime": obj.runtime,
-                                     "genre": obj.genres,
-                                     "theme": obj.tagline,
-                                     "avg_vote": obj.vote_average,
-                                     "total_vote": obj.vote_count,
-                                     "releasedate": obj.release_date})
-    };
-
-    XHR.send();
-}

=== removed file 'backend/PersonDetails.js'
--- backend/PersonDetails.js	2013-11-13 21:28:13 +0000
+++ backend/PersonDetails.js	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-WorkerScript.onMessage = function(message) {
-
-    var XHR = new XMLHttpRequest();
-    var thumb_url;
-
-    XHR.open("GET", message.person_url);
-    XHR.setRequestHeader("Accept", "application/json");
-
-    XHR.onreadystatechange = function() {
-        if(XHR.readyState != XHR.DONE)
-            return;
-        if(XHR.status != 200)
-            return;
-
-        var obj = JSON.parse(XHR.responseText);
-
-        for(var i=0; i<obj.combined_credits.cast.length; i++) {
-            if (obj.combined_credits.cast[i].poster_path == null)
-                thumb_url = "null"
-            else
-                thumb_url = "http://d3gtl9l2a4fn1j.cloudfront.net/t/p/" + "w185/" + obj.combined_credits.cast[i].poster_path
-
-
-            if(obj.combined_credits.cast[i].media_type == "movie")
-                message.actedModel.append({"title": obj.combined_credits.cast[i].title,
-                                              "character": obj.combined_credits.cast[i].character,
-                                              "media_type": obj.combined_credits.cast[i].media_type,
-                                              "id": obj.combined_credits.cast[i].id,
-                                              "iconUrl": thumb_url});
-            else if(obj.combined_credits.cast[i].media_type == "tv")
-                message.actedModel.append({"title": obj.combined_credits.cast[i].name,
-                                              "character": obj.combined_credits.cast[i].media_type,
-                                              "media_type": obj.combined_credits.cast[i].media_type,
-                                              "id": obj.combined_credits.cast[i].id,
-                                              "iconUrl": thumb_url});
-            message.actedModel.sync()
-        }
-
-        for(i=0; i<obj.combined_credits.crew.length; i++) {
-            message.directedModel.append({"title": obj.combined_credits.crew[i].title,
-                                             "character": obj.combined_credits.crew[i].job,
-                                             "media_type": obj.combined_credits.cast[i].media_type,
-                                             "id": obj.combined_credits.crew[i].id,
-                                             "iconUrl": thumb_url});
-            message.directedModel.sync()
-        }
-
-        WorkerScript.sendMessage({ 'poster': obj.profile_path,
-                                     "name": obj.name,
-                                     "biography": obj.biography,
-                                     "birthday": obj.birthday,
-                                     "deathday": obj.deathday,
-                                     "place_of_birth": obj.place_of_birth,
-                                     "homepage": obj.homepage})
-    };
-
-    XHR.send();
-}

=== modified file 'backend/backend.js'
--- backend/backend.js	2013-11-15 22:11:55 +0000
+++ backend/backend.js	2013-11-17 16:42:59 +0000
@@ -16,6 +16,15 @@
   return credentials.baseUrl + "/movie/upcoming" + "?api_key=" + credentials.apiKey;
 }
 
+function movieUrl(movie_id, options) {
+  options = options || {};
+  var base = credentials.baseUrl + "/movie/"+ movie_id + "?api_key=" + credentials.apiKey;
+  if ( options.appendToResponse )
+    return base + "&append_to_response=" + options.appendToResponse.join(',');
+  else 
+    return base;
+}
+
 function filterByGenreUrl(genre_id) {
   return credentials.baseUrl + "/genre/" + genre_id + "/movies" + "?api_key=" + credentials.apiKey;
 }
@@ -45,6 +54,15 @@
   return credentials.baseUrl + "/person/popular" + "?api_key=" + credentials.apiKey;
 }
 
+function personUrl(person_id, options) {
+  options = options || {};
+  var base = credentials.baseUrl + "/person/"+ person_id + "?api_key=" + credentials.apiKey;
+  if ( options.appendToResponse )
+    return base + "&append_to_response=" + options.appendToResponse.join(',');
+  else 
+    return base;
+}
+
 // Search
 function searchUrl(type, term) {
   return credentials.baseUrl + "/search/"+ type + "?api_key=" + credentials.apiKey + "&query=" + encodeURIComponent(term);

=== modified file 'models/BaseModel.qml'
--- models/BaseModel.qml	2013-11-15 17:02:44 +0000
+++ models/BaseModel.qml	2013-11-17 16:42:59 +0000
@@ -6,8 +6,10 @@
     property string json: ""
     property int status: XMLHttpRequest.UNSENT
 
-    property ListModel model: ListModel { id: jsonModel }
-    property alias count: jsonModel.count
+    property ListModel model: ListModel { id: model }
+    property alias count: model.count
+
+    signal updated()
 
     onSourceChanged: {
       var xhr = new XMLHttpRequest;
@@ -19,12 +21,18 @@
       }
       xhr.send();
     }
-    onJsonChanged: updateJSONModel()
+
+    onJsonChanged: {
+      if ( json != "" ) {
+        updateJSONModel();
+        updated();
+      }
+    }
 
     function thumbnail_url(thumb_path) {
       if (thumb_path)
-      return "http://d3gtl9l2a4fn1j.cloudfront.net/t/p/" + "w185/" + thumb_path;
+          return "http://d3gtl9l2a4fn1j.cloudfront.net/t/p/" + "w185/" + thumb_path;
       else
-      return Qt.resolvedUrl("../graphics/toolbarIcon.png");
+          return Qt.resolvedUrl("../graphics/toolbarIcon.png");
     }
 }

=== modified file 'models/Cast.qml'
--- models/Cast.qml	2013-11-15 10:57:48 +0000
+++ models/Cast.qml	2013-11-17 16:42:59 +0000
@@ -6,9 +6,6 @@
     function updateJSONModel() {
         model.clear();
 
-        if ( json === "" )
-            return;
-
         var objectArray = JSON.parse(json).cast;
         for ( var key in objectArray ) {
             var jo = objectArray[key];

=== modified file 'models/Crew.qml'
--- models/Crew.qml	2013-11-15 10:57:48 +0000
+++ models/Crew.qml	2013-11-17 16:42:59 +0000
@@ -5,9 +5,6 @@
     function updateJSONModel() {
         model.clear();
 
-        if ( json === "" )
-            return;
-
         var objectArray = JSON.parse(json).crew;
         for ( var key in objectArray ) {
             var jo = objectArray[key];

=== modified file 'models/Genres.qml'
--- models/Genres.qml	2013-11-15 22:22:17 +0000
+++ models/Genres.qml	2013-11-17 16:42:59 +0000
@@ -5,9 +5,6 @@
     function updateJSONModel() {
         model.clear();
 
-        if ( json === "" )
-            return;
-
         var objectArray = JSON.parse(json).genres;
         for ( var key in objectArray ) {
             var jo = objectArray[key];

=== added file 'models/Movie.qml'
--- models/Movie.qml	1970-01-01 00:00:00 +0000
+++ models/Movie.qml	2013-11-17 16:42:59 +0000
@@ -0,0 +1,37 @@
+import QtQuick 2.0
+
+BaseModel {
+    id: movie
+
+    property variant attributes: {
+      'title': '',
+      'homepage': '',
+      'tagline': '',
+      'overview': '',
+      'releaseDate': '',
+      'runtime': '',
+      'voteAverage': '',
+      'voteCount': '',
+      'genres': [],
+      'thumb_url': ''
+    }
+
+    function updateJSONModel() {
+        var ob = JSON.parse(json);
+        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,
+            'genres': ob.genres,
+            'thumb_url': thumbnail_url(ob.poster_path),
+            'creditsJson': JSON.stringify(ob.credits || {}),
+            'similarMoviesJson': JSON.stringify(ob.similar_movies || {})
+        };
+    }
+}

=== modified file 'models/Movies.qml'
--- models/Movies.qml	2013-11-15 10:57:48 +0000
+++ models/Movies.qml	2013-11-17 16:42:59 +0000
@@ -5,8 +5,6 @@
     
     function updateJSONModel() {
       model.clear();
-
-        if ( json === "" ) return;
         
         var objectArray = JSON.parse(json).results;
         for ( var key in objectArray ) {

=== modified file 'models/People.qml'
--- models/People.qml	2013-11-15 10:57:48 +0000
+++ models/People.qml	2013-11-17 16:42:59 +0000
@@ -5,9 +5,6 @@
     function updateJSONModel() {
         model.clear();
 
-        if ( json === "" )
-            return;
-
         var objectArray = JSON.parse(json).results;
         for ( var key in objectArray ) {
             var jo = objectArray[key];

=== added file 'models/Person.qml'
--- models/Person.qml	1970-01-01 00:00:00 +0000
+++ models/Person.qml	2013-11-17 16:42:59 +0000
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+
+BaseModel {
+    id: person
+
+    property variant attributes: {
+      'name': '',
+      'biography': '',
+      'birthday': '',
+      'deathday': '',
+      'homepage': '',
+      'placeOfBirth': '',
+      'thumb_url': ''
+    }
+
+    function updateJSONModel() {
+        var ob = JSON.parse(json);
+        attributes = {
+            'id': ob.id,
+            'name': ob.name,
+            'biography': ob.biography,
+            'birthday': ob.birthday,
+            'deathday': ob.deathday,
+            'homepage': ob.homepage,
+            'placeOfBirth': ob.place_of_birth,
+            'thumb_url': thumbnail_url(ob.profile_path),
+            'combinedCreditsJson': JSON.stringify(ob.combined_credits || {})
+        };
+    }
+}

=== added file 'models/PersonCast.qml'
--- models/PersonCast.qml	1970-01-01 00:00:00 +0000
+++ models/PersonCast.qml	2013-11-17 16:42:59 +0000
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+
+BaseModel {
+    id: personCast
+
+    function updateJSONModel() {
+        model.clear();
+
+        var objectArray = JSON.parse(json).cast;
+        for ( var key in objectArray ) {
+            var jo = objectArray[key];
+            model.append({
+                'id': jo.id,
+                'title': jo.title,
+                'character': jo.character,
+                'releaseDate': jo.release_date,
+                'mediaType': jo.media_type,
+                'thumb_url': thumbnail_url(jo.poster_path)
+            });
+        }
+    }
+}

=== added file 'models/PersonCrew.qml'
--- models/PersonCrew.qml	1970-01-01 00:00:00 +0000
+++ models/PersonCrew.qml	2013-11-17 16:42:59 +0000
@@ -0,0 +1,21 @@
+import QtQuick 2.0
+
+BaseModel {
+    id: personCrew
+    function updateJSONModel() {
+        model.clear();
+
+        var objectArray = JSON.parse(json).crew;
+        for ( var key in objectArray ) {
+            var jo = objectArray[key];
+            model.append({
+                'id': jo.id,
+                'title': jo.title,
+                'department': jo.department,
+                'releaseDate': jo.release_date,
+                'mediaType': jo.media_type,
+                'thumb_url': thumbnail_url(jo.profile_path)
+            });
+        }
+    }
+}

=== modified file 'models/Shows.qml'
--- models/Shows.qml	2013-11-15 10:57:48 +0000
+++ models/Shows.qml	2013-11-17 16:42:59 +0000
@@ -6,9 +6,6 @@
     function updateJSONModel() {
         model.clear();
 
-        if ( json === "" )
-            return;
-
         var objectArray = JSON.parse(json).results;
         for ( var key in objectArray ) {
             var jo = objectArray[key];

=== modified file 'ui/MoviePage.qml'
--- ui/MoviePage.qml	2013-11-15 09:48:33 +0000
+++ ui/MoviePage.qml	2013-11-17 16:42:59 +0000
@@ -13,52 +13,30 @@
     flickable: null
 
     property string movie_id
-    property string movie_url: root.baseUrl + "/movie/" + movie_id + root.api_Key + "&append_to_response=credits"
-
-    Component.onCompleted: movieWorker.sendMessage({"movie_url": movie_url})
 
     Cast {
       id: movieCast
-      source: Backend.movieCastUrl(movie_id)
     }
 
     Crew {
       id: movieCrew
-      source: Backend.movieCrewUrl(movie_id)
     }
 
     Movies {
       id: similarMoviesModel
-      source: Backend.similarMoviesUrl(movie_id)
-    }
-
-    WorkerScript {
-        id: movieWorker
-        source: "../backend/MovieDetails.js"
-        onMessage: {
-            if(messageObject.poster == null)
-                thumb.source = Qt.resolvedUrl("../graphics/toolbarIcon.png")
-            else
-                thumb.source = "http://d3gtl9l2a4fn1j.cloudfront.net/t/p/" + "w185/" + messageObject.poster
-
-            title.text = messageObject.title
-            description.text = messageObject.description
-            releaseDate.subText = messageObject.releasedate
-            year.text = releaseDate.subText.split("-")[0]
-            runTime.text = messageObject.runtime + " minutes"
-
-            var genreModel = messageObject.genre
-            for (var i=0; i<genreModel.length; i++) {
-                if(genre.subText != "")
-                    genre.subText = genre.subText + ", " + genreModel[i].name
-                else
-                    genre.subText = genreModel[i].name
-            }
-
-            theme.subText = messageObject.theme
-            rating.text = messageObject.avg_vote + "/10\n" + messageObject.total_vote
-        }
-    }
+    }
+
+    Movie {
+      id: movie
+      source: Backend.movieUrl(movie_id, {appendToResponse: ['credits', 'similar_movies']})
+
+      onUpdated: {
+        movieCast.json = movie.attributes.creditsJson;
+        movieCrew.json = movie.attributes.creditsJson;
+        similarMoviesModel.json = movie.attributes.similarMoviesJson;
+      }
+    }
+
 
     Overlay {
         id: summaryOverlay
@@ -75,7 +53,7 @@
                 bottomMargin: units.gu(12)
             }
 
-            text: description.text
+            text: movie.attributes.overview
             wrapMode: Text.WordWrap
         }
     }
@@ -153,11 +131,12 @@
                 id: thumb
                 fillMode: Image.PreserveAspectFit
                 smooth: true
+                source: movie.attributes.thumb_url
             }
 
             ActivityIndicator {
                 anchors.centerIn: parent
-                running: thumb.status != Image.Ready ? true : false
+                running: thumb.status != Image.Ready
             }
         }
 
@@ -175,6 +154,7 @@
             spacing: units.gu(2)
             Label {
                 id: title
+                text: movie.attributes.title
                 fontSize: "large"
                 width: movieColumn.width
                 maximumLineCount: 2
@@ -183,7 +163,8 @@
             }
 
             Label {
-                id: description
+                id: overview
+                text: movie.attributes.overview
                 fontSize: "medium"
                 width: movieColumn.width
                 height: movieColumn.height/2
@@ -196,8 +177,15 @@
             }
 
             Column {
-                Label { id: year }
-                Label { id: runTime }
+                Label { 
+                  id: year
+                  text: movie.attributes.releaseDate.split('-')[0]
+                }
+                Label {
+                  id: runTime
+                  text: movie.attributes.runtime + " minutes"
+                  visible: movie.attributes.runtime != '0'
+                }
             }
         }
 
@@ -220,7 +208,10 @@
                 smooth: true
             }
 
-            Label { id: rating }
+            Label {
+                id: rating 
+                text: movie.attributes.voteAverage+"\n"+movie.attributes.voteCount
+            }
         }
 
         // Movie Details - Release dates, genre, movie theme etc.
@@ -243,19 +234,22 @@
             Header { text: "Details" }
 
             Subtitled {
-              id: genre
-              text: "Genre"
+              id: genres
+              text: "Genres"
+              subText: movie.attributes.genres.map(function(o) { return o.name }).join(', ')
             }
 
             Subtitled {
               id: releaseDate
               text: "Release Date"
+              subText: movie.attributes.releaseDate
             }
 
             Subtitled {
               id: theme
-              text: "Movie Theme"
-              visible: theme.subText == "" ? false : true
+              text: "Tagline"
+              subText: movie.attributes.tagline
+              visible: movie.attributes.tagline
             }
 
             Header { text: "Casts" }

=== modified file 'ui/PersonPage.qml'
--- ui/PersonPage.qml	2013-11-13 21:28:13 +0000
+++ ui/PersonPage.qml	2013-11-17 16:42:59 +0000
@@ -1,6 +1,8 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
+import '../models'
+import '../backend/backend.js' as Backend
 
 Page {
     id: personPage
@@ -9,29 +11,24 @@
     flickable: null
 
     property string person_id
-    property string person_url: root.baseUrl + "/person/" + person_id + root.api_Key + "&append_to_response=combined_credits"
-
-    Component.onCompleted: personWorker.sendMessage({"person_url": person_url, "actedModel": actedModel, "directedModel": directedModel})
-
-    ListModel { id: actedModel }
-    ListModel { id: directedModel }
-
-    WorkerScript {
-        id: personWorker
-        source: "../backend/PersonDetails.js"
-        onMessage: {
-            if(messageObject.poster == null)
-                thumb.source = Qt.resolvedUrl("../graphics/toolbarIcon.png")
-            else
-                thumb.source = "http://d3gtl9l2a4fn1j.cloudfront.net/t/p/" + "w185/" + messageObject.poster
-
-            name.text = messageObject.name
-            biography.text = messageObject.biography == null ? "Biography not available" : messageObject.biography
-            birthYear.text = messageObject.birthday == null ? "Not Available" : "Born: " + messageObject.birthday
-            deathYear.text = messageObject.deathday == null ? "Not Available" :"Dead: " + messageObject.deathday
-            birthPlace.text = messageObject.place_of_birth == null ? "Birth Place Not Available" : messageObject.place_of_birth
-            contact.text = messageObject.homepage
-        }
+
+    PersonCast {
+      id: personCast
+    }
+
+    PersonCrew {
+      id: personCrew
+    }
+
+    Person {
+      id: person
+
+      source: Backend.personUrl(person_id, {appendToResponse: ['combined_credits']})
+
+      onUpdated: {
+        personCast.json = person.attributes.combinedCreditsJson;
+        personCrew.json = person.attributes.combinedCreditsJson;
+      }
     }
 
     Flickable {
@@ -56,11 +53,12 @@
                 id: thumb
                 fillMode: Image.PreserveAspectFit
                 smooth: true
+                source: person.attributes.thumb_url
             }
 
             ActivityIndicator {
                 anchors.centerIn: parent
-                running: thumb.status != Image.Ready ? true : false
+                running: thumb.status != Image.Ready
             }
         }
 
@@ -79,6 +77,7 @@
 
             Label {
                 id: name
+                text: person.attributes.name
                 fontSize: "large"
                 width: personColumn.width
                 maximumLineCount: 2
@@ -89,6 +88,7 @@
             Column {
                 Label {
                     id: birthPlace
+                    text: person.attributes.placeOfBirth
                     fontSize: "medium"
                     width: personColumn.width
                     elide: Text.ElideRight
@@ -97,8 +97,9 @@
 
                 Label {
                     id: birthYear
+                    text: "Birth: " + person.attributes.birthday.split('-')[0]
                     fontSize: "medium"
-                    visible: text == "Not Available" ? false: true
+                    visible: person.attributes.birthday
                     width: personColumn.width
                     elide: Text.ElideRight
                     wrapMode: Text.WordWrap
@@ -106,8 +107,9 @@
 
                 Label {
                     id: deathYear
+                    text: "Death: " + person.attributes.deathday.split('-')[0]
                     fontSize: "medium"
-                    visible: text == "Dead: " || text == "Not Available" ? false : true
+                    visible: person.attributes.deathday 
                     width: personColumn.width
                     elide: Text.ElideRight
                     wrapMode: Text.WordWrap
@@ -115,13 +117,14 @@
 
                 Label {
                     id: contact
+                    text: person.attributes.homepage
                     fontSize: "medium"
                     width: personColumn.width
                     elide: Text.ElideRight
                     wrapMode: Text.WordWrap
                     MouseArea {
                         anchors.fill: parent
-                        enabled: contact.text == "null" ? false : true
+                        enabled: person.attributes.homepage
                         onClicked: Qt.openUrlExternally(contact.text)
                     }
                 }
@@ -130,6 +133,7 @@
 
         Label {
             id: biography
+            text: person.attributes.biography
             anchors {
                 top: personColumn.bottom
                 left: parent.left
@@ -154,10 +158,13 @@
 
             Header {
                 text: "Acting"
-                visible: actedModel.count !== 0
+                visible: personCast.count > 0
             }
 
             ListView {
+                id: personCastView
+                model: personCast.model
+
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -165,22 +172,23 @@
 
                 height: units.gu(20)
                 clip: true
-
-                model: actedModel
                 delegate: Subtitled {
-                    icon: iconUrl == "null" ? Qt.resolvedUrl("../graphics/toolbarIcon.png") : iconUrl
+                    icon: thumb_url
                     text: title
                     subText: character
-                    onClicked: media_type == "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}) : console.log("Not a movie")
                 }
             }
 
             Header {
                 text: "Production"
-                visible: directedModel.count !== 0
+                visible: personCrew.count > 0
             }
 
             ListView {
+                id: personCrewView
+                model: personCrew.model
+
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -188,13 +196,11 @@
 
                 height: units.gu(20)
                 clip: true
-
-                model: directedModel
                 delegate: Subtitled {
-                    icon: iconUrl == "null" ? Qt.resolvedUrl("../graphics/toolbarIcon.png") : iconUrl
+                    icon: thumb_url
                     text: title
-                    subText: character
-                    onClicked: media_type == "movie" ? pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": id}) : console.log("Not a movie")
+                    subText: department
+                    onClicked: mediaType == "movie" ? pageStack.push(Qt.resolvedUrl("MoviePage.qml"), {"movie_id": id}) : console.log("Not a movie")
                 }
             }
         }