moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 03:22:22 -05:00
Code Issues Releases Wiki Activity

Fixed issues in mede8er metadata module

Browse Source
This commit is contained in:
echel0n 2014-05-18 06:26:34 -07:00
parent c65573a8d7
commit f8a8f4c5b4
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sickbeard/metadata/mede8er.py
View File

@ -23,7 +23,6 @@ import sickbeard
import mediabrowser import mediabrowser
from sickbeard import logger, exceptions, helpers from sickbeard import logger, exceptions, helpers
from lib.tvdb_api import tvdb_api, tvdb_exceptions
from sickbeard.exceptions import ex from sickbeard.exceptions import ex
try: try:
@ -101,15 +100,18 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
show_obj: a TVShow instance to create the NFO for show_obj: a TVShow instance to create the NFO for
""" """
tvdb_lang = show_obj.lang indexer_lang = show_obj.lang
# There's gotta be a better way of doing this but we don't wanna lINDEXER_API_PARMS = sickbeard.indexerApi(show_obj.indexer).api_params.copy()
# change the language value elsewhere
ltvdb_api_parms = sickbeard.TVDB_API_PARMS.copy()
if tvdb_lang and not tvdb_lang == 'en': lINDEXER_API_PARMS['actors'] = True
ltvdb_api_parms['language'] = tvdb_lang
t = tvdb_api.Tvdb(actors=True, **ltvdb_api_parms) if indexer_lang and not indexer_lang == 'en':
lINDEXER_API_PARMS['language'] = indexer_lang
if show_obj.dvdorder != 0:
lINDEXER_API_PARMS['dvdorder'] = True
t = sickbeard.indexerApi(show_obj.indexer).indexer(**lINDEXER_API_PARMS)
rootNode = etree.Element("details") rootNode = etree.Element("details")
tv_node = etree.SubElement(rootNode, "movie") tv_node = etree.SubElement(rootNode, "movie")
@ -119,11 +121,11 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
try: try:
myShow = t[int(show_obj.indexerid)] myShow = t[int(show_obj.indexerid)]
except tvdb_exceptions.tvdb_shownotfound: except sickbeard.indexer_shownotfound:
logger.log(u"Unable to find show with id " + str(show_obj.indexerid) + " on tvdb, skipping it", logger.ERROR) logger.log(u"Unable to find show with id " + str(show_obj.indexerid) + " on tvdb, skipping it", logger.ERROR)
raise raise
except tvdb_exceptions.tvdb_error: except sickbeard.indexer_error:
logger.log(u"TVDB is down, can't use its data to make the NFO", logger.ERROR) logger.log(u"TVDB is down, can't use its data to make the NFO", logger.ERROR)
raise raise
@ -132,7 +134,7 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
if myShow['seriesname'] == None or myShow['seriesname'] == "" or myShow['id'] == None or myShow['id'] == "": if myShow['seriesname'] == None or myShow['seriesname'] == "" or myShow['id'] == None or myShow['id'] == "":
logger.log(u"Incomplete info for show with id " + str(show_obj.indexerid) + " on tvdb, skipping it", logger.ERROR) logger.log(u"Incomplete info for show with id " + str(show_obj.indexerid) + " on tvdb, skipping it", logger.ERROR)
return False return False
except tvdb_exceptions.tvdb_attributenotfound: except sickbeard.indexer_attributenotfound:
logger.log(u"Incomplete info for show with id " + str(show_obj.indexerid) + " on tvdb, skipping it", logger.ERROR) logger.log(u"Incomplete info for show with id " + str(show_obj.indexerid) + " on tvdb, skipping it", logger.ERROR)
return False return False
@ -219,21 +221,24 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
eps_to_write = [ep_obj] + ep_obj.relatedEps eps_to_write = [ep_obj] + ep_obj.relatedEps
tvdb_lang = ep_obj.show.lang indexer_lang = ep_obj.show.lang
try: try:
# There's gotta be a better way of doing this but we don't wanna # There's gotta be a better way of doing this but we don't wanna
# change the language value elsewhere # change the language value elsewhere
ltvdb_api_parms = sickbeard.TVDB_API_PARMS.copy() lINDEXER_API_PARMS = sickbeard.indexerApi(ep_obj.show.indexer).api_params.copy()
if tvdb_lang and not tvdb_lang == 'en': if indexer_lang and not indexer_lang == 'en':
ltvdb_api_parms['language'] = tvdb_lang lINDEXER_API_PARMS['language'] = indexer_lang
t = tvdb_api.Tvdb(actors=True, **ltvdb_api_parms) if ep_obj.show.dvdorder != 0:
lINDEXER_API_PARMS['dvdorder'] = True
t = sickbeard.indexerApi(ep_obj.show.indexer).indexer(**lINDEXER_API_PARMS)
myShow = t[ep_obj.show.indexerid] myShow = t[ep_obj.show.indexerid]
except tvdb_exceptions.tvdb_shownotfound, e: except sickbeard.indexer_shownotfound, e:
raise exceptions.ShowNotFoundException(e.message) raise exceptions.ShowNotFoundException(e.message)
except tvdb_exceptions.tvdb_error, e: except sickbeard.indexer_error, e:
logger.log(u"Unable to connect to TVDB while creating meta files - skipping - " + ex(e), logger.ERROR) logger.log(u"Unable to connect to TVDB while creating meta files - skipping - " + ex(e), logger.ERROR)
return False return False
@ -249,7 +254,7 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
try: try:
myEp = myShow[curEpToWrite.season][curEpToWrite.episode] myEp = myShow[curEpToWrite.season][curEpToWrite.episode]
except (tvdb_exceptions.tvdb_episodenotfound, tvdb_exceptions.tvdb_seasonnotfound): except (sickbeard.indexer_episodenotfound, sickbeard.indexer_seasonnotfound):
logger.log(u"Unable to find episode " + str(curEpToWrite.season) + "x" + str(curEpToWrite.episode) + " on tvdb... has it been removed? Should I delete from db?") logger.log(u"Unable to find episode " + str(curEpToWrite.season) + "x" + str(curEpToWrite.episode) + " on tvdb... has it been removed? Should I delete from db?")
return None return None

1
sickbeard/search.py
View File

@ -638,7 +638,6 @@ def searchProviders(queueItem, show, season, episodes, manualSearch=False):
if not found: if not found:
queueItem.results += [bestResult] queueItem.results += [bestResult]
# check that we got all the episodes we wanted first before doing a match and snatch # check that we got all the episodes we wanted first before doing a match and snatch
wantedEpCount = 0 wantedEpCount = 0
for wantedEp in episodes: for wantedEp in episodes: