monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-08 11:03:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix metadata Season Posters and Banners.

Browse source
This commit is contained in:
JackDandy 2017-12-09 03:53:22 +00:00
parent 7b3e702b48
commit cceb010e0e
1 changed files with 36 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
sickbeard/metadata/generic.py
View file

@ -592,12 +592,10 @@ class GenericMetadata():
show_obj: a TVShow object for which to save the season thumbs show_obj: a TVShow object for which to save the season thumbs
Cycles through all seasons and saves the season posters if possible. This Cycles through all seasons and saves the season posters if possible.
method should not need to be overridden by implementing classes, changing
_season_posters_dict and get_season_poster_path should be good enough.
""" """
season_dict = self._season_posters_dict(show_obj, season) season_dict = self._season_image_dict(show_obj, season, 'seasons')
result = [] result = []
# Returns a nested dictionary of season art with the season # Returns a nested dictionary of season art with the season
@ -607,7 +605,7 @@ class GenericMetadata():
cur_season_art = season_dict[cur_season] cur_season_art = season_dict[cur_season]
if len(cur_season_art) == 0: if 0 == len(cur_season_art):
continue continue
# Just grab whatever's there for now # Just grab whatever's there for now
@ -616,36 +614,32 @@ class GenericMetadata():
season_poster_file_path = self.get_season_poster_path(show_obj, cur_season) season_poster_file_path = self.get_season_poster_path(show_obj, cur_season)
if not season_poster_file_path: if not season_poster_file_path:
logger.log(u"Path for season " + str(cur_season) + " came back blank, skipping this season", logger.log(u'Path for season ' + str(cur_season) + ' came back blank, skipping this season',
logger.DEBUG) logger.DEBUG)
continue continue
seasonData = metadata_helpers.getShowImage(season_url, showName=show_obj.name) season_data = metadata_helpers.getShowImage(season_url, showName=show_obj.name)
if not seasonData: if not season_data:
logger.log(u"No season poster data available, skipping this season", logger.DEBUG) logger.log(u'No season poster data available, skipping this season', logger.DEBUG)
continue continue
result = result + [self._write_image(seasonData, season_poster_file_path)] result = result + [self._write_image(season_data, season_poster_file_path)]
if result: if result:
return all(result) return all(result)
else:
return False return False
return True
def save_season_banners(self, show_obj, season): def save_season_banners(self, show_obj, season):
""" """
Saves all season banners to disk for the given show. Saves all season banners to disk for the given show.
show_obj: a TVShow object for which to save the season thumbs show_obj: a TVShow object for which to save the season thumbs
Cycles through all seasons and saves the season banners if possible. This Cycles through all seasons and saves the season banners if possible.
method should not need to be overridden by implementing classes, changing
_season_banners_dict and get_season_banner_path should be good enough.
""" """
season_dict = self._season_banners_dict(show_obj, season) season_dict = self._season_image_dict(show_obj, season, 'seasonwides')
result = [] result = []
# Returns a nested dictionary of season art with the season # Returns a nested dictionary of season art with the season
@ -655,7 +649,7 @@ class GenericMetadata():
cur_season_art = season_dict[cur_season] cur_season_art = season_dict[cur_season]
if len(cur_season_art) == 0: if 0 == len(cur_season_art):
continue continue
# Just grab whatever's there for now # Just grab whatever's there for now
@ -664,24 +658,22 @@ class GenericMetadata():
season_banner_file_path = self.get_season_banner_path(show_obj, cur_season) season_banner_file_path = self.get_season_banner_path(show_obj, cur_season)
if not season_banner_file_path: if not season_banner_file_path:
logger.log(u"Path for season " + str(cur_season) + " came back blank, skipping this season", logger.log(u'Path for season ' + str(cur_season) + ' came back blank, skipping this season',
logger.DEBUG) logger.DEBUG)
continue continue
seasonData = metadata_helpers.getShowImage(season_url, showName=show_obj.name) season_data = metadata_helpers.getShowImage(season_url, showName=show_obj.name)
if not seasonData: if not season_data:
logger.log(u"No season banner data available, skipping this season", logger.DEBUG) logger.log(u'No season banner data available, skipping this season', logger.DEBUG)
continue continue
result = result + [self._write_image(seasonData, season_banner_file_path)] result = result + [self._write_image(season_data, season_banner_file_path)]
if result: if result:
return all(result) return all(result)
else:
return False return False
return True
def save_season_all_poster(self, show_obj, which=None): def save_season_all_poster(self, show_obj, which=None):
# use the default season all poster name # use the default season all poster name
poster_path = self.get_season_all_poster_path(show_obj) poster_path = self.get_season_all_poster_path(show_obj)
@ -836,110 +828,42 @@ class GenericMetadata():
return None return None
def _season_posters_dict(self, show_obj, season): @staticmethod
def _season_image_dict(show_obj, season, image_type):
""" """
image_type : Type of image to fetch, 'seasons' or 'seasonwides'
image_type type : String
Should return a dict like: Should return a dict like:
result = {<season number>: result = {<season number>:
{1: '<url 1>', 2: <url 2>, ...},} {1: '<url 1>', 2: <url 2>, ...},}
""" """
# This holds our resulting dictionary of season art
result = {} result = {}
indexer_lang = show_obj.lang
try: try:
# There's gotta be a better way of doing this but we don't wanna # There's gotta be a better way of doing this but we don't wanna
# change the language value elsewhere # change the language value elsewhere
lINDEXER_API_PARMS = sickbeard.indexerApi(show_obj.indexer).api_params.copy() lINDEXER_API_PARMS = sickbeard.indexerApi(show_obj.indexer).api_params.copy()
lINDEXER_API_PARMS['banners'] = True lINDEXER_API_PARMS[image_type] = True
lINDEXER_API_PARMS['dvdorder'] = 0 != show_obj.dvdorder lINDEXER_API_PARMS['dvdorder'] = 0 != show_obj.dvdorder
if indexer_lang and not indexer_lang == 'en': if 'en' != getattr(show_obj, 'lang', None):
lINDEXER_API_PARMS['language'] = indexer_lang lINDEXER_API_PARMS['language'] = show_obj.lang
t = sickbeard.indexerApi(show_obj.indexer).indexer(**lINDEXER_API_PARMS) t = sickbeard.indexerApi(show_obj.indexer).indexer(**lINDEXER_API_PARMS)
indexer_show_obj = t[show_obj.indexerid] indexer_show_obj = t[show_obj.indexerid]
except (sickbeard.indexer_error, IOError) as e: except (sickbeard.indexer_error, IOError) as e:
logger.log(u"Unable to look up show on " + sickbeard.indexerApi( logger.log(u'Unable to look up show on ' + sickbeard.indexerApi(
show_obj.indexer).name + ", not downloading images: " + ex(e), logger.ERROR) show_obj.indexer).name + ', not downloading images: ' + ex(e), logger.ERROR)
return result return result
# if we have no season banners then just finish season_images = getattr(indexer_show_obj, '_banners', {}).get(
if getattr(indexer_show_obj, '_banners', None) is None: ('season', 'seasonwide')['seasonwides' == image_type], {}).get(season, {})
return result for image_id in season_images.keys():
if season not in result:
if 'season' not in indexer_show_obj['_banners'] or 'season' not in indexer_show_obj['_banners']['season']:
return result
# Give us just the normal poster-style season graphics
seasonsArtObj = indexer_show_obj['_banners']['season']['season']
# Returns a nested dictionary of season art with the season
# number as primary key. It's really overkill but gives the option
# to present to user via ui to pick down the road.
result[season] = {} result[season] = {}
result[season][image_id] = season_images[image_id]['_bannerpath']
# find the correct season in the TVDB and TVRAGE object and just copy the dict into our result dict
for seasonArtID in seasonsArtObj.keys():
if int(seasonsArtObj[seasonArtID]['season']) == season and seasonsArtObj[seasonArtID]['language'] == 'en':
result[season][seasonArtID] = seasonsArtObj[seasonArtID]['_bannerpath']
return result
def _season_banners_dict(self, show_obj, season):
"""
Should return a dict like:
result = {<season number>:
{1: '<url 1>', 2: <url 2>, ...},}
"""
# This holds our resulting dictionary of season art
result = {}
indexer_lang = show_obj.lang
try:
# There's gotta be a better way of doing this but we don't wanna
# change the language value elsewhere
lINDEXER_API_PARMS = sickbeard.indexerApi(show_obj.indexer).api_params.copy()
lINDEXER_API_PARMS['banners'] = True
lINDEXER_API_PARMS['dvdorder'] = 0 != show_obj.dvdorder
if indexer_lang and not indexer_lang == 'en':
lINDEXER_API_PARMS['language'] = indexer_lang
t = sickbeard.indexerApi(show_obj.indexer).indexer(**lINDEXER_API_PARMS)
indexer_show_obj = t[show_obj.indexerid]
except (sickbeard.indexer_error, IOError) as e:
logger.log(u"Unable to look up show on " + sickbeard.indexerApi(
show_obj.indexer).name + ", not downloading images: " + ex(e), logger.ERROR)
return result
# if we have no season banners then just finish
if getattr(indexer_show_obj, '_banners', None) is None:
return result
# if we have no season banners then just finish
if 'season' not in indexer_show_obj['_banners'] or 'seasonwide' not in indexer_show_obj['_banners']['season']:
return result
# Give us just the normal season graphics
seasonsArtObj = indexer_show_obj['_banners']['season']['seasonwide']
# Returns a nested dictionary of season art with the season
# number as primary key. It's really overkill but gives the option
# to present to user via ui to pick down the road.
result[season] = {}
# find the correct season in the TVDB and TVRAGE object and just copy the dict into our result dict
for seasonArtID in seasonsArtObj.keys():
if int(seasonsArtObj[seasonArtID]['season']) == season and seasonsArtObj[seasonArtID]['language'] == 'en':
result[season][seasonArtID] = seasonsArtObj[seasonArtID]['_bannerpath']
return result return result