From 776516f8cf050e471746a0d2d10821251ba91083 Mon Sep 17 00:00:00 2001
From: Dustyn Gibson <miigotu@gmail.com>
Date: Wed, 15 Jul 2015 09:04:38 -0700
Subject: [PATCH] Bug in PP where scene numbers always used
---
sickbeard/failedProcessor.py | 4 ++--
sickbeard/name_parser/parser.py | 12 +++++-------
sickbeard/postProcessor.py | 2 +-
sickbeard/processTV.py | 2 +-
sickbeard/providers/btn.py | 2 +-
sickbeard/providers/generic.py | 2 +-
sickbeard/providers/iptorrents.py | 2 +-
sickbeard/providers/tntvillage.py | 2 +-
sickbeard/tvcache.py | 2 +-
9 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/sickbeard/failedProcessor.py b/sickbeard/failedProcessor.py
index 6c1245bb8..0b31003d0 100644
--- a/sickbeard/failedProcessor.py
+++ b/sickbeard/failedProcessor.py
@@ -47,7 +47,7 @@ class FailedProcessor(object):
raise exceptions.FailedProcessingFailed()
try:
- parser = NameParser(False, convert=True)
+ parser = NameParser(False)
parsed = parser.parse(releaseName)
except InvalidNameException:
self._log(u"Error: release name is invalid: " + releaseName, logger.DEBUG)
@@ -75,4 +75,4 @@ class FailedProcessor(object):
def _log(self, message, level=logger.INFO):
"""Log to regular logfile and save for return for PP script log"""
logger.log(message, level)
- self.log += message + "\n"
\ No newline at end of file
+ self.log += message + "\n"
diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py
index 301bf5ebe..205698e6a 100644
--- a/sickbeard/name_parser/parser.py
+++ b/sickbeard/name_parser/parser.py
@@ -36,14 +36,12 @@ class NameParser(object):
NORMAL_REGEX = 1
ANIME_REGEX = 2
- def __init__(self, file_name=True, showObj=None, tryIndexers=False, trySceneExceptions=False, convert=False,
- naming_pattern=False):
+ def __init__(self, file_name=True, showObj=None, tryIndexers=False, trySceneExceptions=False, naming_pattern=False):
self.file_name = file_name
self.showObj = showObj
self.tryIndexers = tryIndexers
self.trySceneExceptions = trySceneExceptions
- self.convert = convert
self.naming_pattern = naming_pattern
if self.showObj and not self.showObj.is_anime:
@@ -253,7 +251,7 @@ class NameParser(object):
s = season_number
e = epNo
- if self.convert:
+ if bestResult.show.is_scene:
(s, e) = scene_numbering.get_indexer_numbering(bestResult.show.indexerid,
bestResult.show.indexer,
season_number,
@@ -266,7 +264,7 @@ class NameParser(object):
for epAbsNo in bestResult.ab_episode_numbers:
a = epAbsNo
- if self.convert:
+ if bestResult.show.is_scene:
a = scene_numbering.get_indexer_absolute_numbering(bestResult.show.indexerid,
bestResult.show.indexer, epAbsNo,
True, scene_season)
@@ -282,7 +280,7 @@ class NameParser(object):
s = bestResult.season_number
e = epNo
- if self.convert:
+ if bestResult.show.is_scene:
(s, e) = scene_numbering.get_indexer_numbering(bestResult.show.indexerid,
bestResult.show.indexer,
bestResult.season_number,
@@ -321,7 +319,7 @@ class NameParser(object):
bestResult.episode_numbers = new_episode_numbers
bestResult.season_number = new_season_numbers[0]
- if self.convert:
+ if bestResult.show.is_scene:
logger.log(
u"Converted parsed result " + bestResult.original_name + " into " + str(bestResult).decode('utf-8',
'xmlcharrefreplace'),
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 06b262e50..ea84e4391 100644
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -508,7 +508,7 @@ class PostProcessor(object):
name = helpers.remove_non_release_groups(helpers.remove_extension(name))
# parse the name to break it into show name, season, and episode
- np = NameParser(file, tryIndexers=True, trySceneExceptions=True, convert=True)
+ np = NameParser(file, tryIndexers=True, trySceneExceptions=True)
parse_result = np.parse(name)
# show object
diff --git a/sickbeard/processTV.py b/sickbeard/processTV.py
index deb05df71..06e926f5e 100644
--- a/sickbeard/processTV.py
+++ b/sickbeard/processTV.py
@@ -452,7 +452,7 @@ def already_postprocessed(dirName, videofile, force, result):
#Needed if we have downloaded the same episode @ different quality
#But we need to make sure we check the history of the episode we're going to PP, and not others
- np = NameParser(dirName, tryIndexers=True, trySceneExceptions=True, convert=True)
+ np = NameParser(dirName, tryIndexers=True, trySceneExceptions=True)
try: #if it fails to find any info (because we're doing an unparsable folder (like the TV root dir) it will throw an exception, which we want to ignore
parse_result = np.parse(dirName)
except: #ignore the exception, because we kind of expected it, but create parse_result anyway so we can perform a check on it.
diff --git a/sickbeard/providers/btn.py b/sickbeard/providers/btn.py
index 5470838b4..b37581ee9 100644
--- a/sickbeard/providers/btn.py
+++ b/sickbeard/providers/btn.py
@@ -363,7 +363,7 @@ class BTNProvider(generic.TorrentProvider):
# parse the file name
try:
- myParser = NameParser(False, convert=True)
+ myParser = NameParser(False)
parse_result = myParser.parse(title)
except InvalidNameException:
logger.log(u"Unable to parse the filename " + title + " into a valid episode", logger.DEBUG) # @UndefinedVariable
diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index b97a86dd9..c10d5e620 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -397,7 +397,7 @@ class GenericProvider:
# parse the file name
try:
- myParser = NameParser(False, convert=True)
+ myParser = NameParser(False)
parse_result = myParser.parse(title)
except InvalidNameException:
logger.log(u"Unable to parse the filename " + title + " into a valid episode", logger.DEBUG)
diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py
index f2574442a..49e078a66 100644
--- a/sickbeard/providers/iptorrents.py
+++ b/sickbeard/providers/iptorrents.py
@@ -196,7 +196,7 @@ class IPTorrentsProvider(generic.TorrentProvider):
# parse the file name
try:
- myParser = NameParser(False, convert=True)
+ myParser = NameParser(False)
parse_result = myParser.parse(title)
except InvalidNameException:
logger.log(u"Unable to parse the filename " + title + " into a valid episode", logger.DEBUG)
diff --git a/sickbeard/providers/tntvillage.py b/sickbeard/providers/tntvillage.py
index d29fbfbae..3d51c11f9 100644
--- a/sickbeard/providers/tntvillage.py
+++ b/sickbeard/providers/tntvillage.py
@@ -318,7 +318,7 @@ class TNTVillageProvider(generic.TorrentProvider):
def _is_season_pack(self, name):
try:
- myParser = NameParser(tryIndexers=True, trySceneExceptions=True, convert=True)
+ myParser = NameParser(tryIndexers=True, trySceneExceptions=True)
parse_result = myParser.parse(name)
except InvalidNameException:
logger.log(u"Unable to parse the filename " + str(name) + " into a valid episode", logger.DEBUG)
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index ddfea9e4b..404790990 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -254,7 +254,7 @@ class TVCache():
showObj = helpers.findCertainShow(sickbeard.showList, indexer_id)
try:
- myParser = NameParser(showObj=showObj, convert=True)
+ myParser = NameParser(showObj=showObj)
parse_result = myParser.parse(name)
except InvalidNameException:
logger.log(u"Unable to parse the filename " + name + " into a valid episode", logger.DEBUG)
--
GitLab