CouchPotato file tag for renamer

couchpotato/core/downloaders/base.py

@@ -15,6 +15,9 @@ class Downloader(Plugin):
     def download(self, data = {}):
         pass
 
+    def cpTag(self, movie):
+        return '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''
+
     def isDisabled(self):
         return not self.isEnabled()
 

couchpotato/core/downloaders/blackhole/main.py

@@ -23,8 +23,7 @@ class Blackhole(Downloader):
         if not directory or not os.path.isdir(directory):
             log.error('No directory set for blackhole %s download.' % data.get('type'))
         else:
-            cp_tag = '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''
-            fullPath = os.path.join(directory, '%s%s.%s' % (toSafeString(data.get('name')), cp_tag , data.get('type')))
+            fullPath = os.path.join(directory, '%s%s.%s' % (toSafeString(data.get('name')), self.cpTag(movie) , data.get('type')))
 
             try:
                 if not os.path.isfile(fullPath):

couchpotato/core/downloaders/sabnzbd/main.py

@@ -35,13 +35,12 @@ class Sabnzbd(Downloader):
             pp = False
 
 
-        cp_tag = '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''
         params = {
             'apikey': self.conf('api_key'),
             'cat': self.conf('category'),
             'mode': 'addurl',
             'name': data.get('url'),
-            'nzbname': '%s%s' % (data.get('name'), cp_tag),
+            'nzbname': '%s%s' % (data.get('name'), self.cpTag(movie)),
         }
 
         # sabNzbd complains about "invalid archive file" for newzbin urls