Private GIT

Skip to content
Snippets Groups Projects
Commit 4c1d2a09 authored by Thraxis's avatar Thraxis
Browse files

Trap for Data = None

Fixes issue #198
parent d0f86931
No related branches found
No related tags found
No related merge requests found
...@@ -1732,6 +1732,8 @@ def getTVDBFromID(indexer_id, indexer): ...@@ -1732,6 +1732,8 @@ def getTVDBFromID(indexer_id, indexer):
if indexer == 'IMDB': if indexer == 'IMDB':
url = "http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=%s" % indexer_id url = "http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=%s" % indexer_id
data = getURL(url, session=session) data = getURL(url, session=session)
if data is None:
return tvdb_id
try: try:
tree = ET.fromstring(data) tree = ET.fromstring(data)
for show in tree.getiterator("Series"): for show in tree.getiterator("Series"):
...@@ -1744,6 +1746,8 @@ def getTVDBFromID(indexer_id, indexer): ...@@ -1744,6 +1746,8 @@ def getTVDBFromID(indexer_id, indexer):
elif indexer == 'ZAP2IT': elif indexer == 'ZAP2IT':
url = "http://www.thetvdb.com/api/GetSeriesByRemoteID.php?zap2it=%s" % indexer_id url = "http://www.thetvdb.com/api/GetSeriesByRemoteID.php?zap2it=%s" % indexer_id
data = getURL(url, session=session) data = getURL(url, session=session)
if data is None:
return tvdb_id
try: try:
tree = ET.fromstring(data) tree = ET.fromstring(data)
for show in tree.getiterator("Series"): for show in tree.getiterator("Series"):
...@@ -1756,6 +1760,8 @@ def getTVDBFromID(indexer_id, indexer): ...@@ -1756,6 +1760,8 @@ def getTVDBFromID(indexer_id, indexer):
elif indexer == 'TVMAZE': elif indexer == 'TVMAZE':
url = "http://api.tvmaze.com/shows/%s" % indexer_id url = "http://api.tvmaze.com/shows/%s" % indexer_id
data = getURL(url, session=session, json=True) data = getURL(url, session=session, json=True)
if data is None:
return tvdb_id
tvdb_id = data['externals']['thetvdb'] tvdb_id = data['externals']['thetvdb']
return tvdb_id return tvdb_id
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment