dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cdX from subname. fix #1524

Browse Source
This commit is contained in:
Ruud
2013-07-05 21:28:07 +02:00
parent b61de4866c
commit 797dedfcbb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer/main.py
+6 -6
View File
@@ -220,15 +220,15 @@ class Renamer(Plugin):
replacements['cd_nr'] = cd if multiple else '' replacements['cd_nr'] = cd if multiple else ''
# Naming # Naming
final_folder_name = self.doReplace(folder_name, replacements).lstrip('. ') final_folder_name = self.doReplace(folder_name, replacements)
final_file_name = self.doReplace(file_name, replacements).lstrip('. ') final_file_name = self.doReplace(file_name, replacements)
replacements['filename'] = final_file_name[:-(len(getExt(final_file_name)) + 1)] replacements['filename'] = final_file_name[:-(len(getExt(final_file_name)) + 1)]
# Meta naming # Meta naming
if file_type is 'trailer': 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': 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 # Seperator replace
if separator: if separator:
@@ -282,7 +282,7 @@ class Renamer(Plugin):
# Don't add language if multiple languages in 1 subtitle file # Don't add language if multiple languages in 1 subtitle file
if len(sub_langs) == 1: 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[current_file] = os.path.join(destination, final_folder_name, sub_name)
rename_files = mergeDicts(rename_files, rename_extras) 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) replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced)
sep = self.conf('separator') 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): def replaceDoubles(self, string):
return string.replace(' ', ' ').replace(' .', '.') return string.replace(' ', ' ').replace(' .', '.')