From 5d5eb798c97660daad901e4dc1b00934af79d42d Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Fri, 18 Jan 2019 22:21:34 -0500 Subject: [PATCH] Refactor TRANSMISSIONHOST -> TRANSMISSION_HOST --- core/__init__.py | 6 +++--- core/utils/torrents.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 6cb95416..7794fa14 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -154,7 +154,7 @@ UTORRENT_WEB_UI = None UTORRENT_USER = None UTORRENT_PASSWORD = None -TRANSMISSIONHOST = None +TRANSMISSION_HOST = None TRANSMISSIONPORT = None TRANSMISSIONUSR = None TRANSMISSIONPWD = None @@ -257,7 +257,7 @@ def initialize(section=None): NZBTOMEDIA_BRANCH, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, VERSION_NOTIFY, SYS_ARGV, CFG, \ SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, TORRENT_CLIENTAGENT, USELINK, OUTPUTDIRECTORY, \ NOFLATTEN, UTORRENT_PASSWORD, UTORRENT_USER, UTORRENT_WEB_UI, DELUGEHOST, DELUGEPORT, DELUGEUSR, DELUGEPWD, VLEVEL, \ - TRANSMISSIONHOST, TRANSMISSIONPORT, TRANSMISSIONPWD, TRANSMISSIONUSR, COMPRESSEDCONTAINER, MEDIACONTAINER, \ + TRANSMISSION_HOST, TRANSMISSIONPORT, TRANSMISSIONPWD, TRANSMISSIONUSR, 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, \ @@ -410,7 +410,7 @@ def initialize(section=None): UTORRENT_USER = CFG['Torrent']['uTorrentUSR'] # mysecretusr UTORRENT_PASSWORD = CFG['Torrent']['uTorrentPWD'] # mysecretpwr - TRANSMISSIONHOST = CFG['Torrent']['TransmissionHost'] # localhost + TRANSMISSION_HOST = CFG['Torrent']['TransmissionHost'] # localhost TRANSMISSIONPORT = int(CFG['Torrent']['TransmissionPort']) TRANSMISSIONUSR = CFG['Torrent']['TransmissionUSR'] # mysecretusr TRANSMISSIONPWD = CFG['Torrent']['TransmissionPWD'] # mysecretpwr diff --git a/core/utils/torrents.py b/core/utils/torrents.py index b471a297..21e954b5 100644 --- a/core/utils/torrents.py +++ b/core/utils/torrents.py @@ -23,8 +23,8 @@ def create_torrent_class(client_agent): if client_agent == 'transmission': try: logger.debug('Connecting to {0}: http://{1}:{2}'.format( - client_agent, core.TRANSMISSIONHOST, core.TRANSMISSIONPORT)) - tc = TransmissionClient(core.TRANSMISSIONHOST, core.TRANSMISSIONPORT, + client_agent, core.TRANSMISSION_HOST, core.TRANSMISSIONPORT)) + tc = TransmissionClient(core.TRANSMISSION_HOST, core.TRANSMISSIONPORT, core.TRANSMISSIONUSR, core.TRANSMISSIONPWD) except Exception: