From bc05a9f6fad2ab77f38c7877879c992260566c56 Mon Sep 17 00:00:00 2001 From: echel0n Date: Thu, 8 May 2014 10:37:33 -0700 Subject: [PATCH 1/2] Fixed issue #473 --- sickbeard/search_queue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py index 547ed5ce..fd5b6cc3 100644 --- a/sickbeard/search_queue.py +++ b/sickbeard/search_queue.py @@ -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) From ac7198a852894130f655e3a4a56f8d09ed9975bb Mon Sep 17 00:00:00 2001 From: echel0n Date: Thu, 8 May 2014 11:10:22 -0700 Subject: [PATCH 2/2] Naming pattern issues resolved. --- sickbeard/tv.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sickbeard/tv.py b/sickbeard/tv.py index 34153684..56b015bd 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -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): """