webui rev 57

plugins/WebUi/__init__.py

@@ -100,7 +100,7 @@ class plugin_WebUi:
 
 
         if not dbus_manager:
-            self.dbusManager = DbusManager(deluge_core, deluge_interface
+            dbus_manager = self.dbusManager = DbusManager(deluge_core, deluge_interface
                 , self.config, self.config_file)
 
         self.dbus_manager  = dbus_manager

plugins/WebUi/dbus_interface.py

@@ -89,7 +89,7 @@ class DbusManager(dbus.service.Object):
             "name": state["name"],
             "total_size": state["total_size"],
             "num_pieces": state["num_pieces"],
-            #"state": int(status.state), #?
+            "state": state['state'],
             "paused": self.core.is_user_paused(torrent_id),
             "progress": int(state["progress"] * 100),
             "next_announce": state["next_announce"],

plugins/WebUi/deluge_webserver.py

@@ -166,7 +166,7 @@ torrent_keys = ['distributed_copies', 'download_payload_rate',
     'total_payload_download', 'total_payload_upload', 'total_peers',
     'total_seeds', 'total_size', 'total_upload', 'total_wanted',
     'tracker_status', 'upload_payload_rate', 'upload_rate',
-    'uploaded_memory','tracker']
+    'uploaded_memory','tracker','state']
 
 def get_torrent_status(torrent_id):
     """
@@ -189,6 +189,8 @@ def get_torrent_status(torrent_id):
     else:
         status["action"] = "stop"
 
+    status["message"] +=  str(status["state"])
+
     #add some pre-calculated values
     status.update({
         "calc_total_downloaded"  : (common.fsize(status["total_done"])
@@ -429,7 +431,6 @@ class about:
     def GET(self, name):
         return render.about()
 
-
 #/pages
 
 if __name__ == "__main__":

plugins/WebUi/revno

@@ -1 +1 @@
-56
+57

plugins/WebUi/version

@@ -1,5 +1,5 @@
-revision-id: mvoncken@gmail.com-20070929213431-0iftu3c3jnmj9lr5
-date: 2007-09-29 23:34:31 +0200
-build-date: 2007-09-29 23:34:36 +0200
-revno: 56
+revision-id: mvoncken@gmail.com-20070930083408-sv8mo0mi1rbjnfvk
+date: 2007-09-30 10:34:08 +0200
+build-date: 2007-09-30 10:34:50 +0200
+revno: 57
 branch-nick: WebUi