diff --git a/sickbeard/failedProcessor.py b/sickbeard/failedProcessor.py index 6c1245bb893281bd8f4ea77e2e2fc849a113d4f2..0b31003d08a892ee4ee6738d36fdc9b1998642d9 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 301bf5ebee53b44c9b6e4627f09ff26634f45e78..205698e6a88f75d1b0938aafe886df9bc23f47c5 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 06b262e50a57a2865ad0a2c5356bb3536b03db10..ea84e43915f4a5fa97586f9ce6499259766c4bf9 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 deb05df71b173200a77541b56b6f4959a118e8fa..06e926f5e1b50343032cf69e1a687ca118b82db4 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 5470838b4dbe407df2e252fc54d02576a870a32d..b37581ee9c0186ccfe850d5ed894b277d11c69dc 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 b97a86dd936eb6022a0b138acaee8d5636e9cdc0..c10d5e6205416f24cbb2cd16d344fcc77cb567c1 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 f2574442a79669e0db2c7008ca1d3d3912954cc0..49e078a661f1e74a23eea324770f275d74bdf88b 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 d29fbfbae950079d56367ba24f9bfc3203129900..3d51c11f95ee6f1db03dce7e9b0903621c85ed8c 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 ddfea9e4b010e5594a34bfa34b2607e730e9477c..4047909909d6182e589f5933a9131774b69a359c 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)