diff --git a/core/__init__.py b/core/__init__.py index 203b507a..874632b8 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -162,7 +162,7 @@ TRANSMISSION_PASSWORD = None DELUGE_HOST = None DELUGE_PORT = None DELUGE_USER = None -DELUGEPWD = None +DELUGE_PASSWORD = None QBITTORRENTHOST = None QBITTORRENTPORT = None @@ -256,7 +256,7 @@ def initialize(section=None): NZBTOMEDIA_TIMEOUT, FORKS, FORK_DEFAULT, FORK_FAILED_TORRENT, FORK_FAILED, NOEXTRACTFAILED, SHOWEXTRACT, \ 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, DELUGE_HOST, DELUGE_PORT, DELUGE_USER, DELUGEPWD, VLEVEL, \ + NOFLATTEN, UTORRENT_PASSWORD, UTORRENT_USER, UTORRENT_WEB_UI, DELUGE_HOST, DELUGE_PORT, DELUGE_USER, DELUGE_PASSWORD, VLEVEL, \ 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, \ @@ -418,7 +418,7 @@ def initialize(section=None): DELUGE_HOST = CFG['Torrent']['DelugeHost'] # localhost DELUGE_PORT = int(CFG['Torrent']['DelugePort']) # 8084 DELUGE_USER = CFG['Torrent']['DelugeUSR'] # mysecretusr - DELUGEPWD = CFG['Torrent']['DelugePWD'] # mysecretpwr + DELUGE_PASSWORD = CFG['Torrent']['DelugePWD'] # mysecretpwr QBITTORRENTHOST = CFG['Torrent']['qBittorrenHost'] # localhost QBITTORRENTPORT = int(CFG['Torrent']['qBittorrentPort']) # 8080 diff --git a/core/utils/torrents.py b/core/utils/torrents.py index 1138b952..867df7ee 100644 --- a/core/utils/torrents.py +++ b/core/utils/torrents.py @@ -35,7 +35,7 @@ def create_torrent_class(client_agent): logger.debug('Connecting to {0}: http://{1}:{2}'.format(client_agent, core.DELUGE_HOST, core.DELUGE_PORT)) tc = DelugeClient() tc.connect(host=core.DELUGE_HOST, port=core.DELUGE_PORT, username=core.DELUGE_USER, - password=core.DELUGEPWD) + password=core.DELUGE_PASSWORD) except Exception: logger.error('Failed to connect to Deluge')