grab tvdb fields more defensively

This commit is contained in:
Jason Mehring committed 2013-10-15 16:24:49 -04:00
1 parent 70dada8ef6
commit d1db099f71
1 file changed
+50 -50
+50 -50
View File
@@ -230,8 +230,8 @@ class TheTVDb(ShowProvider):
# return None # return None
## Images ## Images
poster = show['poster'] poster = show['poster'] or None
backdrop = show['fanart'] backdrop = show['fanart'] or None
#poster = self.getImage(show, type = 'poster', size = 'cover') #poster = self.getImage(show, type = 'poster', size = 'cover')
#backdrop = self.getImage(show, type = 'fanart', size = 'w1280') #backdrop = self.getImage(show, type = 'fanart', size = 'w1280')
@@ -246,8 +246,8 @@ class TheTVDb(ShowProvider):
'id': int(show['id']), 'id': int(show['id']),
'type': 'show', 'type': 'show',
'primary_provider': 'thetvdb', 'primary_provider': 'thetvdb',
'titles': [show['seriesname'], ], 'titles': [show['seriesname'], ] or None,
'original_title': show['seriesname'], 'original_title': show['seriesname'] or None,
'images': { 'images': {
'poster': [poster] if poster else [], 'poster': [poster] if poster else [],
'backdrop': [backdrop] if backdrop else [], 'backdrop': [backdrop] if backdrop else [],
@@ -256,23 +256,23 @@ class TheTVDb(ShowProvider):
}, },
'year': year, 'year': year,
'genres': genres, 'genres': genres,
'imdb': show['imdb_id'], 'imdb': show['imdb_id'] or None,
'zap2it_id': show['zap2it_id'], 'zap2it_id': show['zap2it_id'] or None,
'seriesid': show['seriesid'], 'seriesid': show['seriesid'] or None,
'network': show['network'], 'network': show['network'] or None,
'networkid': show['networkid'], 'networkid': show['networkid'] or None,
'airs_dayofweek': show['airs_dayofweek'], 'airs_dayofweek': show['airs_dayofweek'] or None,
'airs_time': show['airs_time'], 'airs_time': show['airs_time'] or None,
'firstaired': show['firstaired'], 'firstaired': show['firstaired'] or None,
'released': show['firstaired'], 'released': show['firstaired'] or None,
'runtime': show['runtime'], 'runtime': show['runtime'] or None,
'contentrating': show['contentrating'], 'contentrating': show['contentrating'] or None,
'rating': show['rating'], 'rating': show['rating'] or None,
'ratingcount': show['ratingcount'], 'ratingcount': show['ratingcount'] or None,
'actors': show['actors'], 'actors': show['actors'] or None,
'lastupdated': show['lastupdated'], 'lastupdated': show['lastupdated'] or None,
'status': show['status'], 'status': show['status'] or None,
'language': show['language'], 'language': show['language'] or None,
} }
show_data = dict((k, v) for k, v in show_data.iteritems() if v) show_data = dict((k, v) for k, v in show_data.iteritems() if v)
@@ -391,46 +391,46 @@ class TheTVDb(ShowProvider):
'primary_provider': 'thetvdb', 'primary_provider': 'thetvdb',
'via_thetvdb': True, 'via_thetvdb': True,
'thetvdb_id': int(episode['id']), 'thetvdb_id': int(episode['id']),
'titles': [episode['episodename'], ], 'titles': [episode['episodename'], ] or None,
'original_title': episode['episodename'] , 'original_title': episode['episodename'] or None,
'images': { 'images': {
'poster': [poster] if poster else [], 'poster': [poster] if poster else [],
'backdrop': [backdrop] if backdrop else [], 'backdrop': [backdrop] if backdrop else [],
'poster_original': [], 'poster_original': [],
'backdrop_original': [], 'backdrop_original': [],
}, },
'imdb': episode['imdb_id'], 'imdb': episode['imdb_id'] or None,
'runtime': None, 'runtime': None,
'released': episode['firstaired'], 'released': episode['firstaired'] or None,
'year': year, 'year': year,
'plot': plot, 'plot': plot,
'genres': genres, 'genres': genres,
'parent_identifier': show['id'], 'parent_identifier': show['id'],
'seasonnumber': episode['seasonnumber'], 'seasonnumber': episode['seasonnumber'] or None,
'episodenumber': episode['episodenumber'], 'episodenumber': episode['episodenumber'] or None,
'combined_episodenumber': episode['combined_episodenumber'], 'combined_episodenumber': episode['combined_episodenumber'] or None,
'absolute_number': episode['absolute_number'], 'absolute_number': episode['absolute_number'] or None,
'combined_season': episode['combined_season'], 'combined_season': episode['combined_season'] or None,
'productioncode': episode['productioncode'], 'productioncode': episode['productioncode'] or None,
'seriesid': episode['seriesid'], 'seriesid': episode['seriesid'] or None,
'seasonid': episode['seasonid'], 'seasonid': episode['seasonid'] or None,
'firstaired': episode['firstaired'], 'firstaired': episode['firstaired'] or None,
'thumb_added': episode['thumb_added'], 'thumb_added': episode['thumb_added'] or None,
'thumb_height': episode['thumb_height'], 'thumb_height': episode['thumb_height'] or None,
'thumb_width': episode['thumb_width'], 'thumb_width': episode['thumb_width'] or None,
'rating': episode['rating'], 'rating': episode['rating'] or None,
'ratingcount': episode['ratingcount'], 'ratingcount': episode['ratingcount'] or None,
'epimgflag': episode['epimgflag'], 'epimgflag': episode['epimgflag'] or None,
'dvd_episodenumber': episode['dvd_episodenumber'], 'dvd_episodenumber': episode['dvd_episodenumber'] or None,
'dvd_discid': episode['dvd_discid'], 'dvd_discid': episode['dvd_discid'] or None,
'dvd_chapter': episode['dvd_chapter'], 'dvd_chapter': episode['dvd_chapter'] or None,
'dvd_season': episode['dvd_season'], 'dvd_season': episode['dvd_season'] or None,
'tms_export': episode['tms_export'], 'tms_export': episode['tms_export'] or None,
'writer': episode['writer'], 'writer': episode['writer'] or None,
'director': episode['director'], 'director': episode['director'] or None,
'gueststars': episode['gueststars'], 'gueststars': episode['gueststars'] or None,
'lastupdated': episode['lastupdated'], 'lastupdated': episode['lastupdated'] or None,
'language': episode['language'], 'language': episode['language'] or None,
} }
episode_data = dict((k, v) for k, v in episode_data.iteritems() if v) episode_data = dict((k, v) for k, v in episode_data.iteritems() if v)