dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[rtorrent] cleaned up connection, '+https' is now added to 'httprpc' protocol if SSL option is enabled

Browse Source
This commit is contained in:
Dean Gardiner
2014-03-22 02:37:58 +13:00
parent 8bdbf8df2e
commit 28062eacb6
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/downloaders/rtorrent_.py
+12 -8
View File
@@ -59,20 +59,24 @@ class rTorrent(Downloader):
return self.rt return self.rt
url = cleanHost(self.conf('host'), protocol = True, ssl = self.conf('ssl')) url = cleanHost(self.conf('host'), protocol = True, ssl = self.conf('ssl'))
# Automatically add '+https' to 'httprpc' protocol if SSL is enabled
if self.conf('ssl') and url.startswith('httprpc://'):
url = url.replace('httprpc://', 'httprpc+https://')
parsed = urlparse(url) parsed = urlparse(url)
# rpc_url is only used on http/https scgi pass-through # rpc_url is only used on http/https scgi pass-through
if parsed.scheme in ['http', 'https']: if parsed.scheme in ['http', 'https']:
url += self.conf('rpc_url') url += self.conf('rpc_url')
if self.conf('username') and self.conf('password'): print url
self.rt = RTorrent(
url, self.rt = RTorrent(
self.conf('username'), url,
self.conf('password') self.conf('username'),
) self.conf('password')
else: )
self.rt = RTorrent(url)
self.error_msg = '' self.error_msg = ''
try: try: