1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-08-13 16:53:54 -04:00

Merge branch 'origin/dev'

This commit is contained in:
echel0n 2014-05-08 11:10:33 -07:00
commit 50a2de3082
2 changed files with 2 additions and 5 deletions

View File

@ -330,7 +330,7 @@ class BacklogQueueItem(generic_queue.QueueItem):
with ThreadPoolExecutor(sickbeard.NUM_OF_THREADS) as executor:
for provider in providers:
didSearch = True
logger.log("Beginning backlog search for [" + self.segment + "] on " + provider.name)
logger.log("Beginning backlog search for [" + str(self.segment) + "] on " + provider.name)
executor.submit(
search.searchProviders, self, self.show, self.segment, self.wantedEpisodes, provider,
seasonSearch, False).add_done_callback(snatch_results)

View File

@ -2058,10 +2058,7 @@ class TVEpisode(object):
# split off the dirs only, if they exist
name_groups = re.split(r'[\\/]', pattern)
if len(name_groups) == 1:
return ''
else:
return self._format_pattern(os.sep.join(name_groups[:-1]), multi)
return self._format_pattern(name_groups[-1], multi)
def rename(self):
"""