diff options
author | Dan Williams <dcbw@redhat.com> | 2007-04-05 03:48:09 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2007-04-05 03:48:09 (GMT) |
commit | 4b4cf9673c0afc7e220ff3c34023f3ce4537591a (patch) | |
tree | 255e9fcad673985edcfedf7d03998ba5e5dc53a9 /shell/model | |
parent | ba08492778261828e4411e0b8d1e4a47f21dbe52 (diff) |
Cleanup of sugar device handling code
Diffstat (limited to 'shell/model')
-rw-r--r-- | shell/model/MeshModel.py | 15 | ||||
-rw-r--r-- | shell/model/devices/device.py | 28 | ||||
-rw-r--r-- | shell/model/devices/devicesmodel.py | 50 | ||||
-rw-r--r-- | shell/model/devices/network/mesh.py | 18 | ||||
-rw-r--r-- | shell/model/devices/network/wired.py | 2 | ||||
-rw-r--r-- | shell/model/devices/network/wireless.py | 18 |
6 files changed, 80 insertions, 51 deletions
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index 74dba26..db464f9 100644 --- a/shell/model/MeshModel.py +++ b/shell/model/MeshModel.py @@ -110,7 +110,9 @@ class MeshModel(gobject.GObject): self._add_access_point(nm_device, nm_network) def _nm_network_disappeared_cb(self, nm_device, nm_network): - self._remove_access_point(nm_network) + if self._access_points.has_key(nm_network.get_op()): + ap = self._access_points[nm_network.get_op()] + self._remove_access_point(ap) def _add_network_device(self, nm_device): dtype = nm_device.get_type() @@ -138,13 +140,14 @@ class MeshModel(gobject.GObject): def _add_access_point(self, nm_device, nm_network): model = AccessPointModel(nm_device, nm_network) - self._access_points[nm_network.get_op()] = model + self._access_points[model.get_id()] = model self.emit('access-point-added', model) - def _remove_access_point(self, nm_network): - self.emit('access-point-removed', - self._access_points[nm_network.get_op()]) - del self._access_points[nm_network.get_op()] + def _remove_access_point(self, ap): + if not self._access_points.has_key(ap.get_id()): + return + self.emit('access-point-removed', ap) + del self._access_points[ap.get_id()] def get_mesh(self): return self._mesh diff --git a/shell/model/devices/device.py b/shell/model/devices/device.py index 32bee0d..815b103 100644 --- a/shell/model/devices/device.py +++ b/shell/model/devices/device.py @@ -1,7 +1,35 @@ +# +# Copyright (C) 2007, 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 from sugar import util +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(gobject.GObject): def __init__(self): gobject.GObject.__init__(self) diff --git a/shell/model/devices/devicesmodel.py b/shell/model/devices/devicesmodel.py index 2685b7c..4a2148c 100644 --- a/shell/model/devices/devicesmodel.py +++ b/shell/model/devices/devicesmodel.py @@ -1,3 +1,20 @@ +# +# Copyright (C) 2007, 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 logging import gobject @@ -23,6 +40,7 @@ class DevicesModel(gobject.GObject): gobject.GObject.__init__(self) self._devices = {} + self._sigids = {} self.add_device(battery.Device()) self._observe_network_manager() @@ -45,7 +63,6 @@ class DevicesModel(gobject.GObject): self._network_device_removed_cb) def _network_device_added_cb(self, network_manager, nm_device): - logging.debug("got added isgnal for %s" % nm_device.get_op()) state = nm_device.get_state() if state == nmclient.DEVICE_STATE_ACTIVATING \ or state == nmclient.DEVICE_STATE_ACTIVATED: @@ -57,12 +74,8 @@ class DevicesModel(gobject.GObject): def _network_device_activated_cb(self, network_manager, nm_device): pass - def _network_device_removed_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 _network_device_removed_cb(self, network_manager, nm_device): + self.remove_device(self._get_network_device(nm_device)) def _check_network_device(self, nm_device): if not nm_device.is_valid(): @@ -77,23 +90,26 @@ class DevicesModel(gobject.GObject): def _get_network_device(self, nm_device): return self._devices[str(nm_device.get_op())] + def _network_device_state_changed_cb(self, dev, param): + if dev.props.state == device.STATE_INACTIVE: + self.remove_device(dev) + def _add_network_device(self, nm_device): if self._devices.has_key(str(nm_device.get_op())): logging.debug("Tried to add device %s twice" % nm_device.get_op()) return dtype = nm_device.get_type() - logging.debug("Adding device %s type %d" % (nm_device.get_op(), dtype)) if dtype == nmclient.DEVICE_TYPE_802_11_WIRELESS: - self.add_device(wireless.Device(nm_device)) + dev = wireless.Device(nm_device) + self.add_device(dev) + sigid = dev.connect('notify::state', self._network_device_state_changed_cb) + self._sigids[dev] = sigid if dtype == nmclient.DEVICE_TYPE_802_11_MESH_OLPC: - self.add_device(mesh.Device(nm_device)) - - 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)) + dev = mesh.Device(nm_device) + self.add_device(dev) + sigid = dev.connect('notify::state', self._network_device_state_changed_cb) + self._sigids[dev] = sigid def __iter__(self): return iter(self._devices.values()) @@ -104,4 +120,6 @@ class DevicesModel(gobject.GObject): def remove_device(self, device): self.emit('device-disappeared', self._devices[device.get_id()]) + device.disconnect(self._sigids[device]) + del self._sigids[device] del self._devices[device.get_id()] diff --git a/shell/model/devices/network/mesh.py b/shell/model/devices/network/mesh.py index 63f7b23..0bcc9fd 100644 --- a/shell/model/devices/network/mesh.py +++ b/shell/model/devices/network/mesh.py @@ -20,22 +20,12 @@ 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__ = { 'strength' : (int, None, None, 0, 100, 0, gobject.PARAM_READABLE), - 'state' : (int, None, None, STATE_ACTIVATING, - STATE_INACTIVE, 0, gobject.PARAM_READABLE) + 'state' : (int, None, None, device.STATE_ACTIVATING, + device.STATE_INACTIVE, 0, gobject.PARAM_READABLE) } def __init__(self, nm_device): @@ -58,10 +48,10 @@ class Device(device.Device): return self._nm_device.get_strength() elif pspec.name == 'state': nm_state = self._nm_device.get_state() - return _nm_state_to_state[nm_state] + return device._nm_state_to_state[nm_state] def get_type(self): return 'network.mesh' def get_id(self): - return self._nm_device.get_op() + return str(self._nm_device.get_op()) diff --git a/shell/model/devices/network/wired.py b/shell/model/devices/network/wired.py index ff791be..1712a64 100644 --- a/shell/model/devices/network/wired.py +++ b/shell/model/devices/network/wired.py @@ -6,7 +6,7 @@ class Device(device.Device): self._nm_device = device def get_id(self): - return self._nm_device.get_op() + return str(self._nm_device.get_op()) def get_type(self): return 'network.wired' diff --git a/shell/model/devices/network/wireless.py b/shell/model/devices/network/wireless.py index 826f726..1ae4ff5 100644 --- a/shell/model/devices/network/wireless.py +++ b/shell/model/devices/network/wireless.py @@ -20,24 +20,14 @@ 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), - 'state' : (int, None, None, STATE_ACTIVATING, - STATE_INACTIVE, 0, gobject.PARAM_READABLE) + 'state' : (int, None, None, device.STATE_ACTIVATING, + device.STATE_INACTIVE, 0, gobject.PARAM_READABLE) } def __init__(self, nm_device): @@ -67,10 +57,10 @@ class Device(device.Device): return self._nm_device.get_ssid() elif pspec.name == 'state': nm_state = self._nm_device.get_state() - return _nm_state_to_state[nm_state] + return device._nm_state_to_state[nm_state] def get_type(self): return 'network.wireless' def get_id(self): - return self._nm_device.get_op() + return str(self._nm_device.get_op()) |