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

added output on URL timeout, and change api to use a unique key just for skybot

This commit is contained in:
Rob Dennis 2010-09-03 10:30:25 +08:00 committed by rmmh
parent c2a607198c
commit 43fd4dbe19
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/tvdb.py
View File

@ -4,12 +4,13 @@ modified by rmmh 2010
""" """
import datetime import datetime
from urllib2 import URLError
from util import hook, http from util import hook, http
base_url = "http://thetvdb.com/api/" base_url = "http://thetvdb.com/api/"
api_key = "D1EBA6781E2572BB" api_key = "469B73127CA0C411"
@hook.command @hook.command
@ -17,7 +18,12 @@ def tv_next(inp):
".tv_next <series> -- get the next episode of <series> from thetvdb.com" ".tv_next <series> -- get the next episode of <series> from thetvdb.com"
# http://thetvdb.com/wiki/index.php/API:GetSeries # http://thetvdb.com/wiki/index.php/API:GetSeries
query = http.get_xml(base_url + 'GetSeries.php', seriesname=inp) try:
query = http.get_xml(base_url + 'GetSeries.php', seriesname=inp)
except URLError:
#outputs on timeout
return "error contacting thetvdb.com"
series_id = query.xpath('//seriesid/text()') series_id = query.xpath('//seriesid/text()')
if not series_id: if not series_id:
@ -25,8 +31,13 @@ def tv_next(inp):
series_id = series_id[0] series_id = series_id[0]
series = http.get_xml(base_url + '%s/series/%s/all/en.xml' % try:
(api_key, series_id)) series = http.get_xml(base_url + '%s/series/%s/all/en.xml' %
(api_key, series_id))
except URLError:
#outputs on timeout
return "error contacting thetvdb.com"
series_name = series.xpath('//SeriesName/text()')[0] series_name = series.xpath('//SeriesName/text()')[0]
if series.xpath('//Status/text()')[0] == 'Ended': if series.xpath('//Status/text()')[0] == 'Ended':