Changeset 1ff29a

Timestamp:

02/16/2009 11:27:12 PM (16 years ago)

Author:

Damien Churchill <damoc@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

cc272d

Parents:

b6dee7

Message:

more improvements to the connection manager, ui actually starts running after a connect now.

Location:

deluge/ui/web

Files:

• js/deluge-connections.js (modified) (5 diffs)
• js/deluge-ui.js (modified) (1 diff)
• server.py (modified) (7 diffs)

deluge/ui/web/js/deluge-connections.js

@@ -2 +2 @@
     onClose: function(e) {
                 $clear(Deluge.Connections.running);
+                Deluge.Connections.Window.hide();
     },
     
     onConnect: function(e) {
+                $clear(Deluge.Connections.running);
+                Deluge.Connections.Window.hide();
+                var selected = Deluge.Connections.Grid.getSelectionModel().getSelected();
+                var id = selected.id;
+                Deluge.Client.web.connect(id, {
+                        onSuccess: function(methods) {
+                                Deluge.Client = new JSON.RPC('/json', {
+                                        methods: methods
+                                });
+                                Deluge.Ui.run();
+                        }
+                });
     },
+        
+        onSelect: function(selModel, rowIndex, record) {
+                Deluge.Connections.selectedRow = rowIndex;
+        },
         
         onShow: function(window) {
@@ -20 +37 @@
         onGetHosts: function(hosts) {
                 Deluge.Connections.Store.loadData(hosts);
+                var selection = Deluge.Connections.Grid.getSelectionModel();
+                selection.selectRow(Deluge.Connections.selectedRow);
         }
 }
@@ -29 +48 @@
                 {name: 'port', mapping: 2},
                 {name: 'version', mapping: 6}
-        ]
+        ],
+        id: 0
 });
 
@@ -45 +65 @@
         ],      
         stripeRows: true,
+        selModel: new Ext.grid.RowSelectionModel({
+                singleSelect: true,
+                listeners: {'rowselect': Deluge.Connections.onSelect}
+        }),
         autoExpandColumn: 'host',
         deferredRender:false,
@@ -70 +94 @@
     }],
         listeners: {
+                'hide': Deluge.Connections.onClose,
                 'show': Deluge.Connections.onShow
         }

deluge/ui/web/js/deluge-ui.js

@@ -68 +68 @@
                 });
                 Deluge.Torrents.store.loadData(torrents);
-                this.updateStatusBar(data['stats']);
+                //this.updateStatusBar(data['stats']);
                 this.errorCount = 0;
         },

deluge/ui/web/server.py

@@ -147 +147 @@
             "web.add_torrents": self.add_torrents,
             "web.login": self.login,
-            "web.get_hosts": self.get_hosts
+            "web.get_hosts": self.get_hosts,
+            "web.connect": self.connect
         }
         for entry in open(common.get_default_config_dir("auth")):
@@ -161 +162 @@
             self.local_password = password
     
-    def connect(self, host="localhost", port=58846, username=None, password=None):
+    def _connect(self, host="localhost", port=58846, username=None, password=None):
         """
         Connects the client to a daemon
@@ -167 +168 @@
         username = username or self.local_username
         password = password or self.local_password
-        d = client.connect(host=host, username=username, password=password)
+        d = Deferred()
+        _d = client.connect(host=host, username=username, password=password)
         
         def on_get_methods(methods):
@@ -174 +176 @@
             """
             self._remote_methods = methods
+            methods = list(self._remote_methods)
+            methods.extend(self._local_methods)
+            d.callback(methods)
         
         def on_client_connected(connection_id):
@@ -182 +187 @@
             d = client.daemon.get_method_list()
             d.addCallback(on_get_methods)
-        d.addCallback(on_client_connected)
+        _d.addCallback(on_client_connected)
+        return d
 
     def _exec_local(self, method, params):
@@ -294 +300 @@
         except Exception, e:
             return self._on_json_request_failed(e, request)
+    
+    def connect(self, host_id):
+        d = Deferred()
+        def on_connected(methods):
+            d.callback(methods)
+        for host in hostlist["hosts"]:
+            if host_id != host[0]:
+                continue
+            self._connect(*host[1:]).addCallback(on_connected)
+        return d
     
     def update_ui(self, keys, filter_dict, cache_id=None):
@@ -407 +423 @@
             
         def on_connect_failed(reason, host_id):
-            print reason
+            log.exception(reason)
             hosts[host_id][5] = _("Offline")
             run_check()