Merge lp:~fresh13/dockmanager/deluge_helper into lp:dockmanager

[Igor Gevka]

Updated deluge helper to work with new deluge api (1.2+), added Pause All/Resume All helper context menu items and made helper display only bandwiths over 5kbps (so when deluge runs with no active downloads, overhead bandwidths of 1-2kbps do not pop up on the badge.

Updated deluge helper to work with new deluge api (1.2+), added Pause All/Resume All helper context menu items and made helper display only bandwiths over 5kbps (so when deluge runs with no active downloads, overhead bandwidths of 1-2kbps do not pop up on the badge.

Deluge version 1.2 (from jan 10, 2010) changed deluge API considerably, and deluge helper stopped working (bug#507184 https://bugs.launchpad.net/docky/+bug/507184). Based on the work of launchpad user Cas, I have released a patch that later got featured on OMGUbuntu: http://www.omgubuntu.co.uk/2010/10/deluge-docky-helper-fix-working/

Somebody in the comments suggested that the patch gets proposed into dockmanager trunk, so (after 4 months) I finally got my hands into this issue, patched the original helper (before it was a standalone helper called deluge 1.2) and am now committing it to launchpad.

=== modified file 'metadata/deluge_badge.py.info'
--- metadata/deluge_badge.py.info	2010-06-05 13:03:27 +0000
+++ metadata/deluge_badge.py.info	2011-02-24 23:12:49 +0000
@@ -1,5 +1,5 @@
 [DockmanagerHelper]
 Name=Deluge
-Description=Show transfer rates
+Description=Show transfer rates and Pause All/Resume All buttons. You have to run deluge daemonized: sudo apt-get install deluged && deluged
 Icon=deluge
 AppName=deluge

=== modified file 'scripts/deluge_badge.py'
--- scripts/deluge_badge.py	2010-08-06 23:14:20 +0000
+++ scripts/deluge_badge.py	2011-02-24 23:12:49 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #  
-#  Copyright (C) 2010 Rico Tzschichholz, Robert Dyer
+#  Copyright (C) 2010 Rico Tzschichholz, Robert Dyer, Igor Gevka
 # 
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,24 +18,59 @@
 #
 
 import atexit
-import gobject
-import dbus
-import dbus.glib
-import glib
-import sys
-import os
-import math
+
+from twisted.internet import glib2reactor # for gtk-2.0
+glib2reactor.install()
 
 try:
-	from deluge.ui.client import sclient
+	from deluge.ui.client import client
+	from twisted.internet import reactor
 	from dockmanager.dockmanager import DockManagerItem, DockManagerSink, DOCKITEM_IFACE
 	from signal import signal, SIGTERM
 	from sys import exit
+	from gobject import timeout_add
 except ImportError, e:
 	print e
 	exit()
 
-ShowUploadRate = False
+debugConnections = False
+showRateOver = 5000
+rate = 0
+
+delugeDaemon = None
+
+def daemon_disconnect_callback():
+	if debugConnections:	
+		print "Disconnected from deluge daemon. Will try to reconnect."
+	ConnectToDaemon()
+
+def ConnectToDaemon():
+	global delugeDaemon	
+	host="localhost"
+	port=58846
+	user=""
+	password=""
+	client.set_disconnect_callback(daemon_disconnect_callback)
+	if debugConnections:
+		print "Connecting to deluge daemon..."
+	delugeDaemon = client.connect(host, port, user, password)
+
+ConnectToDaemon()
+
+def on_connect_success(result):
+	def on_get_config_value(value, key):
+		global rate
+		rate=value[key]
+	client.core.get_session_status(["download_rate"]).addCallback(on_get_config_value,"download_rate")
+
+def on_connect_fail(result):
+	if debugConnections:	
+		print "Connection failed with result ", result, ", reconnecting."
+	global rate
+	rate = 0
+	ConnectToDaemon()
+	return False
+
 
 
 def bytes2ratestr(bytes):
@@ -57,30 +92,46 @@
 		DockManagerItem.__init__(self, sink, path)
 		
 		self.timer = 0
-		
-		sclient.set_core_uri()
-	
+
 		if not self.timer > 0:
-			self.timer = gobject.timeout_add (2000, self.update_badge)
+			self.timer = timeout_add (2000, self.update_badge)
+
+		self.set_menu_buttons()
 
 	def update_badge(self):
-		rate = 0
+		global delugeDaemon
+		global rate		
 		try:
-			if ShowUploadRate:
-				rate = round(sclient.get_upload_rate())
-			else:	
-				rate = round(sclient.get_download_rate())
-	
-			if rate > 0:
-				self.set_badge("%s" % bytes2ratestr(rate))
+			delugeDaemon.addCallback(on_connect_success)
+			delugeDaemon.addErrback(on_connect_fail)
+
+			if rate > showRateOver:
+				self.set_badge("%s" % bytes2ratestr(round(rate)))
 			else:
 				self.reset_badge()
 			return True
 		except Exception, e:
-			print e
+			print "Deluge badge exception:", e
 			self.reset_badge()
 			return False
 	
+	def clear_menu_buttons(self):
+		for k in self.id_map.keys():
+			self.remove_menu_item(k)
+	
+	def set_menu_buttons(self):
+		self.clear_menu_buttons()
+		
+		self.add_menu_item("Pause All", "media-playback-pause")
+		self.add_menu_item("Resume All", "media-playback-start")
+
+	def menu_pressed(self, menu_id):
+		
+		if self.id_map[menu_id] == "Pause All":
+			client.core.pause_all_torrents()
+		elif self.id_map[menu_id] == "Resume All":
+			client.core.resume_all_torrents()
+
 
 class DelugeSink(DockManagerSink):
 	def item_path_found(self, pathtoitem, item):
@@ -93,9 +144,7 @@
 	delugesink.dispose ()
 
 if __name__ == "__main__":
-	mainloop = gobject.MainLoop(is_running=True)
-
 	atexit.register (cleanup)
 	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
-	mainloop.run()
+	reactor.run()
+