From cd1a1f5665f42e512dceec8111e68fcd18b9f051 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Tue, 24 Jan 2012 22:08:24 +0100
Subject: [PATCH] Remove .cp(xxx) from original_foldername

---
 couchpotato/core/plugins/renamer/__init__.py |  5 ++---
 couchpotato/core/plugins/renamer/main.py     |  3 +--
 couchpotato/core/plugins/scanner/main.py     | 18 ++++++++----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/couchpotato/core/plugins/renamer/__init__.py b/couchpotato/core/plugins/renamer/__init__.py
index b1b807c5..ab2cd899 100644
--- a/couchpotato/core/plugins/renamer/__init__.py
+++ b/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',
     },
 }
 
diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
index 92b856b5..bc9f8198 100644
--- a/couchpotato/core/plugins/renamer/main.py
+++ b/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)
diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py
index d98a22f8..fa3ab7c8 100644
--- a/couchpotato/core/plugins/scanner/main.py
+++ b/couchpotato/core/plugins/scanner/main.py
@@ -70,13 +70,14 @@ class Scanner(Plugin):
         '()([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
 
     def __init__(self):
 
         addEvent('scanner.create_file_identifier', self.createStringIdentifier)
+        addEvent('scanner.remove_cptag', self.removeCPTag)
 
         addEvent('scanner.scan', self.scan)
         addEvent('scanner.files', self.scanFilesToLibrary)
@@ -420,14 +421,11 @@ class Scanner(Plugin):
 
         return False
 
-    def removeCPImdb(self, name):
-        for regex in self.multipart_regex:
-            try:
-                found = re.sub(regex, '', name)
-                if found != name:
-                    name = found
-            except:
-                pass
+    def removeCPTag(self, name):
+        try:
+            return re.sub(self.cp_imdb, '', name)
+        except:
+            pass
         return name
 
     def getMediaFiles(self, files):
@@ -529,7 +527,7 @@ class Scanner(Plugin):
         identifier = self.removeMultipart(identifier)
 
         # remove cptag
-        identifier = self.removeCPImdb(identifier)
+        identifier = self.removeCPTag(identifier)
 
         # groups, release tags, scenename cleaner, regex isn't correct
         identifier = re.sub(self.clean, '::', simplifyString(identifier))