From 797dedfcbb486b79e449289b2c1d5e50a921c1ac Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 5 Jul 2013 21:28:07 +0200 Subject: [PATCH] Remove cdX from subname. fix #1524 --- couchpotato/core/plugins/renamer/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py index c219f17..a2fb5dc 100644 --- a/couchpotato/core/plugins/renamer/main.py +++ b/couchpotato/core/plugins/renamer/main.py @@ -220,15 +220,15 @@ class Renamer(Plugin): replacements['cd_nr'] = cd if multiple else '' # Naming - final_folder_name = self.doReplace(folder_name, replacements).lstrip('. ') - final_file_name = self.doReplace(file_name, replacements).lstrip('. ') + final_folder_name = self.doReplace(folder_name, replacements) + final_file_name = self.doReplace(file_name, replacements) replacements['filename'] = final_file_name[:-(len(getExt(final_file_name)) + 1)] # Meta naming if file_type is 'trailer': - final_file_name = self.doReplace(trailer_name, replacements, remove_multiple = True).lstrip('. ') + final_file_name = self.doReplace(trailer_name, replacements, remove_multiple = True) elif file_type is 'nfo': - final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True).lstrip('. ') + final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True) # Seperator replace if separator: @@ -282,7 +282,7 @@ class Renamer(Plugin): # Don't add language if multiple languages in 1 subtitle file if len(sub_langs) == 1: - sub_name = final_file_name.replace(replacements['ext'], '%s.%s' % (sub_langs[0], replacements['ext'])) + sub_name = sub_name.replace(replacements['ext'], '%s.%s' % (sub_langs[0], replacements['ext'])) rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name) rename_files = mergeDicts(rename_files, rename_extras) @@ -556,7 +556,7 @@ Remove it if you want it to be renamed (again, or at least let it try again) replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced) sep = self.conf('separator') - return self.replaceDoubles(replaced).replace(' ', ' ' if not sep else sep) + return self.replaceDoubles(replaced.lstrip('. ')).replace(' ', ' ' if not sep else sep) def replaceDoubles(self, string): return string.replace(' ', ' ').replace(' .', '.')