From 7afec310e04492b290523718b7f7ef8df0ef7ccf Mon Sep 17 00:00:00 2001 From: Maven85 Date: Mon, 31 Jul 2017 10:08:19 +0200 Subject: [PATCH] add infoLabels to inputstream's listitem --- resources/lib/KodiHelper.py | 12 +++++++++--- resources/lib/Navigation.py | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index c468330..5b45281 100644 --- a/resources/lib/KodiHelper.py +++ b/resources/lib/KodiHelper.py @@ -476,7 +476,7 @@ class KodiHelper: 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}) + 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 @@ -650,7 +650,7 @@ class KodiHelper: # add list item info 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) @@ -663,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 @@ -676,6 +676,9 @@ class KodiHelper: start_offset : :obj:`str` Offset to resume playback from (in seconds) + + infoLabels : :obj:`str` + the listitem's infoLabels Returns ------- @@ -713,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): diff --git a/resources/lib/Navigation.py b/resources/lib/Navigation.py index 7de1f91..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 @@ -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): @@ -176,6 +184,9 @@ class Navigation: ---------- 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}) @@ -200,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 -- 2.30.2