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

Remove .cp(xxx) from original_foldername

Browse Source
This commit is contained in:
Ruud
2012-01-24 22:08:24 +01:00
parent dd7b5b794b
commit cd1a1f5665
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer/__init__.py
+2 -3
View File
@@ -12,14 +12,13 @@ rename_options = {
'thename': 'The Moviename', 'thename': 'The Moviename',
'year': 'Year (2011)', 'year': 'Year (2011)',
'first': 'First letter (M)', 'first': 'First letter (M)',
'dirname': 'Dirname (Moviename.2011.720p-releasegrp)',
'quality': 'Quality (720P)', 'quality': 'Quality (720P)',
'video': 'Video (x264)', 'video': 'Video (x264)',
'audio': 'Audio (DTS)', 'audio': 'Audio (DTS)',
'group': 'Releasegroup name', 'group': 'Releasegroup name',
'source': 'Source media (Bluray)', 'source': 'Source media (Bluray)',
'original': 'Original file name', 'original': 'Original filename',
'original_folder': 'Original folder name', 'original_folder': 'Original foldername',
}, },
} }
couchpotato/core/plugins/renamer/main.py
+1 -2
View File
@@ -108,7 +108,6 @@ class Renamer(Plugin):
'thename': movie_name.strip(), 'thename': movie_name.strip(),
'year': library['year'], 'year': library['year'],
'first': name_the[0].upper(), 'first': name_the[0].upper(),
'dirname': group['dirname'],
'quality': group['meta_data']['quality']['label'], 'quality': group['meta_data']['quality']['label'],
'quality_type': group['meta_data']['quality_type'], 'quality_type': group['meta_data']['quality_type'],
'video': group['meta_data'].get('video'), 'video': group['meta_data'].get('video'),
@@ -138,7 +137,7 @@ class Renamer(Plugin):
# Original filename # Original filename
replacements['original'] = os.path.splitext(os.path.basename(current_file))[0] replacements['original'] = os.path.splitext(os.path.basename(current_file))[0]
replacements['original_folder'] = os.path.basename(os.path.dirname(current_file)) replacements['original_folder'] = fireEvent('scanner.remove_cptag', group['dirname'], single = True)
# Extension # Extension
replacements['ext'] = getExt(current_file) replacements['ext'] = getExt(current_file)
couchpotato/core/plugins/scanner/main.py
+8 -10
View File
@@ -70,13 +70,14 @@ class Scanner(Plugin):
'()([ab])(\.....?)$' #*a.mkv '()([ab])(\.....?)$' #*a.mkv
] ]
cp_imdb = '(cp\((?P<id>tt[0-9{7}]+)\))' cp_imdb = '(\.cp\((?P<id>tt[0-9{7}]+)\))'
path_identifiers = {} # bind identifier to filepath path_identifiers = {} # bind identifier to filepath
def __init__(self): def __init__(self):
addEvent('scanner.create_file_identifier', self.createStringIdentifier) addEvent('scanner.create_file_identifier', self.createStringIdentifier)
addEvent('scanner.remove_cptag', self.removeCPTag)
addEvent('scanner.scan', self.scan) addEvent('scanner.scan', self.scan)
addEvent('scanner.files', self.scanFilesToLibrary) addEvent('scanner.files', self.scanFilesToLibrary)
@@ -420,14 +421,11 @@ class Scanner(Plugin):
return False return False
def removeCPImdb(self, name): def removeCPTag(self, name):
for regex in self.multipart_regex: try:
try: return re.sub(self.cp_imdb, '', name)
found = re.sub(regex, '', name) except:
if found != name: pass
name = found
except:
pass
return name return name
def getMediaFiles(self, files): def getMediaFiles(self, files):
@@ -529,7 +527,7 @@ class Scanner(Plugin):
identifier = self.removeMultipart(identifier) identifier = self.removeMultipart(identifier)
# remove cptag # remove cptag
identifier = self.removeCPImdb(identifier) identifier = self.removeCPTag(identifier)
# groups, release tags, scenename cleaner, regex isn't correct # groups, release tags, scenename cleaner, regex isn't correct
identifier = re.sub(self.clean, '::', simplifyString(identifier)) identifier = re.sub(self.clean, '::', simplifyString(identifier))