From f7575931465a078f76714361043da3c49b3029c9 Mon Sep 17 00:00:00 2001
From: Marcos Pinto <markybob@dipconsultants.com>
Date: Tue, 29 Jan 2008 06:58:23 +0000
Subject: [PATCH] add dht nodes to status bar

---
 deluge/core/core.py           |   7 +++++++
 deluge/data/pixmaps/dht16.png | Bin 0 -> 607 bytes
 deluge/data/revision          |   1 +
 deluge/ui/client.py           |   3 +++
 deluge/ui/gtkui/statusbar.py  |  15 +++++++++++++++
 5 files changed, 26 insertions(+)
 create mode 100644 deluge/data/pixmaps/dht16.png

diff --git a/deluge/core/core.py b/deluge/core/core.py
index 1d124e2ff..b830b0a39 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -443,6 +443,10 @@ class Core(
         """Returns the current number of connections"""
         return self.session.num_connections()
     
+    def export_get_dht_nodes(self):
+        """Returns the number of dht nodes"""
+        return self.session.status().dht_nodes
+
     def export_get_download_rate(self):
         """Returns the payload download rate"""
         return self.session.status().payload_download_rate
@@ -568,6 +572,9 @@ class Core(
         log.debug("dht value set to %s", value)
         if value:
             self.session.start_dht(None)
+            self.session.add_dht_router("router.bittorrent.com", 6881)
+            self.session.add_dht_router("router.utorrent.com", 6881)
+            self.session.add_dht_router("router.bitcomet.com", 6881)
         else:
             self.session.stop_dht()
     
diff --git a/deluge/data/pixmaps/dht16.png b/deluge/data/pixmaps/dht16.png
new file mode 100644
index 0000000000000000000000000000000000000000..be59e5e61d3887445f2bc094dc230348a6539582
GIT binary patch
literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq000jF000mO1^@s6$yOx<00004b3#c}2nYxW
zd<bNS00009a7bBm0001)0001)0dS9Cd;kCd8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10o+MMK~yM_b&@e?6JZ#JpZ|;sRk2VM5eqhhEf@#wqJmN@wTdWG
z$qfbDfN-E=ic1R>qz*w7TpSVv)2#$V^iCnD&_Pt_)}A;NBPd7<;!vVkTJt(wPOkC%
zrtf?I|M@<6d5t8(D)^aRAP*b?YQW8Gs{DlilnLR2pV<%013Mz`0?uSp<(F}=73r_E
zfB*)#78N|t>kRuuMBf>=T@AH2p$_0R(BpaD3t%vM`B@zN{p*ic#+YNZTJ1W})078*
zlYil{L({V#=azE7TBv>dyfV|VZ+lMC+hj6XjqLmh%p-|(QRcwF*dWlBUl`q;Ul{H0
zy^uT$v;(IkAqm%Y`&`$Za$Pqi36n1B1TYPB0X|??96lIh`XtR7V>*F7lIH9Z7SL94
zs6*iPWD^8P0oe_PNne2a#k<QBz$akYF7d!Fu`2=WZSkmeCSBAvU@9VA1(qy=M1?V1
z2kym~J`$%HN!TU22<(4)^mt|k7+G8WeQER7P0xXc@7|P81CLwavWaFJpx|f5f!h)3
z&W*z}k1pT;H3^&}NZleZWbtneM+Y@D+*n_IUvW4ObOZfBcg4X^#K2YHU^p1dR3+5`
tDh`XytH8!=hm`}i07C?ky%qBZfIqFOsk~e}bm{;A002ovPDHLkV1frL{xkpp

literal 0
HcmV?d00001

diff --git a/deluge/data/revision b/deluge/data/revision
index e69de29bb..31eb8b45f 100644
--- a/deluge/data/revision
+++ b/deluge/data/revision
@@ -0,0 +1 @@
+2679
\ No newline at end of file
diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index f20887438..e67ef7380 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -393,6 +393,9 @@ def get_upload_rate(callback):
 def get_num_connections(callback):
     get_core().call("get_num_connections", callback)
 
+def get_dht_nodes(callback):
+    get_core().call("get_dht_nodes", callback)
+
 def enable_plugin(plugin):
     get_core().call("enable_plugin", None, plugin)
             
diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py
index cacaedc07..6fe7ff926 100644
--- a/deluge/ui/gtkui/statusbar.py
+++ b/deluge/ui/gtkui/statusbar.py
@@ -104,6 +104,7 @@ class StatusBar(component.Component):
         self.download_rate = 0.0
         self.max_upload_speed = -1.0
         self.upload_rate = 0.0
+        self.dht_nodes = 0
         
         self.config_value_changed_dict = {
             "max_connections_global": self._on_max_connections_global,
@@ -138,6 +139,10 @@ class StatusBar(component.Component):
             image=deluge.common.get_pixmap("seeding16.png"))
         self.hbox.pack_start(
             self.upload_item.get_eventbox(), expand=False, fill=False)
+        self.dht_item = StatusBarItem(
+            image=deluge.common.get_pixmap("dht16.png"))
+        self.hbox.pack_start(
+            self.dht_item.get_eventbox(), expand=False, fill=False)
 
         # Get some config values
         client.get_config_value(
@@ -153,6 +158,7 @@ class StatusBar(component.Component):
         # When stopped, we just show the not connected thingy
         try:
             self.remove_item(self.connections_item)
+            self.remove_item(self.dht_item)
             self.remove_item(self.download_item)
             self.remove_item(self.upload_item)
             self.remove_item(self.not_connected_item)
@@ -187,6 +193,7 @@ class StatusBar(component.Component):
     def send_status_request(self):
         # Sends an async request for data from the core
         client.get_num_connections(self._on_get_num_connections)
+        client.get_dht_nodes(self._on_get_dht_nodes)
         client.get_download_rate(self._on_get_download_rate)
         client.get_upload_rate(self._on_get_upload_rate)
 
@@ -204,6 +211,9 @@ class StatusBar(component.Component):
     def _on_get_num_connections(self, num_connections):
         self.num_connections = num_connections
         
+    def _on_get_dht_nodes(self, dht_nodes):
+        self.dht_nodes = dht_nodes
+        
     def _on_max_download_speed(self, max_download_speed):
         self.max_download_speed = max_download_speed
         self.update_download_label()
@@ -227,6 +237,10 @@ class StatusBar(component.Component):
         self.connections_item.set_text("%s (%s)" % (
             self.num_connections, max_connections))
             
+    def update_dht_label(self):
+        # Set the max connections label
+        self.dht_item.set_text("%s" % (self.dht_nodes))
+            
     def update_download_label(self):
         # Set the download speed label
         max_download_speed = self.max_download_speed
@@ -253,6 +267,7 @@ class StatusBar(component.Component):
     def update(self):
         # Update the labels
         self.update_connections_label()
+        self.update_dht_label()
         self.update_download_label()
         self.update_upload_label()