Browse Source

renamer.scan needs some files. fix #2481

pull/2483/merge
Ruud 12 years ago
parent
commit
0ce5c51c67
  1. 2
      couchpotato/core/downloaders/blackhole/__init__.py
  2. 5
      couchpotato/core/plugins/renamer/main.py

2
couchpotato/core/downloaders/blackhole/__init__.py

@ -13,7 +13,7 @@ config = [{
'list': 'download_providers', 'list': 'download_providers',
'name': 'blackhole', 'name': 'blackhole',
'label': 'Black hole', 'label': 'Black hole',
'description': 'Download the NZB/Torrent to a specific folder.', 'description': 'Download the NZB/Torrent to a specific folder. <em>Note: Seeding and copying/linking features do <strong>not</strong> work with Black hole</em>.',
'wizard': True, 'wizard': True,
'options': [ 'options': [
{ {

5
couchpotato/core/plugins/renamer/main.py

@ -83,6 +83,7 @@ class Renamer(Plugin):
} }
def scan(self, release_download = None): def scan(self, release_download = None):
if not release_download: release_download = {}
if self.isDisabled(): if self.isDisabled():
return return
@ -95,7 +96,7 @@ class Renamer(Plugin):
to_folder = sp(self.conf('to')) to_folder = sp(self.conf('to'))
# Get movie folder to process # Get movie folder to process
movie_folder = release_download and release_download.get('folder') movie_folder = release_download.get('folder')
# Get all folders that should not be processed # Get all folders that should not be processed
no_process = [to_folder] no_process = [to_folder]
@ -122,7 +123,7 @@ class Renamer(Plugin):
log.debug('The provided movie folder %s does not exist. Trying to find it in the \'from\' folder.', movie_folder) log.debug('The provided movie folder %s does not exist. Trying to find it in the \'from\' folder.', movie_folder)
# Update to the from folder # Update to the from folder
if len(release_download.get('files')) == 1: if len(splitString(release_download.get('files'), '|')) == 1:
new_movie_folder = from_folder new_movie_folder = from_folder
else: else:
new_movie_folder = os.path.join(from_folder, os.path.basename(movie_folder)) new_movie_folder = os.path.join(from_folder, os.path.basename(movie_folder))

Loading…
Cancel
Save