Private GIT

Skip to content
Snippets Groups Projects
Commit d9f16675 authored by miigotu's avatar miigotu
Browse files

Merge pull request #2889 from fernandog/fix_log_anime

Fix SiCKRAGETV/sickrage-issues/issues/3319
parents e15e3fed 82f48771
Branches
Tags
No related merge requests found
......@@ -264,7 +264,7 @@ class TVShow(object):
episode = int(sqlResults[0]["episode"])
season = int(sqlResults[0]["season"])
logger.log(
"Found episode by absolute_number %s which is S%02dE%02d" % (absolute_number, season, episode), logger.DEBUG)
"Found episode by absolute_number %s which is S%02dE%02d" % (absolute_number, season or 0, episode or 0), logger.DEBUG)
elif len(sqlResults) > 1:
logger.log("Multiple entries for absolute number: " + str(
absolute_number) + " in show: " + self.name + " found ", logger.ERROR)
......@@ -282,7 +282,7 @@ class TVShow(object):
if noCreate:
return None
#logger.log(str(self.indexerid) + u": An object for episode S%02dE%02d didn't exist in the cache, trying to create it" % (season, episode), logger.DEBUG)
#logger.log(str(self.indexerid) + u": An object for episode S%02dE%02d didn't exist in the cache, trying to create it" % (season or 0, episode or 0), logger.DEBUG)
if file:
ep = TVEpisode(self, season, episode, file)
......@@ -375,7 +375,7 @@ class TVShow(object):
sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE showid = ? AND location != ''", [self.indexerid])
for epResult in sqlResults:
logger.log(str(self.indexerid) + u": Retrieving/creating episode S%02dE%02d" % (epResult["season"], epResult["episode"]), logger.DEBUG)
logger.log(str(self.indexerid) + u": Retrieving/creating episode S%02dE%02d" % (epResult["season"] or 0, epResult["episode"] or 0), logger.DEBUG)
curEp = self.getEpisode(epResult["season"], epResult["episode"])
if not curEp:
continue
......@@ -517,7 +517,7 @@ class TVShow(object):
logger.log(u"Not curSeason in scannedEps", logger.DEBUG)
scannedEps[curSeason] = {}
logger.log(u"%s: Loading episode S%02dE%02d from the DB" % (curShowid, curSeason, curEpisode), logger.DEBUG)
logger.log(u"%s: Loading episode S%02dE%02d from the DB" % (curShowid, curSeason or 0, curEpisode or 0), logger.DEBUG)
try:
curEp = self.getEpisode(curSeason, curEpisode)
......@@ -579,7 +579,7 @@ class TVShow(object):
if not ep:
raise EpisodeNotFoundException
except EpisodeNotFoundException:
logger.log("%s: %s object for S%02dE%02d is incomplete, skipping this episode" % (self.indexerid, sickbeard.indexerApi(self.indexer).name, season, episode))
logger.log("%s: %s object for S%02dE%02d is incomplete, skipping this episode" % (self.indexerid, sickbeard.indexerApi(self.indexer).name, season or 0, episode or 0))
continue
else:
try:
......@@ -589,7 +589,7 @@ class TVShow(object):
continue
with ep.lock:
logger.log("%s: Loading info from %s for episode S%02dE%02d" % (self.indexerid, sickbeard.indexerApi(self.indexer).name, season, episode),logger.DEBUG)
logger.log("%s: Loading info from %s for episode S%02dE%02d" % (self.indexerid, sickbeard.indexerApi(self.indexer).name, season or 0, episode or 0),logger.DEBUG)
ep.loadFromIndexer(season, episode, tvapi=t)
sql_l.append(ep.get_sql())
......@@ -660,7 +660,7 @@ class TVShow(object):
episode = int(curEpNum)
logger.log("%s: %s parsed to %s S%02dE%02d" % (self.indexerid, file, self.name, season, episode), logger.DEBUG)
logger.log("%s: %s parsed to %s S%02dE%02d" % (self.indexerid, file, self.name, season or 0, episode or 0), logger.DEBUG)
checkQualityAgain = False
same_file = False
......@@ -988,7 +988,7 @@ class TVShow(object):
logger.DEBUG)
self.nextaired = ""
else:
logger.log(u"%s: Found episode S%02dE%02d" % (self.indexerid, sqlResults[0]["season"], sqlResults[0]["episode"] ) , logger.DEBUG)
logger.log(u"%s: Found episode S%02dE%02d" % (self.indexerid, sqlResults[0]["season"] or 0, sqlResults[0]["episode"] or 0) , logger.DEBUG)
self.nextaired = sqlResults[0]['airdate']
return self.nextaired
......@@ -1107,7 +1107,7 @@ class TVShow(object):
new_status = sickbeard.EP_DEFAULT_DELETED_STATUS
logger.log(u"%s: Location for S%02dE%02d doesn't exist, removing it and changing our status to %s" %
(self.indexerid, season, episode, statusStrings[new_status]) ,logger.DEBUG)
(self.indexerid, season or 0, episode or 0, statusStrings[new_status]) ,logger.DEBUG)
curEp.status = new_status
curEp.subtitles = list()
curEp.subtitles_searchcount = 0
......@@ -1239,7 +1239,7 @@ class TVShow(object):
def wantEpisode(self, season, episode, quality, manualSearch=False, downCurQuality=False):
logger.log(u"Checking if found episode %s S%02dE%02d is wanted at quality %s" % (self.name, season, episode, Quality.qualityStrings[quality]) , logger.DEBUG)
logger.log(u"Checking if found episode %s S%02dE%02d is wanted at quality %s" % (self.name, season or 0, episode or 0, Quality.qualityStrings[quality]) , logger.DEBUG)
# if the quality isn't one we want under any circumstances then just say no
anyQualities, bestQualities = Quality.splitQuality(self.quality)
......@@ -1442,10 +1442,10 @@ class TVEpisode(object):
def downloadSubtitles(self, force=False):
if not ek(os.path.isfile, self.location):
logger.log(u"%s: Episode file doesn't exist, can't download subtitles for S%02dE%02d" %
(self.show.indexerid, self.season, self.episode), logger.DEBUG)
(self.show.indexerid, self.season or 0, self.episode or 0), logger.DEBUG)
return
logger.log(u"%s: Downloading subtitles for S%02dE%02d" % (self.show.indexerid, self.season, self.episode), logger.DEBUG)
logger.log(u"%s: Downloading subtitles for S%02dE%02d" % (self.show.indexerid, self.season or 0, self.episode or 0), logger.DEBUG)
#logging.getLogger('subliminal.api').addHandler(logging.StreamHandler())
#logging.getLogger('subliminal.api').setLevel(logging.DEBUG)
......@@ -1464,12 +1464,12 @@ class TVEpisode(object):
if newSubtitles:
subtitleList = ", ".join([subtitles.fromietf(newSub).name for newSub in newSubtitles])
logger.log(u"%s: Downloaded %s subtitles for S%02dE%02d" %
(self.show.indexerid, subtitleList, self.season, self.episode), logger.DEBUG)
(self.show.indexerid, subtitleList, self.season or 0, self.episode or 0), logger.DEBUG)
notifiers.notify_subtitle_download(self.prettyName(), subtitleList)
else:
logger.log(u"%s: No subtitles downloaded for S%02dE%02d" %
(self.show.indexerid, self.season, self.episode), logger.DEBUG)
(self.show.indexerid, self.season or 0, self.episode or 0), logger.DEBUG)
def checkForMetaFiles(self):
......@@ -1510,7 +1510,7 @@ class TVEpisode(object):
try:
self.loadFromNFO(self.location)
except NoNFOException:
logger.log(u"%s: There was an error loading the NFO for episode S%02dE%02d" % (self.show.indexerid, season, episode), logger.ERROR)
logger.log(u"%s: There was an error loading the NFO for episode S%02dE%02d" % (self.show.indexerid, season or 0, episode or 0), logger.ERROR)
# if we tried loading it from NFO and didn't find the NFO, try the Indexers
if not self.hasnfo:
......@@ -1521,10 +1521,10 @@ class TVEpisode(object):
# if we failed SQL *and* NFO, Indexers then fail
if not result:
raise EpisodeNotFoundException("Couldn't find episode S%02dE%02d" % (season, episode))
raise EpisodeNotFoundException("Couldn't find episode S%02dE%02d" % (season or 0, episode or 0))
def loadFromDB(self, season, episode):
logger.log(u"%s: Loading episode details from DB for episode %s S%02dE%02d" % (self.show.indexerid, self.show.name, season, episode), logger.DEBUG)
logger.log(u"%s: Loading episode details from DB for episode %s S%02dE%02d" % (self.show.indexerid, self.show.name, season or 0, episode or 0), logger.DEBUG)
myDB = db.DBConnection()
sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE showid = ? AND season = ? AND episode = ?",
......@@ -1533,7 +1533,7 @@ class TVEpisode(object):
if len(sqlResults) > 1:
raise MultipleEpisodesInDatabaseException("Your DB has two records for the same show somehow.")
elif len(sqlResults) == 0:
logger.log(u"%s: Episode S%02dE%02d not found in the database" % (self.show.indexerid, self.season, self.episode), logger.DEBUG)
logger.log(u"%s: Episode S%02dE%02d not found in the database" % (self.show.indexerid, self.season or 0, self.episode or 0), logger.DEBUG)
return False
else:
# NAMEIT logger.log(u"AAAAA from" + str(self.season)+"x"+str(self.episode) + " -" + self.name + " to " + str(sqlResults[0]["name"]))
......@@ -1619,7 +1619,7 @@ class TVEpisode(object):
episode = self.episode
logger.log(u"%s: Loading episode details from %s for episode S%02dE%02d" %
(self.show.indexerid, sickbeard.indexerApi(self.show.indexer).name, season, episode) , logger.DEBUG)
(self.show.indexerid, sickbeard.indexerApi(self.show.indexer).name, season or 0, episode or 0) , logger.DEBUG)
indexer_lang = self.show.lang
......@@ -1665,7 +1665,7 @@ class TVEpisode(object):
return
if getattr(myEp, 'episodename', None) is None:
logger.log(u"This episode %s - S%02dE%02d has no name on %s. Setting to an empty string" % (self.show.name, season, episode, sickbeard.indexerApi(self.indexer).name))
logger.log(u"This episode %s - S%02dE%02d has no name on %s. Setting to an empty string" % (self.show.name, season or 0, episode or 0, sickbeard.indexerApi(self.indexer).name))
setattr(myEp, 'episodename', '')
# if I'm incomplete on TVDB but I once was complete then just delete myself from the DB for now
#if self.indexerid != -1:
......@@ -1673,9 +1673,9 @@ class TVEpisode(object):
#return False
if getattr(myEp, 'absolute_number', None) is None:
logger.log(u"This episode %s - S%02dE%02d has no absolute number on %s" %(self.show.name, season, episode, sickbeard.indexerApi(self.indexer).name), logger.DEBUG)
logger.log(u"This episode %s - S%02dE%02d has no absolute number on %s" %(self.show.name, season or 0, episode or 0, sickbeard.indexerApi(self.indexer).name), logger.DEBUG)
else:
logger.log(u"%s: The absolute_number for S%02dE%02d is: %s " % (self.show.indexerid, season, episode, myEp["absolute_number"]), logger.DEBUG)
logger.log(u"%s: The absolute_number for S%02dE%02d is: %s " % (self.show.indexerid, season or 0, episode or 0, myEp["absolute_number"]), logger.DEBUG)
self.absolute_number = int(myEp["absolute_number"])
self.name = getattr(myEp, 'episodename', "")
......@@ -1706,7 +1706,7 @@ class TVEpisode(object):
try:
self.airdate = datetime.date(rawAirdate[0], rawAirdate[1], rawAirdate[2])
except (ValueError, IndexError):
logger.log(u"Malformed air date of %s retrieved from %s for (%s - S%02dE%02d)" % (firstaired, sickbeard.indexerApi(self.indexer).name, self.show.name, season, episode),logger.WARNING)
logger.log(u"Malformed air date of %s retrieved from %s for (%s - S%02dE%02d)" % (firstaired, sickbeard.indexerApi(self.indexer).name, self.show.name, season or 0, episode or 0),logger.WARNING)
# if I'm incomplete on the indexer but I once was complete then just delete myself from the DB for now
if self.indexerid != -1:
self.deleteEpisode()
......@@ -1728,7 +1728,7 @@ class TVEpisode(object):
if self.location:
logger.log(u"%s: Setting status for S%02dE%02d based on status %s and location %s" %
(self.show.indexerid, season, episode, statusStrings[self.status], self.location), logger.DEBUG)
(self.show.indexerid, season or 0, episode or 0, statusStrings[self.status], self.location), logger.DEBUG)
if not ek(os.path.isfile, self.location):
if self.airdate >= datetime.date.today() or self.airdate == datetime.date.fromordinal(1):
......@@ -1798,7 +1798,7 @@ class TVEpisode(object):
epDetails.findtext('episode') is None or int(
epDetails.findtext('episode')) != self.episode:
logger.log(u"%s: NFO has an <episodedetails> block for a different episode - wanted S%02dE%02d but got S%02dE%02d" %
(self.show.indexerid, self.season, self.episode, epDetails.findtext('season'), epDetails.findtext('episode') ), logger.DEBUG)
(self.show.indexerid, self.season or 0, self.episode or 0, epDetails.findtext('season') or 0, epDetails.findtext('episode') or 0 ), logger.DEBUG)
continue
if epDetails.findtext('title') is None or epDetails.findtext('aired') is None:
......@@ -1844,7 +1844,7 @@ class TVEpisode(object):
def __str__(self):
toReturn = ""
toReturn += "%s - S%02dE%02d - %s " % (self.show.name, self.season, self.episode, self.name ) + "\n"
toReturn += "%s - S%02dE%02d - %s " % (self.show.name, self.season or 0, self.episode or 0, self.name ) + "\n"
toReturn += "location: " + str(self.location) + "\n"
toReturn += "description: " + str(self.description) + "\n"
toReturn += "subtitles: " + str(",".join(self.subtitles)) + "\n"
......@@ -1888,7 +1888,7 @@ class TVEpisode(object):
def deleteEpisode(self):
logger.log(u"Deleting %s S%02dE%02d from the DB" % (self.show.name, self.season, self.episode), logger.DEBUG)
logger.log(u"Deleting %s S%02dE%02d from the DB" % (self.show.name, self.season or 0, self.episode or 0), logger.DEBUG)
# remove myself from the show dictionary
if self.show.getEpisode(self.season, self.episode, noCreate=True) == self:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment