diff --git a/core/tmdb.py b/core/tmdb.py index 0d863929..f036a5ba 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -533,8 +533,10 @@ def get_nfo(item, search_groups=False): groups = get_groups(item) if groups: - Id = select_group(groups) - if Id: + Id = select_group(groups, item) + if Id == 'original': + pass + elif Id : info_nfo = 'https://www.themoviedb.org/tv/{}/episode_group/{}\n'.format(item.infoLabels['tmdb_id'], Id) return info_nfo else: return @@ -551,12 +553,14 @@ def get_groups(item): groups = requests.get(url).json().get('results',[]) return groups -def select_group(groups): +def select_group(groups, item): selected = -1 - selections = [] - ids = [] + url = 'https://api.themoviedb.org/3/tv/{}?api_key=a1ab8b8669da03637a4b98fa39c39228&language={}'.format(item.infoLabels['tmdb_id'], def_lang) + res = requests.get(url).json() + selections = ['[B]Original[/B] Seasons: {} Episodes: {}'.format(res.get('number_of_seasons',0), res.get('number_of_episodes',0))] + ids = ['original'] for group in groups: - name = '[B]{}[/B] Seasons: {} Episodes: {}'.format(group.get('name',''), group.get('group_count',''), group.get('episode_count','')) + name = '[B]{}[/B] Seasons: {} Episodes: {}'.format(group.get('name',''), group.get('group_count',0), group.get('episode_count',0)) description = group.get('description','') if description: name = '{}\n{}'.format(name, description) diff --git a/platformcode/autorenumber.py b/platformcode/autorenumber.py index 2f32c261..08113432 100644 --- a/platformcode/autorenumber.py +++ b/platformcode/autorenumber.py @@ -200,9 +200,9 @@ class autorenumber(): Id = None groups = tmdb.get_groups(self.item) if groups: - Id = tmdb.select_group(groups) + Id = tmdb.select_group(groups, self.item) - if Id: + if Id and Id != 'original': self.group = 'https://www.themoviedb.org/tv/{}/episode_group/{}'.format(self.item.infoLabels['tmdb_id'], Id) seasons = [] groupedSeasons = tmdb.get_group(Id) diff --git a/resources/skins/Default/720p/SelectGroup.xml b/resources/skins/Default/720p/SelectGroup.xml index 38c90e2f..8ded74c2 100644 --- a/resources/skins/Default/720p/SelectGroup.xml +++ b/resources/skins/Default/720p/SelectGroup.xml @@ -37,7 +37,7 @@ 30 70 - 595 + 795 530 List @@ -88,16 +88,16 @@ Scrollbar - 595 - 60 + 800 + 0 5 - 100% + 470 true white.png white.png white.png - white.png - white.png + white.png + white.png vertical false 2 @@ -106,7 +106,7 @@ Close Button - 30 + 20 10 40 40