get identifier helper

couchpotato/core/plugins/base.py

@@ -10,7 +10,7 @@ import urllib2
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.encoding import ss, toSafeString, \
     toUnicode, sp
-from couchpotato.core.helpers.variable import getExt, md5, isLocalIP, scanForPassword, tryInt
+from couchpotato.core.helpers.variable import getExt, md5, isLocalIP, scanForPassword, tryInt, getIdentifier
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
 import requests
@@ -338,7 +338,8 @@ class Plugin(object):
 
     def cpTag(self, media):
         if Env.setting('enabled', 'renamer'):
-            return '.cp(' + media.get('identifier') + ')' if media.get('identifier') else ''
+            identifier = getIdentifier(media)
+            return '.cp(' + identifier + ')' if identifier else ''
 
         return ''
 

couchpotato/core/plugins/renamer.py

@@ -10,7 +10,7 @@ from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import toUnicode, ss, sp
 from couchpotato.core.helpers.variable import getExt, mergeDicts, getTitle, \
-    getImdb, link, symlink, tryInt, splitString, fnEscape, isSubFolder
+    getImdb, link, symlink, tryInt, splitString, fnEscape, isSubFolder, getIdentifier
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
@@ -1043,7 +1043,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
         if rls:
             media = db.get('id', rls['media_id'])
             release_download.update({
-                'imdb_id': media['identifier'],
+                'imdb_id': getIdentifier(media),
                 'quality': rls['quality'],
                 'protocol': rls.get('info', {}).get('protocol') or rls.get('info', {}).get('type'),
                 'release_id': rls['_id'],

couchpotato/core/plugins/scanner.py

@@ -8,7 +8,7 @@ from couchpotato import get_db
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.encoding import toUnicode, simplifyString, sp
 from couchpotato.core.helpers.variable import getExt, getImdb, tryInt, \
-    splitString
+    splitString, getIdentifier
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from enzyme.exceptions import NoParserError, ParseError
@@ -403,7 +403,7 @@ class Scanner(Plugin):
             if not group['media']:
                 log.error('Unable to determine media: %s', group['identifiers'])
             else:
-                group['identifier'] = group['media'].get('identifier') or group['media']['info'].get('imdb')
+                group['identifier'] = getIdentifier(group['media']) or group['media']['info'].get('imdb')
 
             processed_movies[identifier] = group