More work on network devices, getting there

4 files changed, 128 insertions, 48 deletions

diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py
index 8fd74b2..199dd83 100644
--- a/shell/model/MeshModel.py
+++ b/shell/model/MeshModel.py
@@ -20,47 +20,9 @@ from sugar.graphics.xocolor import XoColor
 from sugar.presence import PresenceService
 from sugar.activity import bundleregistry
 from model.BuddyModel import BuddyModel
+from model.accesspointmodel import AccessPointModel
 from hardware import hardwaremanager
 
-class AccessPointModel(gobject.GObject):
-    __gproperties__ = {
-        'name'     : (str, None, None, None,
-                      gobject.PARAM_READABLE),
-        'strength' : (int, None, None, 0, 100, 0,
-                      gobject.PARAM_READABLE)
-    }
-
-    def __init__(self, nm_device, nm_network):
-        gobject.GObject.__init__(self)
-        self._nm_network = nm_network
-        self._nm_device = nm_device
-
-        self._nm_network.connect('strength-changed',
-                                 self._strength_changed_cb)
-        self._nm_network.connect('ssid-changed',
-                                 self._essid_changed_cb)
-
-    def _strength_changed_cb(self, nm_network):
-        self.notify('strength')
-
-    def _essid_changed_cb(self, nm_network):
-        self.notify('name')
-
-    def get_id(self):
-        return self._nm_network.get_op()
-
-    def get_nm_device(self):
-        return self._nm_device
-
-    def get_nm_network(self):
-        return self._nm_network
-
-    def do_get_property(self, pspec):
-        if pspec.name == 'strength':
-            return self._nm_network.get_strength()
-        elif pspec.name == 'name':
-            return self._nm_network.get_ssid()
-
 class ActivityModel:
     def __init__(self, activity, bundle, service):
         self._service = service
diff --git a/shell/model/accesspointmodel.py b/shell/model/accesspointmodel.py
new file mode 100644
index 0000000..02899c0
--- /dev/null
+++ b/shell/model/accesspointmodel.py
@@ -0,0 +1,78 @@
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import gobject
+
+from hardware import nmclient
+
+STATE_CONNECTING   = 0
+STATE_CONNECTED    = 1
+STATE_NOTCONNECTED = 2
+
+_nm_state_to_state = {
+    nmclient.NETWORK_STATE_CONNECTED    : STATE_CONNECTED,
+    nmclient.NETWORK_STATE_CONNECTING   : STATE_CONNECTING,
+    nmclient.NETWORK_STATE_NOTCONNECTED : STATE_NOTCONNECTED
+}
+
+class AccessPointModel(gobject.GObject):
+    __gproperties__ = {
+        'name'     : (str, None, None, None,
+                      gobject.PARAM_READABLE),
+        'strength' : (int, None, None, 0, 100, 0,
+                      gobject.PARAM_READABLE),
+        'state'    : (int, None, None, STATE_CONNECTING,
+                      STATE_NOTCONNECTED, 0, gobject.PARAM_READABLE)
+    }
+
+    def __init__(self, nm_device, nm_network):
+        gobject.GObject.__init__(self)
+        self._nm_network = nm_network
+        self._nm_device = nm_device
+
+        self._nm_network.connect('strength-changed',
+                                 self._strength_changed_cb)
+        self._nm_network.connect('ssid-changed',
+                                 self._ssid_changed_cb)
+        self._nm_network.connect('state-changed',
+                                 self._state_changed_cb)
+
+    def _strength_changed_cb(self, nm_network):
+        self.notify('strength')
+
+    def _ssid_changed_cb(self, nm_network):
+        self.notify('name')
+
+    def _state_changed_cb(self, nm_network):
+        self.notify('state')
+
+    def get_id(self):
+        return self._nm_network.get_op()
+
+    def get_nm_device(self):
+        return self._nm_device
+
+    def get_nm_network(self):
+        return self._nm_network
+
+    def do_get_property(self, pspec):
+        if pspec.name == 'strength':
+            return self._nm_network.get_strength()
+        elif pspec.name == 'name':
+            return self._nm_network.get_ssid()
+        elif pspec.name == 'state':
+            nm_state = self._nm_device.get_state()
+            return _nm_state_to_state[nm_state]
diff --git a/shell/model/devices/devicesmodel.py b/shell/model/devices/devicesmodel.py
index dd53596..92332d2 100644
--- a/shell/model/devices/devicesmodel.py
+++ b/shell/model/devices/devicesmodel.py
@@ -42,8 +42,9 @@ class DevicesModel(gobject.GObject):
     def _network_device_removed_cb(self, nm_device):
         self._remove_network_device(nm_device)
 
-    def _network_device_deactivated_cb(self, nm_device):
-        self._remove_network_device(nm_device)
+    def _network_device_state_changed_cb(self, nm_device):
+        if nm_device.get_state == nmclient.DEVICE_STATE_INACTIVE:
+            self._remove_network_device(nm_device)
 
     def _check_network_device(self, nm_device):
         if not nm_device.is_valid():
@@ -57,8 +58,8 @@ class DevicesModel(gobject.GObject):
 
     def _add_network_device(self, nm_device):
         self.add_device(wirelessnetwork.Device(nm_device))
-        nm_device.connect('deactivated',
-                            self._network_device_deactivated_cb)
+        nm_device.connect('state-changed',
+                          self._network_device_state_changed_cb)
 
     def _remove_network_device(self, nm_device):
         self.remove_device(self._get_network_device(nm_device))
diff --git a/shell/model/devices/wirelessnetwork.py b/shell/model/devices/wirelessnetwork.py
index a364827..50793b5 100644
--- a/shell/model/devices/wirelessnetwork.py
+++ b/shell/model/devices/wirelessnetwork.py
@@ -1,13 +1,43 @@
+#
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 import gobject
 
 from model.devices import device
+from hardware import nmclient
+
+STATE_ACTIVATING = 0
+STATE_ACTIVATED  = 1
+STATE_INACTIVE   = 2
+
+_nm_state_to_state = {
+    nmclient.DEVICE_STATE_ACTIVATING : STATE_ACTIVATING,
+    nmclient.DEVICE_STATE_ACTIVATED  : STATE_ACTIVATED,
+    nmclient.DEVICE_STATE_INACTIVE   : STATE_INACTIVE
+}
 
 class Device(device.Device):
     __gproperties__ = {
         'name'     : (str, None, None, None,
                       gobject.PARAM_READABLE),
         'strength' : (int, None, None, 0, 100, 0,
-                      gobject.PARAM_READABLE)
+                      gobject.PARAM_READABLE),
+        'state'    : (int, None, None, STATE_ACTIVATING,
+                      STATE_INACTIVE, 0, gobject.PARAM_READABLE)
     }
 
     def __init__(self, nm_device):
@@ -16,19 +46,28 @@ class Device(device.Device):
 
         self._nm_device.connect('strength-changed',
                                 self._strength_changed_cb)
+        self._nm_device.connect('ssid-changed',
+                                self._ssid_changed_cb)
+        self._nm_device.connect('state-changed',
+                                self._state_changed_cb)
 
-    def _strength_changed_cb(self, nm_device, strength):
+    def _strength_changed_cb(self, nm_device):
         self.notify('strength')
 
-    def _essid_changed_cb(self, nm_device):
+    def _ssid_changed_cb(self, nm_device):
         self.notify('name')
 
+    def _state_changed_cb(self, nm_device):
+        self.notify('state')
+
     def do_get_property(self, pspec):
         if pspec.name == 'strength':
             return self._nm_device.get_strength()
         elif pspec.name == 'name':
-            # FIXME
-            return None
+            return self._nm_device.get_ssid()
+        elif pspec.name == 'state':
+            nm_state = self._nm_device.get_state()
+            return _nm_state_to_state[nm_state]
 
     def get_type(self):
         return 'wirelessnetwork'