mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[GTK] Refactor AddTorrent dialog update config scoping

Browse source 
- Fix a potential scoping issue with callback function by moving to
class method and adding requried parameters.
- Remove unneeded return statements and variable.
This commit is contained in:
Calum Lind 2018-09-26 11:04:49 +01:00
commit a09334e116
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
deluge/ui/gtkui/addtorrentdialog.py
View file

@ -140,7 +140,7 @@ class AddTorrentDialog(component.Component):
self.update_core_config() self.update_core_config()
def show(self, focus=False): def show(self, focus=False):
return self.update_core_config(True, focus) self.update_core_config(True, focus)
def _show(self, focus=False): def _show(self, focus=False):
if component.get('MainWindow').is_on_active_workspace(): if component.get('MainWindow').is_on_active_workspace():
@ -152,8 +152,6 @@ class AddTorrentDialog(component.Component):
if focus: if focus:
self.dialog.window.focus() self.dialog.window.focus()
return None
def hide(self): def hide(self):
self.dialog.hide() self.dialog.hide()
self.files = {} self.files = {}
@ -163,18 +161,18 @@ class AddTorrentDialog(component.Component):
self.torrent_liststore.clear() self.torrent_liststore.clear()
self.files_treestore.clear() self.files_treestore.clear()
self.dialog.set_transient_for(component.get('MainWindow').window) self.dialog.set_transient_for(component.get('MainWindow').window)
return None
def _on_config_values(self, config, show=False, focus=False):
self.core_config = config
if self.core_config:
self.set_default_options()
if show:
self._show(focus)
def update_core_config(self, show=False, focus=False): def update_core_config(self, show=False, focus=False):
def _on_config_values(config):
self.core_config = config
if self.core_config:
self.set_default_options()
if show:
self._show(focus)
# Send requests to the core for these config values # Send requests to the core for these config values
return client.core.get_config_values(self.core_keys).addCallback(_on_config_values) d = client.core.get_config_values(self.core_keys)
d.addCallback(self._on_config_values, show, focus)
def _add_torrent_liststore( def _add_torrent_liststore(
self, info_hash, name, filename, files, filedata, self, info_hash, name, filename, files, filedata,
@ -212,7 +210,6 @@ class AddTorrentDialog(component.Component):
).run() ).run()
def add_from_files(self, filenames): def add_from_files(self, filenames):
new_row = None
already_added = 0 already_added = 0
for filename in filenames: for filename in filenames: