From: Sebastian Golasch Date: Thu, 3 Aug 2017 19:10:06 +0000 (+0200) Subject: Merge pull request #82 from itay47/master X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=commitdiff_plain;h=284dd0d3f0a7763fafe1a71c4a45d45b21a7d217;hp=ff2b5ac70453c86580956b4e0f6b16bb514c9566 Merge pull request #82 from itay47/master Added Hebrew translation --- diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index 7e18113..5b45281 100644 --- a/resources/lib/KodiHelper.py +++ b/resources/lib/KodiHelper.py @@ -469,17 +469,21 @@ class KodiHelper: li = xbmcgui.ListItem(label=video['title']) # add some art to the item li = self._generate_art_info(entry=video, li=li) - # it´s a show, so we need a subfolder & route (for seasons) - isFolder = True - url = build_url({'action': actions[video['type']], 'show_id': video_list_id}) + # add list item info + li, infos = self._generate_entry_info(entry=video, li=li) + li = self._generate_context_menu_items(entry=video, li=li) # lists can be mixed with shows & movies, therefor we need to check if its a movie, so play it right away if video_list[video_list_id]['type'] == 'movie': # it´s a movie, so we need no subfolder & a route to play it isFolder = False - url = build_url({'action': 'play_video', 'video_id': video_list_id}) - # add list item info - li = self._generate_entry_info(entry=video, li=li) - li = self._generate_context_menu_items(entry=video, li=li) + url = build_url({'action': 'play_video', 'video_id': video_list_id, 'infoLabels': infos}) + else: + # it´s a show, so we need a subfolder & route (for seasons) + isFolder = True + params = {'action': actions[video['type']], 'show_id': video_list_id} + if 'tvshowtitle' in infos: + params['tvshowtitle'] = infos['tvshowtitle'] + url = build_url(params) xbmcplugin.addDirectoryItem(handle=self.plugin_handle, url=url, listitem=li, isFolder=isFolder) xbmcplugin.addSortMethod(handle=self.plugin_handle, sortMethod=xbmcplugin.SORT_METHOD_LABEL) @@ -601,9 +605,12 @@ class KodiHelper: # add some art to the item li = self._generate_art_info(entry=season, li=li) # add list item info - li = self._generate_entry_info(entry=season, li=li, base_info={'mediatype': 'season'}) + li, infos = self._generate_entry_info(entry=season, li=li, base_info={'mediatype': 'season'}) li = self._generate_context_menu_items(entry=season, li=li) - url = build_url({'action': 'episode_list', 'season_id': season_id}) + params = {'action': 'episode_list', 'season_id': season_id} + if 'tvshowtitle' in infos: + params['tvshowtitle'] = infos['tvshowtitle'] + url = build_url(params) xbmcplugin.addDirectoryItem(handle=self.plugin_handle, url=url, listitem=li, isFolder=True) xbmcplugin.addSortMethod(handle=self.plugin_handle, sortMethod=xbmcplugin.SORT_METHOD_NONE) @@ -641,9 +648,9 @@ class KodiHelper: # add some art to the item li = self._generate_art_info(entry=episode, li=li) # add list item info - li = self._generate_entry_info(entry=episode, li=li, base_info={'mediatype': 'episode'}) + li, infos = self._generate_entry_info(entry=episode, li=li, base_info={'mediatype': 'episode'}) li = self._generate_context_menu_items(entry=episode, li=li) - url = build_url({'action': 'play_video', 'video_id': episode_id, 'start_offset': episode['bookmark']}) + url = build_url({'action': 'play_video', 'video_id': episode_id, 'start_offset': episode['bookmark'], 'infoLabels': infos}) xbmcplugin.addDirectoryItem(handle=self.plugin_handle, url=url, listitem=li, isFolder=False) xbmcplugin.addSortMethod(handle=self.plugin_handle, sortMethod=xbmcplugin.SORT_METHOD_EPISODE) @@ -656,7 +663,7 @@ class KodiHelper: xbmcplugin.endOfDirectory(self.plugin_handle) return True - def play_item (self, esn, video_id, start_offset=-1): + def play_item (self, esn, video_id, start_offset=-1, infoLabels={}): """Plays a video Parameters @@ -669,6 +676,9 @@ class KodiHelper: start_offset : :obj:`str` Offset to resume playback from (in seconds) + + infoLabels : :obj:`str` + the listitem's infoLabels Returns ------- @@ -706,6 +716,9 @@ class KodiHelper: # check if we have a bookmark e.g. start offset position if int(start_offset) > 0: play_item.setProperty('StartOffset', str(start_offset) + '.0') + # set infoLabels + if len(infoLabels) > 0: + play_item.setInfo('video', infoLabels) return xbmcplugin.setResolvedUrl(self.plugin_handle, True, listitem=play_item) def _generate_art_info (self, entry, li): @@ -801,6 +814,8 @@ class KodiHelper: if 'type' in entry_keys: if entry['type'] == 'movie' or entry['type'] == 'episode': li.setProperty('IsPlayable', 'true') + elif entry['type'] == 'show': + infos.update({'tvshowtitle': entry['title']}) if 'mediatype' in entry_keys: if entry['mediatype'] == 'movie' or entry['mediatype'] == 'episode': li.setProperty('IsPlayable', 'true') @@ -820,8 +835,10 @@ class KodiHelper: if entry['quality'] == '1080': quality = {'width': '1920', 'height': '1080'} li.addStreamInfo('video', quality) + if 'tvshowtitle' in entry_keys: + infos.update({'tvshowtitle': entry['tvshowtitle']}) li.setInfo('video', infos) - return li + return li, infos def _generate_context_menu_items (self, entry, li): """Adds context menue items to a Kodi list item diff --git a/resources/lib/Navigation.py b/resources/lib/Navigation.py index 9320b97..1643706 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['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): @@ -169,13 +177,16 @@ 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}) @@ -185,13 +196,14 @@ class Navigation: # 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 @@ -199,6 +211,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 @@ -215,6 +229,7 @@ class Navigation: # 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)