From 2923983f7fa35da85af850617cf6399353c86dc8 Mon Sep 17 00:00:00 2001 From: Maven85 Date: Mon, 31 Jul 2017 09:09:53 +0200 Subject: [PATCH] add 'tvshowtitle' to listitem's infoLabels --- resources/lib/KodiHelper.py | 31 +++++++++++++++++++++---------- resources/lib/Navigation.py | 10 ++++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index 7e18113..c468330 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) + 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,7 +648,7 @@ 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']}) xbmcplugin.addDirectoryItem(handle=self.plugin_handle, url=url, listitem=li, isFolder=False) @@ -801,6 +808,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 +829,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..7de1f91 100644 --- a/resources/lib/Navigation.py +++ b/resources/lib/Navigation.py @@ -80,10 +80,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': @@ -169,7 +169,7 @@ 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 @@ -185,13 +185,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 @@ -215,6 +216,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) -- 2.30.2