Remove .cp(xxx) from original_foldername

couchpotato/core/plugins/renamer/__init__.py

@@ -12,14 +12,13 @@ rename_options = {
         'thename': 'The Moviename',
         'year': 'Year (2011)',
         'first': 'First letter (M)',
-        'dirname': 'Dirname (Moviename.2011.720p-releasegrp)',
         'quality': 'Quality (720P)',
         'video': 'Video (x264)',
         'audio': 'Audio (DTS)',
         'group': 'Releasegroup name',
         'source': 'Source media (Bluray)',
-        'original': 'Original file name',
-        'original_folder': 'Original folder name',
+        'original': 'Original filename',
+        'original_folder': 'Original foldername',
     },
 }
 

couchpotato/core/plugins/renamer/main.py

@@ -108,7 +108,6 @@ class Renamer(Plugin):
                      'thename': movie_name.strip(),
                      'year': library['year'],
                      'first': name_the[0].upper(),
-                     'dirname': group['dirname'],
                      'quality': group['meta_data']['quality']['label'],
                      'quality_type': group['meta_data']['quality_type'],
                      'video': group['meta_data'].get('video'),
@@ -138,7 +137,7 @@ class Renamer(Plugin):
 
                         # Original filename
                         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
                         replacements['ext'] = getExt(current_file)