cadey
/
h
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug with tvdb.py 

Certain series will return incomplete episode information. If the episode did
not contain a first run date, the `get_episode_info` function would return
None, but the `tv_next` and `tv_last` functions expected a tuple of three
items.
This commit is contained in:
Alex Vidal 2011-03-10 01:18:30 +08:00 committed by rmmh
parent 1bca0fa7a9
commit 5ea6135927
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/tvdb.py
View File

@ -52,28 +52,28 @@ def get_episodes_for_series(seriesname):
if series.xpath('//Status/text()')[0] == 'Ended': if series.xpath('//Status/text()')[0] == 'Ended':
res["ended"] = True res["ended"] = True
res["episodes"] = series.xpath('//Episode') res["episodes"] = series.xpath('//Episode')
res["name"] = series_name res["name"] = series_name
return res return res
def get_episode_info(episode): def get_episode_info(episode):
first_aired = episode.findtext("FirstAired") first_aired = episode.findtext("FirstAired")
try: try:
airdate = datetime.date(*map(int, first_aired.split('-'))) airdate = datetime.date(*map(int, first_aired.split('-')))
except (ValueError, TypeError): except (ValueError, TypeError):
return None return None
episode_num = "S%02dE%02d" % (int(episode.findtext("SeasonNumber")), episode_num = "S%02dE%02d" % (int(episode.findtext("SeasonNumber")),
int(episode.findtext("EpisodeNumber"))) int(episode.findtext("EpisodeNumber")))
episode_name = episode.findtext("EpisodeName") episode_name = episode.findtext("EpisodeName")
# in the event of an unannounced episode title, users either leave the # in the event of an unannounced episode title, users either leave the
# field out (None) or fill it with TBA # field out (None) or fill it with TBA
if episode_name == "TBA": if episode_name == "TBA":
episode_name = None episode_name = None
episode_desc = '%s' % episode_num episode_desc = '%s' % episode_num
if episode_name: if episode_name:
episode_desc += ' - %s' % episode_name episode_desc += ' - %s' % episode_name
@ -87,19 +87,24 @@ def tv_next(inp):
if episodes["error"]: if episodes["error"]:
return episodes["error"] return episodes["error"]
series_name = episodes["name"] series_name = episodes["name"]
ended = episodes["ended"] ended = episodes["ended"]
episodes = episodes["episodes"] episodes = episodes["episodes"]
if ended: if ended:
return "%s has ended." % series_name return "%s has ended." % series_name
next_eps = [] next_eps = []
today = datetime.date.today() today = datetime.date.today()
for episode in reversed(episodes): for episode in reversed(episodes):
(first_aired, airdate, episode_desc) = get_episode_info(episode) ep_info = get_episode_info(episode)
if ep_info is None:
continue
(first_aired, airdate, episode_desc) = ep_info
if airdate > today: if airdate > today:
next_eps = ['%s (%s)' % (first_aired, episode_desc)] next_eps = ['%s (%s)' % (first_aired, episode_desc)]
@ -128,16 +133,21 @@ def tv_last(inp):
if episodes["error"]: if episodes["error"]:
return episodes["error"] return episodes["error"]
series_name = episodes["name"] series_name = episodes["name"]
ended = episodes["ended"] ended = episodes["ended"]
episodes = episodes["episodes"] episodes = episodes["episodes"]
prev_ep = None prev_ep = None
today = datetime.date.today() today = datetime.date.today()
for episode in reversed(episodes): for episode in reversed(episodes):
(first_aired, airdate, episode_desc) = get_episode_info(episode) ep_info = get_episode_info(episode)
if ep_info is None:
continue
(first_aired, airdate, episode_desc) = ep_info
if airdate < today: if airdate < today:
#iterating in reverse order, so the first episode encountered #iterating in reverse order, so the first episode encountered