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

Merge pull request #83 from Atheuz/development 

tvdb.py: When there's a next episode date, provide a time until in the return string.
This commit is contained in:
Ryan Hitchman 2013-09-20 14:30:39 -07:00
parent 52b90119a6 8c47b0c2e1
commit 771118f0c7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/tvdb.py
View File

@ -9,7 +9,7 @@ from zipfile import ZipFile
from cStringIO import StringIO
from lxml import etree
from util import hook, http
from util import hook, http, timesince
base_url = "http://thetvdb.com/api/"
@ -60,10 +60,10 @@ def get_episodes_for_series(seriesname):
def get_episode_info(episode):
first_aired = episode.findtext("FirstAired")
episode_air_date = episode.findtext("FirstAired")
try:
airdate = datetime.date(*map(int, first_aired.split('-')))
airdate = datetime.date(*map(int, episode_air_date.split('-')))
except (ValueError, TypeError):
return None
@ -79,7 +79,7 @@ def get_episode_info(episode):
episode_desc = '%s' % episode_num
if episode_name:
episode_desc += ' - %s' % episode_name
return (first_aired, airdate, episode_desc)
return (episode_air_date, airdate, episode_desc)
@hook.command
@ -107,10 +107,10 @@ def tv_next(inp):
if ep_info is None:
continue
(first_aired, airdate, episode_desc) = ep_info
(episode_air_date, airdate, episode_desc) = ep_info
if airdate > today:
next_eps = ['%s (%s)' % (first_aired, episode_desc)]
next_eps = ['%s (%s) (%s)' % (episode_air_date, timesince.timeuntil(datetime.datetime.strptime(episode_air_date, "%Y-%m-%d")), episode_desc)]
elif airdate == today:
next_eps = ['Today (%s)' % episode_desc] + next_eps
else:
@ -150,12 +150,12 @@ def tv_last(inp):
if ep_info is None:
continue
(first_aired, airdate, episode_desc) = ep_info
(episode_air_date, airdate, episode_desc) = ep_info
if airdate < today:
#iterating in reverse order, so the first episode encountered
#before today was the most recently aired
prev_ep = '%s (%s)' % (first_aired, episode_desc)
prev_ep = '%s (%s)' % (episode_air_date, episode_desc)
break
if not prev_ep: