From fafcdb4ed57e4305a5e8c676c7725deebc98030d Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sat, 19 Jan 2019 00:35:35 -0500 Subject: [PATCH] Refactor NZB_DEFAULTDIR -> NZB_DEFAULT_DIRECTORY --- core/__init__.py | 6 +++--- nzbToMedia.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 7adfc38e..cdeedda9 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -135,7 +135,7 @@ NZB_CLIENT_AGENT = None SABNZBD_HOST = None SABNZBD_PORT = None SABNZBD_APIKEY = None -NZB_DEFAULTDIR = None +NZB_DEFAULT_DIRECTORY = None TORRENT_CLIENTAGENT = None TORRENT_CLASS = None @@ -268,7 +268,7 @@ def initialize(section=None): NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS, \ DELETE_ORIGINAL, TORRENT_CHMOD_DIRECTORY, PASSWORDSFILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \ USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOADINFO, CHECK_MEDIA, SAFE_MODE, \ - TORRENT_DEFAULT_DIRECTORY, TORRENT_RESUME_ON_FAILURE, NZB_DEFAULTDIR, REMOTEPATHS, LOG_ENV, PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \ + TORRENT_DEFAULT_DIRECTORY, TORRENT_RESUME_ON_FAILURE, NZB_DEFAULT_DIRECTORY, REMOTEPATHS, LOG_ENV, PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \ PLEX_SSL, PLEX_HOST, PLEX_PORT, PLEX_TOKEN, PLEX_SECTION, TORRENT_RESUME, PAR2CMD, QBITTORRENT_HOST, QBITTORRENT_PORT, QBITTORRENT_USER, QBITTORRENT_PASSWORD if __INITIALIZED__: @@ -385,7 +385,7 @@ def initialize(section=None): SABNZBD_HOST = CFG['Nzb']['sabnzbd_host'] SABNZBD_PORT = int(CFG['Nzb']['sabnzbd_port'] or 8080) # defaults to accomodate NzbGet SABNZBD_APIKEY = CFG['Nzb']['sabnzbd_apikey'] - NZB_DEFAULTDIR = CFG['Nzb']['default_downloadDirectory'] + NZB_DEFAULT_DIRECTORY = CFG['Nzb']['default_downloadDirectory'] GROUPS = CFG['Custom']['remove_group'] if isinstance(GROUPS, str): GROUPS = GROUPS.split(',') diff --git a/nzbToMedia.py b/nzbToMedia.py index fceed9cd..526540d1 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -645,7 +645,7 @@ except NameError: # post-processing def process(input_directory, input_name=None, status=0, client_agent='manual', download_id=None, input_category=None, failure_link=None): - if core.SAFE_MODE and input_directory == core.NZB_DEFAULTDIR: + if core.SAFE_MODE and input_directory == core.NZB_DEFAULT_DIRECTORY: logger.error( 'The input directory:[{0}] is the Default Download Directory. Please configure category directories to prevent processing of other media.'.format( input_directory))