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

PEP-8 and some clean up in the Peers tab plugin.

Browse source
This commit is contained in:
Alex Dedul 2007-08-06 03:52:16 +00:00
commit 9d17d21804
2 changed files with 42 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

60
plugins/TorrentPeers/__init__.py
View file

@ -40,7 +40,6 @@ class TorrentPeers:
def __init__(self, path, core, interface): def __init__(self, path, core, interface):
print "Loading TorrentPeers plugin..." print "Loading TorrentPeers plugin..."
self.manager = core
self.parent = interface self.parent = interface
self.config_file = deluge.common.CONFIG_DIR + "/peers.conf" self.config_file = deluge.common.CONFIG_DIR + "/peers.conf"
self.config = deluge.pref.Preferences(self.config_file) self.config = deluge.pref.Preferences(self.config_file)
@ -57,30 +56,27 @@ class TorrentPeers:
'on_button_cancel_pressed': self.cancel_pressed, 'on_button_cancel_pressed': self.cancel_pressed,
'on_button_ok_pressed': self.ok_pressed 'on_button_ok_pressed': self.ok_pressed
}) })
treeView = gtk.TreeView() tree_view = gtk.TreeView()
scrolledWindow = gtk.ScrolledWindow() scrolled_window = gtk.ScrolledWindow()
scrolledWindow.add(treeView) scrolled_window.add(tree_view)
scrolledWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.top_widget = scrolled_window
self.topWidget = scrolledWindow self.parent_notebook = self.parent.notebook
self.parent_notebook.append_page(self.top_widget,
gtk.Label(_("Peers")))
self.parentNotebook = self.parent.notebook tree_view.show()
scrolled_window.show()
self.parentNotebook.append_page(self.topWidget, gtk.Label(_("Peers"))) self.tab_peers = PeersTabManager(tree_view, core)
treeView.show()
scrolledWindow.show()
self.tab_peers = PeersTabManager(treeView, self.manager)
self.rebuild_view = False
self.update_config() self.update_config()
self.tab_peers.build_peers_view() self.tab_peers.build_peers_view()
def unload(self): def unload(self):
self.tab_peers.clear_peer_store() self.tab_peers.clear_peer_store()
numPages = self.parentNotebook.get_n_pages() tab_page = self.parent_notebook.page_num(self.top_widget)
for page in xrange(numPages): self.parent_notebook.remove_page(tab_page)
if self.parentNotebook.get_nth_page(page) == self.topWidget:
self.parentNotebook.remove_page(page)
break
self.config.save(self.config_file) self.config.save(self.config_file)
def configure(self, window): def configure(self, window):
@ -108,7 +104,7 @@ class TorrentPeers:
self.dialog.set_transient_for(window) self.dialog.set_transient_for(window)
self.dialog.show() self.dialog.show()
def update_config(self, rebuild_view=False): def update_config(self):
if self.config.get("enable_flags"): if self.config.get("enable_flags"):
self.tab_peers.enable_flags() self.tab_peers.enable_flags()
if self.config.get("size_18"): if self.config.get("size_18"):
@ -121,7 +117,6 @@ class TorrentPeers:
self.tab_peers.set_flag_size("25x15") self.tab_peers.set_flag_size("25x15")
else: else:
self.tab_peers.disable_flags() self.tab_peers.disable_flags()
self.rebuild_view = rebuild_view
def toggle_ui(self, widget): def toggle_ui(self, widget):
@ -138,37 +133,34 @@ class TorrentPeers:
def update(self): def update(self):
if not self.parent.update_interface: if not self.parent.update_interface:
return return
numPages = self.parentNotebook.get_n_pages()
for page in xrange(numPages): tab_page = self.parent_notebook.page_num(self.top_widget)
if self.parentNotebook.get_nth_page(page) == self.topWidget: current_page = self.parent_notebook.get_current_page()
if tab_page == current_page:
unique_id = self.parent.get_selected_torrent() unique_id = self.parent.get_selected_torrent()
if unique_id is None: if unique_id is None:
#if no torrents added or more than one torrent selected #if no torrents added or more than one torrent selected
self.tab_peers.clear_peer_store() self.tab_peers.clear_peer_store()
self.tab_peers.set_unique_id(None)
return return
if self.tab_peers.peer_unique_id != unique_id: if self.tab_peers.peer_unique_id != unique_id:
self.tab_peers.clear_peer_store() self.tab_peers.clear_peer_store()
self.tab_peers.set_unique_id(unique_id) self.tab_peers.set_unique_id(unique_id)
self.tab_peers.update_peer_store() self.tab_peers.update_peer_store()
else: else:
if self.rebuild_view:
self.tab_peers.clear_peer_store()
self.tab_peers.set_unique_id(unique_id)
self.tab_peers.rebuild_peer_view(self.topWidget)
self.tab_peers.update_peer_store() self.tab_peers.update_peer_store()
self.rebuild_view = False
self.tab_peers.update_peer_store()
break
def ok_pressed(self, src): def ok_pressed(self, src):
self.dialog.hide() self.dialog.hide()
if self.config.get("enable_flags") and not self.glade.get_widget("chk_flags").get_active(): if self.config.get("enable_flags") and not \
rebuild_view = True self.glade.get_widget("chk_flags").get_active():
else: self.tab_peers.clear_peer_store()
rebuild_view = False self.tab_peers.rebuild_peer_view(self.top_widget)
self.tab_peers.update_peer_store()
self.config.set("enable_flags", self.glade.get_widget("chk_flags").get_active()) self.config.set("enable_flags", self.glade.get_widget("chk_flags").get_active())
self.config.set("size_18", self.glade.get_widget("radio_18").get_active()) self.config.set("size_18", self.glade.get_widget("radio_18").get_active())
self.update_config(rebuild_view) self.update_config()
def cancel_pressed(self, src): def cancel_pressed(self, src):
self.dialog.hide() self.dialog.hide()

6
plugins/TorrentPeers/tab_peers.py
View file

@ -27,10 +27,10 @@ class PeersTabManager(object):
def set_unique_id(self, unique_id): def set_unique_id(self, unique_id):
self.peer_unique_id = unique_id self.peer_unique_id = unique_id
def rebuild_peers_view(self, scrolledWindow): def rebuild_peers_view(self, top_widget):
self.peer_view.destroy() self.peer_view.destroy()
self.peer_view = gtk.TreeView() self.peer_view = gtk.TreeView()
scrolledWindow.add(self.peer_view) top_widget.add(self.peer_view)
def build_peers_view(self): def build_peers_view(self):
def percent(column, cell, model, iter, data): def percent(column, cell, model, iter, data):
@ -65,7 +65,7 @@ class PeersTabManager(object):
def get_country_flag_image(self, country): def get_country_flag_image(self, country):
flag_image = None flag_image = None
if country.isalpha() and self.show_flags: if self.show_flags and country.isalpha():
if country in self._cached_flags: if country in self._cached_flags:
flag_image = self._cached_flags[country] flag_image = self._cached_flags[country]
else: else: