dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a parameter to the renamer API. Fixes #3845.

Browse Source 
The renamer now has a new 'to_folder' parameter.
This parameter specifies where movies are moved to.
This commit is contained in:
voidstarstar
2014-11-27 21:43:19 -05:00
parent ff8da7c8f8
commit 0dca34958c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer.py
+7 -3
View File
@@ -35,6 +35,7 @@ class Renamer(Plugin):
'desc': 'For the renamer to check for new files to rename in a folder', 'desc': 'For the renamer to check for new files to rename in a folder',
'params': { 'params': {
'async': {'desc': 'Optional: Set to 1 if you dont want to fire the renamer.scan asynchronous.'}, 'async': {'desc': 'Optional: Set to 1 if you dont want to fire the renamer.scan asynchronous.'},
'to_folder': {'desc': 'Optional: The folder to move releases to. Leave empty for default folder.'},
'media_folder': {'desc': 'Optional: The folder of the media to scan. Keep empty for default renamer folder.'}, 'media_folder': {'desc': 'Optional: The folder of the media to scan. Keep empty for default renamer folder.'},
'files': {'desc': 'Optional: Provide the release files if more releases are in the same media_folder, delimited with a \'|\'. Note that no dedicated release folder is expected for releases with one file.'}, 'files': {'desc': 'Optional: Provide the release files if more releases are in the same media_folder, delimited with a \'|\'. Note that no dedicated release folder is expected for releases with one file.'},
'base_folder': {'desc': 'Optional: The folder to find releases in. Leave empty for default folder.'}, 'base_folder': {'desc': 'Optional: The folder to find releases in. Leave empty for default folder.'},
@@ -72,6 +73,7 @@ class Renamer(Plugin):
async = tryInt(kwargs.get('async', 0)) async = tryInt(kwargs.get('async', 0))
base_folder = kwargs.get('base_folder') base_folder = kwargs.get('base_folder')
media_folder = sp(kwargs.get('media_folder')) media_folder = sp(kwargs.get('media_folder'))
to_folder = kwargs.get('to_folder')
# Backwards compatibility, to be removed after a few versions :) # Backwards compatibility, to be removed after a few versions :)
if not media_folder: if not media_folder:
@@ -95,13 +97,13 @@ class Renamer(Plugin):
}) })
fire_handle = fireEvent if not async else fireEventAsync fire_handle = fireEvent if not async else fireEventAsync
fire_handle('renamer.scan', base_folder = base_folder, release_download = release_download) fire_handle('renamer.scan', base_folder = base_folder, release_download = release_download, to_folder = to_folder)
return { return {
'success': True 'success': True
} }
def scan(self, base_folder = None, release_download = None): def scan(self, base_folder = None, release_download = None, to_folder = None):
if not release_download: release_download = {} if not release_download: release_download = {}
if self.isDisabled(): if self.isDisabled():
@@ -115,7 +117,9 @@ class Renamer(Plugin):
base_folder = sp(self.conf('from')) base_folder = sp(self.conf('from'))
from_folder = sp(self.conf('from')) from_folder = sp(self.conf('from'))
to_folder = sp(self.conf('to'))
if not to_folder:
to_folder = sp(self.conf('to'))
# Get media folder to process # Get media folder to process
media_folder = sp(release_download.get('folder')) media_folder = sp(release_download.get('folder'))