X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=resources%2Flib%2FNavigation.py;h=ea6e81bdfaa7e798ca598e27e35ba7332047bb0c;hp=894fc81e93240bbba264561abd35d693599fb65b;hb=a91acab543cb2ed17672e46f5171af92172b5a28;hpb=4992e07aa489c7b2da627ab57769c4b0b03c6e62

diff --git a/resources/lib/Navigation.py b/resources/lib/Navigation.py
index 894fc81..ea6e81b 100644
--- a/resources/lib/Navigation.py
+++ b/resources/lib/Navigation.py
@@ -6,6 +6,7 @@
 import urllib
 import urllib2
 import json
+import ast
 from xbmcaddon import Addon
 from urlparse import parse_qsl
 from utils import noop, log
@@ -80,10 +81,10 @@ class Navigation:
             return self.show_video_list(video_list_id=params['video_list_id'], type=type)
         elif params['action'] == 'season_list':
             # list of seasons for a show
-            return self.show_seasons(show_id=params['show_id'])
+            return self.show_seasons(show_id=params['show_id'], tvshowtitle=params['tvshowtitle'])
         elif params['action'] == 'episode_list':
             # list of episodes for a season
-            return self.show_episode_list(season_id=params['season_id'])
+            return self.show_episode_list(season_id=params['season_id'], tvshowtitle=params['tvshowtitle'])
         elif params['action'] == 'rating':
             return self.rate_on_netflix(video_id=params['id'])
         elif params['action'] == 'remove_from_list':
@@ -105,7 +106,7 @@ class Navigation:
             # display the lists (recommendations, genres, etc.)
             return self.show_user_list(type=params['type'])
         elif params['action'] == 'play_video':
-            self.play_video(video_id=params['video_id'], start_offset=params.get('start_offset', -1))
+            self.play_video(video_id=params['video_id'], start_offset=params.get('start_offset', -1), infoLabels=params.get('infoLabels', {}))
         elif params['action'] == 'user-items' and params['type'] == 'search':
             # if the user requested a search, ask for the term
             term = self.kodi_helper.show_search_term_dialog()
@@ -115,7 +116,7 @@ class Navigation:
         return True
 
     @log
-    def play_video (self, video_id, start_offset):
+    def play_video (self, video_id, start_offset, infoLabels):
         """Starts video playback
 
         Note: This is just a dummy, inputstream is needed to play the vids
@@ -127,9 +128,16 @@ class Navigation:
 
         start_offset : :obj:`str`
             Offset to resume playback from (in seconds)
+
+        infoLabels : :obj:`str`
+            the listitem's infoLabels
         """
+        try:
+            infoLabels = ast.literal_eval(infoLabels)
+        except:
+            infoLabels= {}
         esn = self.call_netflix_service({'method': 'get_esn'})
-        return self.kodi_helper.play_item(esn=esn, video_id=video_id, start_offset=start_offset)
+        return self.kodi_helper.play_item(esn=esn, video_id=video_id, start_offset=start_offset, infoLabels=infoLabels)
 
     @log
     def show_search_results (self, term):
@@ -161,7 +169,7 @@ class Navigation:
         user_list_id : :obj:`str`
             Type of list to display
         """
-        # determine if we´re in kids mode
+        # determine if we´re in kids mode
         user_data = self.call_netflix_service({'method': 'get_user_data'})
         video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids', 'guid': user_data['guid'], 'cache': True})
         # check for any errors
@@ -169,29 +177,36 @@ class Navigation:
             return False
         return self.kodi_helper.build_user_sub_listing(video_list_ids=video_list_ids[type], type=type, action='video_list', build_url=self.build_url)
 
-    def show_episode_list (self, season_id):
+    def show_episode_list (self, season_id, tvshowtitle):
         """Lists all episodes for a given season
 
         Parameters
         ----------
         season_id : :obj:`str`
             ID of the season episodes should be displayed for
+
+        tvshowtitle : :obj:`str`
+            title of the show (for listitems' infolabels)
         """
         user_data = self.call_netflix_service({'method': 'get_user_data'})
         episode_list = self.call_netflix_service({'method': 'fetch_episodes_by_season', 'season_id': season_id, 'guid': user_data['guid'], 'cache': True})
         # check for any errors
         if self._is_dirty_response(response=episode_list):
             return False
-        # sort seasons by number (they´re coming back unsorted from the api)
-        episodes_sorted = []
-        for episode_id in episode_list:
-            episodes_sorted.append(int(episode_list[episode_id]['episode']))
-            episodes_sorted.sort()
+
+        # Extract episode numbers and associated keys.
+        d = [(v['episode'], k) for k, v in episode_list.items()]
+
+        # sort episodes by number (they´re coming back unsorted from the api)
+        episodes_sorted = [episode_list[k] for (_, k) in sorted(d)]
+
+        for episode in episodes_sorted:
+            episode['tvshowtitle'] = tvshowtitle
 
         # list the episodes
-        return self.kodi_helper.build_episode_listing(episodes_sorted=episodes_sorted, episode_list=episode_list, build_url=self.build_url)
+        return self.kodi_helper.build_episode_listing(episodes_sorted=episodes_sorted, build_url=self.build_url)
 
-    def show_seasons (self, show_id):
+    def show_seasons (self, show_id, tvshowtitle):
         """Lists all seasons for a given show
 
         Parameters
@@ -199,6 +214,8 @@ class Navigation:
         show_id : :obj:`str`
             ID of the show seasons should be displayed for
 
+        tvshowtitle : :obj:`str`
+            title of the show (for listitems' infolabels)
         Returns
         -------
         bool
@@ -212,12 +229,17 @@ class Navigation:
         # check if we have sesons, announced shows that are not available yet have none
         if len(season_list) == 0:
             return self.kodi_helper.build_no_seasons_available()
-        # sort seasons by index by default (they´re coming back unsorted from the api)
-        seasons_sorted = []
-        for season_id in season_list:
-            seasons_sorted.append(int(season_list[season_id]['idx']))
-            seasons_sorted.sort()
-        return self.kodi_helper.build_season_listing(seasons_sorted=seasons_sorted, season_list=season_list, build_url=self.build_url)
+
+        # Extract episode numbers and associated keys.
+        d = [(v['idx'], k) for k, v in season_list.items()]
+
+        # sort seasons by index by default (they´re coming back unsorted from the api)
+        seasons_sorted = [season_list[k] for (_, k) in sorted(d)]
+
+        for season in seasons_sorted:
+            season['tvshowtitle'] = tvshowtitle
+
+        return self.kodi_helper.build_season_listing(seasons_sorted=seasons_sorted, build_url=self.build_url)
 
     def show_video_list (self, video_list_id, type):
         """List shows/movies based on the given video list id
@@ -228,7 +250,7 @@ class Navigation:
             ID of the video list that should be displayed
 
         type : :obj:`str`
-            None or 'queue' f.e. when it´s a special video lists
+            None or 'queue' f.e. when it´s a special video lists
         """
         user_data = self.call_netflix_service({'method': 'get_user_data'})
         video_list = self.call_netflix_service({'method': 'fetch_video_list', 'list_id': video_list_id, 'guid': user_data['guid'] ,'cache': True})
@@ -257,7 +279,7 @@ class Navigation:
         profiles = self.call_netflix_service({'method': 'list_profiles'})
         if len(profiles) == 0:
             return self.kodi_helper.show_login_failed_notification()
-        return self.kodi_helper.build_profiles_listing(profiles=profiles, action='video_lists', build_url=self.build_url)
+        return self.kodi_helper.build_profiles_listing(profiles=profiles.values(), action='video_lists', build_url=self.build_url)
 
     @log
     def rate_on_netflix (self, video_id):
@@ -509,7 +531,7 @@ class Navigation:
         str
             Url + Port
         """
-        return 'http://localhost:' + str(self.kodi_helper.addon.getSetting('netflix_service_port'))
+        return 'http://127.0.0.1:' + str(self.kodi_helper.get_addon().getSetting('netflix_service_port'))
 
     def call_netflix_service (self, params):
         """Makes a GET request to the internal Netflix HTTP proxy and returns the result
@@ -526,9 +548,14 @@ class Navigation:
         """
         url_values = urllib.urlencode(params)
         # check for cached items
-        if self.kodi_helper.has_cached_item(cache_id=url_values) and params.get('cache', False) == True:
-            self.log(msg='Fetching item from cache: (cache_id=' + url_values + ')')
-            return self.kodi_helper.get_cached_item(cache_id=url_values)
+        if params.get('cache', False) == True:
+            cached_value = self.kodi_helper.get_cached_item(cache_id=url_values)
+
+            # Cache lookup successful?
+            if cached_value != None:
+                self.log(msg='Fetched item from cache: (cache_id=' + url_values + ')')
+                return cached_value
+
         url = self.get_netflix_service_url()
         full_url = url + '?' + url_values
         data = urllib2.urlopen(full_url).read()
@@ -543,4 +570,4 @@ class Navigation:
         """Opens a foreign settings dialog"""
         is_addon = self.kodi_helper.get_inputstream_addon()
         url = is_addon if url == 'is' else url
-        return Addon(url).openSettings()
+        return Addon(url).openSettings()
\ No newline at end of file