From a954d269f650eb9f6e35d573a46dc882e0efd6d4 Mon Sep 17 00:00:00 2001 From: Ruud Date: Wed, 3 Aug 2011 22:00:26 +0200 Subject: [PATCH] CouchPotato file tag for renamer --- couchpotato/core/downloaders/base.py | 3 +++ couchpotato/core/downloaders/blackhole/main.py | 3 +-- couchpotato/core/downloaders/sabnzbd/main.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/couchpotato/core/downloaders/base.py b/couchpotato/core/downloaders/base.py index edd1103b..ceb04391 100644 --- a/couchpotato/core/downloaders/base.py +++ b/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() diff --git a/couchpotato/core/downloaders/blackhole/main.py b/couchpotato/core/downloaders/blackhole/main.py index 47650a13..21712d34 100644 --- a/couchpotato/core/downloaders/blackhole/main.py +++ b/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): diff --git a/couchpotato/core/downloaders/sabnzbd/main.py b/couchpotato/core/downloaders/sabnzbd/main.py index eb648f57..023b63bf 100644 --- a/couchpotato/core/downloaders/sabnzbd/main.py +++ b/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