diff --git a/core/__init__.py b/core/__init__.py index 7794fa14..21daaffc 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -155,7 +155,7 @@ UTORRENT_USER = None UTORRENT_PASSWORD = None TRANSMISSION_HOST = None -TRANSMISSIONPORT = None +TRANSMISSION_PORT = 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, \ - TRANSMISSION_HOST, TRANSMISSIONPORT, TRANSMISSIONPWD, TRANSMISSIONUSR, COMPRESSEDCONTAINER, MEDIACONTAINER, \ + TRANSMISSION_HOST, TRANSMISSION_PORT, 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, \ @@ -411,7 +411,7 @@ def initialize(section=None): UTORRENT_PASSWORD = CFG['Torrent']['uTorrentPWD'] # mysecretpwr TRANSMISSION_HOST = CFG['Torrent']['TransmissionHost'] # localhost - TRANSMISSIONPORT = int(CFG['Torrent']['TransmissionPort']) + TRANSMISSION_PORT = 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 21e954b5..5d885495 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.TRANSMISSION_HOST, core.TRANSMISSIONPORT)) - tc = TransmissionClient(core.TRANSMISSION_HOST, core.TRANSMISSIONPORT, + client_agent, core.TRANSMISSION_HOST, core.TRANSMISSION_PORT)) + tc = TransmissionClient(core.TRANSMISSION_HOST, core.TRANSMISSION_PORT, core.TRANSMISSIONUSR, core.TRANSMISSIONPWD) except Exception: