From 4bf842b4f4a3aedae16919f15289a5b66c199c0b Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sat, 19 Jan 2019 00:24:40 -0500 Subject: [PATCH] Refactor TORRENT_DEFAULTDIR -> TORRENT_DEFAULT_DIRECTORY --- TorrentToMedia.py | 2 +- core/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 2e316d12..7de26883 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -131,7 +131,7 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp logger.info('Output directory set to: {0}'.format(output_destination)) - if core.SAFE_MODE and output_destination == core.TORRENT_DEFAULTDIR: + if core.SAFE_MODE and output_destination == core.TORRENT_DEFAULT_DIRECTORY: logger.error('The output directory:[{0}] is the Download Directory. ' 'Edit outputDirectory in autoProcessMedia.cfg. Exiting'.format (input_directory)) diff --git a/core/__init__.py b/core/__init__.py index 5c04fc4e..51d7fdb3 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -144,7 +144,7 @@ OUTPUT_DIRECTORY = None NOFLATTEN = [] DELETE_ORIGINAL = None TORRENT_CHMOD_DIRECTORY = None -TORRENT_DEFAULTDIR = None +TORRENT_DEFAULT_DIRECTORY = None TORRENT_RESUME = None TORRENT_RESUME_ON_FAILURE = 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_DEFAULTDIR, TORRENT_RESUME_ON_FAILURE, NZB_DEFAULTDIR, REMOTEPATHS, LOG_ENV, PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \ + TORRENT_DEFAULT_DIRECTORY, TORRENT_RESUME_ON_FAILURE, NZB_DEFAULTDIR, 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__: @@ -395,7 +395,7 @@ def initialize(section=None): TORRENT_CLIENTAGENT = CFG['Torrent']['clientAgent'] # utorrent | deluge | transmission | rtorrent | vuze | qbittorrent |other USE_LINK = CFG['Torrent']['useLink'] # no | hard | sym OUTPUT_DIRECTORY = CFG['Torrent']['outputDirectory'] # /abs/path/to/complete/ - TORRENT_DEFAULTDIR = CFG['Torrent']['default_downloadDirectory'] + TORRENT_DEFAULT_DIRECTORY = CFG['Torrent']['default_downloadDirectory'] CATEGORIES = (CFG['Torrent']['categories']) # music,music_videos,pictures,software NOFLATTEN = (CFG['Torrent']['noFlatten']) if isinstance(NOFLATTEN, str):