import urllib
import urllib2
import json
+import ast
from xbmcaddon import Addon
from urlparse import parse_qsl
from utils import noop, log
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':
# 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['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()
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
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):
"""
# determine if we´re in kids mode
user_data = self.call_netflix_service({'method': 'get_user_data'})
- profiles = self.call_netflix_service({'method': 'list_profiles'})
- is_kids = profiles.get(user_data['guid']).get('isKids', False)
- # fetch video lists
- if is_kids == True:
- video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids_for_kids'})
- else:
- video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids', 'type': type})
+ video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids', 'guid': user_data['guid'], 'cache': True})
# check for any errors
if self._is_dirty_response(response=video_list_ids):
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})
# sort seasons by number (they´re coming back unsorted from the api)
episodes_sorted = []
for episode_id in episode_list:
+ episode_list[episode_id]['tvshowtitle'] = tvshowtitle
episodes_sorted.append(int(episode_list[episode_id]['episode']))
episodes_sorted.sort()
# list the episodes
return self.kodi_helper.build_episode_listing(episodes_sorted=episodes_sorted, episode_list=episode_list, 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
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
# sort seasons by index by default (they´re coming back unsorted from the api)
seasons_sorted = []
for season_id in season_list:
+ season_list[season_id]['tvshowtitle'] = tvshowtitle
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)
def show_video_lists (self):
"""List the users video lists (recommendations, my list, etc.)"""
- # determine if we´re in Kids profile mode
user_data = self.call_netflix_service({'method': 'get_user_data'})
- profiles = self.call_netflix_service({'method': 'list_profiles'})
- is_kids = profiles.get(user_data['guid']).get('isKids', False)
- # fetch video lists
- if is_kids == True:
- video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids_for_kids', 'guid': user_data['guid'], 'cache': True})
- else:
- video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids', 'guid': user_data['guid'], 'cache': True})
-
+ video_list_ids = self.call_netflix_service({'method': 'fetch_video_list_ids', 'guid': user_data['guid'], 'cache': True})
# check for any errors
if self._is_dirty_response(response=video_list_ids):
return False
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
"""
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()
projects / plugin.video.netflix.git / blobdiff