diff --git a/core/__init__.py b/core/__init__.py index 51d7fdb3..2e735c10 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -132,9 +132,9 @@ SAFE_MODE = None NOEXTRACTFAILED = None NZB_CLIENTAGENT = None -SABNZBDHOST = None -SABNZBDPORT = None -SABNZBDAPIKEY = None +SABNZBD_HOST = None +SABNZBD_PORT = None +SABNZBD_APIKEY = None NZB_DEFAULTDIR = None TORRENT_CLIENTAGENT = None @@ -260,7 +260,7 @@ def initialize(section=None): TRANSMISSION_HOST, TRANSMISSION_PORT, TRANSMISSION_PASSWORD, TRANSMISSION_USER, COMPRESSEDCONTAINER, MEDIACONTAINER, \ METACONTAINER, SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, LOG_GIT, GROUPS, SEVENZIP, CONCAT, VCRF, \ __INITIALIZED__, AUTO_UPDATE, APP_FILENAME, USER_DELAY, APP_NAME, TRANSCODE, DEFAULTS, GIT_PATH, GIT_USER, \ - GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENTAGENT, SABNZBDHOST, SABNZBDPORT, SABNZBDAPIKEY, \ + GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENTAGENT, SABNZBD_HOST, SABNZBD_PORT, SABNZBD_APIKEY, \ DUPLICATE, IGNOREEXTENSIONS, VEXTENSION, OUTPUTVIDEOPATH, PROCESSOUTPUT, VCODEC, VCODEC_ALLOW, VPRESET, \ VFRAMERATE, LOG_DB, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, FAILED, \ ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \ @@ -382,9 +382,9 @@ def initialize(section=None): wake_up() NZB_CLIENTAGENT = CFG['Nzb']['clientAgent'] # sabnzbd - SABNZBDHOST = CFG['Nzb']['sabnzbd_host'] - SABNZBDPORT = int(CFG['Nzb']['sabnzbd_port'] or 8080) # defaults to accomodate NzbGet - SABNZBDAPIKEY = CFG['Nzb']['sabnzbd_apikey'] + 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'] GROUPS = CFG['Custom']['remove_group'] if isinstance(GROUPS, str): diff --git a/core/utils/network.py b/core/utils/network.py index 99a89e1e..5a7a5758 100644 --- a/core/utils/network.py +++ b/core/utils/network.py @@ -101,13 +101,13 @@ def find_download(client_agent, download_id): if torrent['hash'] == download_id: return True if client_agent == 'sabnzbd': - if 'http' in core.SABNZBDHOST: - base_url = '{0}:{1}/api'.format(core.SABNZBDHOST, core.SABNZBDPORT) + if 'http' in core.SABNZBD_HOST: + base_url = '{0}:{1}/api'.format(core.SABNZBD_HOST, core.SABNZBD_PORT) else: - base_url = 'http://{0}:{1}/api'.format(core.SABNZBDHOST, core.SABNZBDPORT) + base_url = 'http://{0}:{1}/api'.format(core.SABNZBD_HOST, core.SABNZBD_PORT) url = base_url params = { - 'apikey': core.SABNZBDAPIKEY, + 'apikey': core.SABNZBD_APIKEY, 'mode': 'get_files', 'output': 'json', 'value': download_id, diff --git a/core/utils/nzbs.py b/core/utils/nzbs.py index ad3b4e04..23061c96 100644 --- a/core/utils/nzbs.py +++ b/core/utils/nzbs.py @@ -10,13 +10,13 @@ def get_nzoid(input_name): nzoid = None slots = [] logger.debug('Searching for nzoid from SAbnzbd ...') - if 'http' in core.SABNZBDHOST: - base_url = '{0}:{1}/api'.format(core.SABNZBDHOST, core.SABNZBDPORT) + if 'http' in core.SABNZBD_HOST: + base_url = '{0}:{1}/api'.format(core.SABNZBD_HOST, core.SABNZBD_PORT) else: - base_url = 'http://{0}:{1}/api'.format(core.SABNZBDHOST, core.SABNZBDPORT) + base_url = 'http://{0}:{1}/api'.format(core.SABNZBD_HOST, core.SABNZBD_PORT) url = base_url params = { - 'apikey': core.SABNZBDAPIKEY, + 'apikey': core.SABNZBD_APIKEY, 'mode': 'queue', 'output': 'json', }