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

Disabled sceneConvert renamer for now till we add it in optionally.

Browse Source
This commit is contained in:
echel0n 2014-04-27 04:46:21 -07:00
parent 41293b1155
commit 831e9a537e
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sickbeard/tv.py
View File

@ -297,7 +297,7 @@ class TVShow(object):
# find all media files in the show folder and create episodes for as many as possible # find all media files in the show folder and create episodes for as many as possible
def loadEpisodesFromDir(self): def loadEpisodesFromDir(self, sceneConvert=False):
if not ek.ek(os.path.isdir, self._location): if not ek.ek(os.path.isdir, self._location):
logger.log(str(self.indexerid) + u": Show dir doesn't exist, not loading episodes from disk") logger.log(str(self.indexerid) + u": Show dir doesn't exist, not loading episodes from disk")
@ -310,17 +310,16 @@ class TVShow(object):
# create TVEpisodes from each media file (if possible) # create TVEpisodes from each media file (if possible)
for mediaFile in mediaFiles: for mediaFile in mediaFiles:
sceneConvert = False
parse_result = None parse_result = None
curEpisode = None curEpisode = None
i = 0
if sceneConvert:
try: try:
i = 0
while i < 2: while i < 2:
i+=1 i+=1
np = NameParser(False) np = NameParser(False)
parse_result = np.parse(mediaFile, sceneConvert) parse_result = np.parse(mediaFile, True if i > 1 else False)
if helpers.validateShow(self, parse_result.season_number, parse_result.episode_numbers[0]): if helpers.validateShow(self, parse_result.season_number, parse_result.episode_numbers[0]):
ep = TVEpisode(self, parse_result.season_number, parse_result.episode_numbers[0]) ep = TVEpisode(self, parse_result.season_number, parse_result.episode_numbers[0])
proper_path = ep.proper_path() proper_path = ep.proper_path()
@ -350,7 +349,6 @@ class TVShow(object):
# converted # converted
break break
sceneConvert = True
except Exception: except Exception:
continue continue
@ -371,6 +369,7 @@ class TVShow(object):
ep_file_name = ek.ek(os.path.splitext, ep_file_name)[0] ep_file_name = ek.ek(os.path.splitext, ep_file_name)[0]
try: try:
parse_result = None
np = NameParser(False) np = NameParser(False)
parse_result = np.parse(ep_file_name) parse_result = np.parse(ep_file_name)
except InvalidNameException: except InvalidNameException: