codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-19 22:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[#2922] Fix proxy settings and torrent status for lt 1.1

Browse Source
This commit is contained in:
Calum Lind 2016-11-05 15:49:39 +00:00
parent 0890cc1a33
commit fd80ed75fe
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
deluge/core/preferencesmanager.py
View File

@ -391,19 +391,23 @@ class PreferencesManager(component.Component):
def _on_set_proxy(self, key, value): def _on_set_proxy(self, key, value):
try: try:
if key == 'i2p_proxy': if key == 'i2p_proxy' or value['type'] == 6:
self.session.apply_settings('proxy_type', lt.proxy_type('i2p_proxy')) proxy_settings = {
self.session.apply_settings('i2p_hostname', value['hostname']) 'proxy_type': lt.proxy_type.i2p_proxy,
self.session.apply_settings('i2p_port', value['port']) 'i2p_hostname': value['hostname'],
'i2p_port': value['port']
}
else: else:
self.session.apply_settings('proxy_type', lt.proxy_type(value['type'])) proxy_settings = {
self.session.apply_settings('proxy_hostname', value['hostname']) 'proxy_type': value['type'],
self.session.apply_settings('proxy_port', value['port']) 'proxy_hostname': value['hostname'],
self.session.apply_settings('proxy_username', value['username']) 'proxy_port': value['port'],
self.session.apply_settings('proxy_password', value['password']) 'proxy_username': value['username'],
self.session.apply_settings('proxy_hostnames', value['proxy_hostnames']) 'proxy_password': value['password'],
self.session.apply_settings('proxy_peer_connections', value['proxy_peer_connections']) 'proxy_hostnames': value['proxy_hostnames'],
self.session.apply_settings('proxy_tracker_connections', value['proxy_tracker_connections']) 'proxy_peer_connections': value['proxy_peer_connections'],
}
self.session.apply_settings(proxy_settings)
except AttributeError: except AttributeError:
proxy_settings = lt.proxy_settings() proxy_settings = lt.proxy_settings()
proxy_settings.hostname = value['hostname'] proxy_settings.hostname = value['hostname']

2
deluge/core/torrent.py
View File

@ -624,7 +624,7 @@ class Torrent(object):
old_state = self.state old_state = self.state
self.set_status_message() self.set_status_message()
try: try:
status_error = status.errc status_error = status.errc.message() if status.errc.value() else ''
except AttributeError: except AttributeError:
# Deprecated in libtorrent 1.1 # Deprecated in libtorrent 1.1
status_error = status.error status_error = status.error