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

Use multiple tag when renaming extras. fix #652

Browse Source
This commit is contained in:
Ruud
2012-10-21 18:07:14 +02:00
parent 4fb7467e97
commit 6f7b565103
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer/main.py
+31 -22
View File
@@ -129,6 +129,8 @@ class Renamer(Plugin):
'resolution_width': group['meta_data'].get('resolution_width'), 'resolution_width': group['meta_data'].get('resolution_width'),
'resolution_height': group['meta_data'].get('resolution_height'), 'resolution_height': group['meta_data'].get('resolution_height'),
'imdb_id': library['identifier'], 'imdb_id': library['identifier'],
'cd': '',
'cd_nr': '',
} }
for file_type in group['files']: for file_type in group['files']:
@@ -146,7 +148,7 @@ class Renamer(Plugin):
continue continue
# Move other files # Move other files
multiple = len(group['files']['movie']) > 1 and not group['is_dvd'] multiple = len(group['files'][file_type]) > 1 and not group['is_dvd']
cd = 1 if multiple else 0 cd = 1 if multiple else 0
for current_file in sorted(list(group['files'][file_type])): for current_file in sorted(list(group['files'][file_type])):
@@ -159,23 +161,19 @@ class Renamer(Plugin):
replacements['ext'] = getExt(current_file) replacements['ext'] = getExt(current_file)
# cd # # cd #
replacements['cd'] = ' cd%d' % cd if cd else '' replacements['cd'] = ' cd%d' % cd if multiple else ''
replacements['cd_nr'] = cd replacements['cd_nr'] = cd if multiple else ''
# Naming # Naming
final_folder_name = self.doReplace(folder_name, replacements) final_folder_name = self.doReplace(folder_name, replacements)
final_file_name = self.doReplace(file_name, replacements) 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)]
# Group filename without cd extension
replacements['cd'] = ''
replacements['cd_nr'] = ''
# Meta naming # Meta naming
if file_type is 'trailer': if file_type is 'trailer':
final_file_name = self.doReplace(trailer_name, replacements) 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) final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True)
# Seperator replace # Seperator replace
if separator: if separator:
@@ -206,10 +204,16 @@ class Renamer(Plugin):
# Check for extra subtitle files # Check for extra subtitle files
if file_type is 'subtitle': if file_type is 'subtitle':
# rename subtitles with or without language remove_multiple = False
rename_files[current_file] = os.path.join(destination, final_folder_name, final_file_name) if len(group['files']['movie']) == 1:
remove_multiple = True
sub_langs = group['subtitle_language'].get(current_file, []) sub_langs = group['subtitle_language'].get(current_file, [])
# rename subtitles with or without language
sub_name = self.doReplace(file_name, replacements, remove_multiple = remove_multiple)
rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name)
rename_extras = self.getRenameExtras( rename_extras = self.getRenameExtras(
extra_type = 'subtitle_extra', extra_type = 'subtitle_extra',
replacements = replacements, replacements = replacements,
@@ -217,20 +221,19 @@ class Renamer(Plugin):
file_name = file_name, file_name = file_name,
destination = destination, destination = destination,
group = group, group = group,
current_file = current_file current_file = current_file,
remove_multiple = remove_multiple,
) )
# Don't add language if multiple languages in 1 file # Don't add language if multiple languages in 1 subtitle file
if len(sub_langs) > 1: if len(sub_langs) == 1:
rename_files[current_file] = os.path.join(destination, final_folder_name, final_file_name)
elif len(sub_langs) == 1:
sub_name = final_file_name.replace(replacements['ext'], '%s.%s' % (sub_langs[0], replacements['ext'])) sub_name = final_file_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)
# Filename without cd etc # Filename without cd etc
if file_type is 'movie': elif file_type is 'movie':
rename_extras = self.getRenameExtras( rename_extras = self.getRenameExtras(
extra_type = 'movie_extra', extra_type = 'movie_extra',
replacements = replacements, replacements = replacements,
@@ -242,7 +245,7 @@ class Renamer(Plugin):
) )
rename_files = mergeDicts(rename_files, rename_extras) rename_files = mergeDicts(rename_files, rename_extras)
group['filename'] = self.doReplace(file_name, replacements)[:-(len(getExt(final_file_name)) + 1)] group['filename'] = self.doReplace(file_name, replacements, remove_multiple = True)[:-(len(getExt(final_file_name)) + 1)]
group['destination_dir'] = os.path.join(destination, final_folder_name) group['destination_dir'] = os.path.join(destination, final_folder_name)
if multiple: if multiple:
@@ -387,8 +390,9 @@ class Renamer(Plugin):
self.renaming_started = False self.renaming_started = False
def getRenameExtras(self, extra_type = '', replacements = {}, folder_name = '', file_name = '', destination = '', group = {}, current_file = ''): def getRenameExtras(self, extra_type = '', replacements = {}, folder_name = '', file_name = '', destination = '', group = {}, current_file = '', remove_multiple = False):
replacements = replacements.copy()
rename_files = {} rename_files = {}
def test(s): def test(s):
@@ -397,8 +401,8 @@ class Renamer(Plugin):
for extra in set(filter(test, group['files'][extra_type])): for extra in set(filter(test, group['files'][extra_type])):
replacements['ext'] = getExt(extra) replacements['ext'] = getExt(extra)
final_folder_name = self.doReplace(folder_name, replacements) final_folder_name = self.doReplace(folder_name, replacements, remove_multiple = remove_multiple)
final_file_name = self.doReplace(file_name, replacements) final_file_name = self.doReplace(file_name, replacements, remove_multiple = remove_multiple)
rename_files[extra] = os.path.join(destination, final_folder_name, final_file_name) rename_files[extra] = os.path.join(destination, final_folder_name, final_file_name)
return rename_files return rename_files
@@ -453,11 +457,16 @@ class Renamer(Plugin):
return True return True
def doReplace(self, string, replacements): def doReplace(self, string, replacements, remove_multiple = False):
''' '''
replace confignames with the real thing replace confignames with the real thing
''' '''
replacements = replacements.copy()
if remove_multiple:
replacements['cd'] = ''
replacements['cd_nr'] = ''
replaced = toUnicode(string) replaced = toUnicode(string)
for x, r in replacements.iteritems(): for x, r in replacements.iteritems():
if r is not None: if r is not None: