grab tvdb fields more defensively

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