From ce4806df64c13f1f8bf0bade131a368e6c698180 Mon Sep 17 00:00:00 2001
From: mano3m <mano3m@users.noreply.github.com>
Date: Sat, 29 Mar 2014 21:57:17 +0100
Subject: [PATCH] Add 3D renamer option

---
 couchpotato/core/plugins/release/main.py | 3 ++-
 couchpotato/core/plugins/renamer.py      | 7 +++++--
 couchpotato/core/plugins/scanner.py      | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py
index 72a0a50..518cbce 100644
--- a/couchpotato/core/plugins/release/main.py
+++ b/couchpotato/core/plugins/release/main.py
@@ -107,6 +107,7 @@ class Release(Plugin):
                 'media_id': media['_id'],
                 'identifier': release_identifier,
                 'quality': group['meta_data']['quality'].get('identifier'),
+                'is_3d': group['meta_data']['quality'].get('is_3d', 0),
                 'last_edit': int(time.time()),
                 'status': 'done'
             }
@@ -406,7 +407,7 @@ class Release(Plugin):
             rel = db.get('id', release_id)
             if rel and rel.get('status') != status:
 
-                release_name = rel.get('name')
+                release_name = rel['info'].get('name')
                 if rel.get('files'):
                     for file_type in rel.get('files', {}):
                         if file_type == 'movie':
diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py
index 5424874..d9bb4ab 100644
--- a/couchpotato/core/plugins/renamer.py
+++ b/couchpotato/core/plugins/renamer.py
@@ -112,7 +112,7 @@ class Renamer(Plugin):
             return
 
         if not base_folder:
-            base_folder = self.conf('from')
+            base_folder = sp(self.conf('from'))
 
         from_folder = sp(self.conf('from'))
         to_folder = sp(self.conf('to'))
@@ -315,6 +315,7 @@ class Renamer(Plugin):
                     'cd_nr': '',
                     'mpaa': media['info'].get('mpaa', ''),
                     'category': category_label,
+                    '3d': '3D' if group['meta_data']['quality'].get('is_3d', 0) else '',
                 }
 
                 for file_type in group['files']:
@@ -824,7 +825,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
     def replaceDoubles(self, string):
 
         replaces = [
-            ('\.+', '.'), ('_+', '_'), ('-+', '-'), ('\s+', ' '),
+            ('\.+', '.'), ('_+', '_'), ('-+', '-'), ('\s+', ' '), (' \\\\', '\\\\'), (' /', '/'),
             ('(\s\.)+', '.'), ('(-\.)+', '.'), ('(\s-)+', '-'),
         ]
 
@@ -1056,6 +1057,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
             release_download.update({
                 'imdb_id': getIdentifier(media),
                 'quality': rls['quality'],
+                'is_3d': rls['is_3d'],
                 'protocol': rls.get('info', {}).get('protocol') or rls.get('info', {}).get('type'),
                 'release_id': rls['_id'],
             })
@@ -1195,6 +1197,7 @@ rename_options = {
         'first': 'First letter (M)',
         'quality': 'Quality (720p)',
         'quality_type': '(HD) or (SD)',
+        '3d': '3D',
         'video': 'Video (x264)',
         'audio': 'Audio (DTS)',
         'group': 'Releasegroup name',
diff --git a/couchpotato/core/plugins/scanner.py b/couchpotato/core/plugins/scanner.py
index 1f636ad..64d6107 100644
--- a/couchpotato/core/plugins/scanner.py
+++ b/couchpotato/core/plugins/scanner.py
@@ -450,6 +450,7 @@ class Scanner(Plugin):
         data['quality'] = None
         if release_download and release_download.get('quality'):
             data['quality'] = fireEvent('quality.single', release_download.get('quality'), single = True)
+            data['quality']['is_3d'] = release_download.get('is_3d', False)
 
         if not data['quality']:
             data['quality'] = fireEvent('quality.guess', files = files, extra = data, single = True)