Changeset 3608

Timestamp:

10/10/08 21:21:53 (3 months ago)

Author:

dmeyer

Message:

move hwmon into base server directory

Location:

trunk/beacon/src/server

Files:

• cdrom.py (copied) (copied from trunk/beacon/src/server/hwmon/cdrom.py) (1 diff, 1 prop)
• controller.py (modified) (4 diffs)
• devices.py (copied) (copied from trunk/beacon/src/server/hwmon/client.py) (3 diffs, 1 prop)
• hal.py (copied) (copied from trunk/beacon/src/server/hwmon/hal.py) (15 diffs, 1 prop)
• hwmon (deleted)
• server.py (modified) (2 diffs)
• videothumb.py (modified) (1 diff)

trunk/beacon/src/server/cdrom.py

@@ -70 +70 @@
 import kaa.metadata
 
-from kaa.beacon.utils import fstab
+from ..utils import fstab
 
 # get logging object

trunk/beacon/src/server/controller.py

@@ -7 +7 @@
 # -----------------------------------------------------------------------------
 # kaa.beacon.server - A virtual filesystem with metadata
-# Copyright (C) 2007 Dirk Meyer
+# Copyright (C) 2007-2008 Dirk Meyer
 #
 # First Edition: Dirk Meyer <dischi@freevo.org>
@@ -36 +36 @@
 
 # kaa.beacon imports
-import hwmon
+import devices
 from parser import parse
 
@@ -49 +49 @@
         self._changed = []
         db.medialist.connect(self)
-        hwmon.create(handler, db, rootfs)
+        self.hwmon = devices.HardwareMonitor(handler, db, rootfs)
 
     # Item callbacks
@@ -108 +108 @@
         Eject media
         """
-        hwmon.get_client().eject(media)
+        self.hwmon.eject(media)
 
 

trunk/beacon/src/server/devices.py

@@ -1 +1 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------------
-# client.py - client part of the hardware monitor
+# devices.py - HardwareMonitor
 # -----------------------------------------------------------------------------
 # $Id$
-#
-# This module is used inside the beacon server to communicate with the
-# hardware monitor process.
 #
 # -----------------------------------------------------------------------------
@@ -43 +40 @@
 
 # kaa.beacon imports
-from kaa.beacon.utils import get_title
+from ..utils import get_title
 
 # get logging object
@@ -60 +57 @@
         cdrom = None
 
-class Client(object):
+class HardwareMonitor(object):
 
     def __init__(self, handler, db, rootfs):

trunk/beacon/src/server/hal.py

@@ -56 +56 @@
 
 # kaa.beacon imports
-from kaa.beacon.server.config import config
+from config import config
 
 # get logging object
 log = logging.getLogger('beacon.hal')
 
-# HAL signals
+# hal signals
 signals = kaa.Signals('add', 'remove', 'changed', 'failed')
+
+# hal object and interface names
+HAL = 'org.freedesktop.Hal'
+HAL_DEVICE = 'org.freedesktop.Hal.Device'
 
 @kaa.threaded(kaa.MAINTHREAD)
@@ -81 +85 @@
         self.prop = prop
         self._bus = bus
+
+    def get_interface(self, name):
+        obj = self._bus.get_object(HAL, self.udi)
+        return dbus.Interface(obj, name)
 
     # -------------------------------------------------------------------------
@@ -96 +104 @@
         if not self.prop.get('volume.fstype'):
             log.error('unknown filesystem type for %s', self.udi)
-        obj = self._bus.get_object('org.freedesktop.Hal', self.udi)
-        vol = dbus.Interface(obj, 'org.freedesktop.Hal.Device.Volume')
+        vol = self.get_interface(HAL_DEVICE + '.Volume')
         vol.Mount('', self.prop.get('volume.fstype'), [])
         return True
@@ -109 +116 @@
         """
         _device_remove(self.udi)
-        obj = self._bus.get_object('org.freedesktop.Hal', self.udi)
-        vol = dbus.Interface(obj, 'org.freedesktop.Hal.Device.Volume')
+        vol = self.get_interface(HAL_DEVICE + '.Volume')
         if self.prop.get('volume.mount_point'):
             vol.Unmount([])
@@ -134 +140 @@
         for c in change_list:
             if c[0] == 'volume.mount_point':
-                obj = self._bus.get_object('org.freedesktop.Hal', self.udi)
-                obj = dbus.Interface(obj, 'org.freedesktop.Hal.Device')
+                obj = self.get_interface(HAL_DEVICE)
                 obj.GetAllProperties(reply_handler=self._property_update,
                                      error_handler=log.error)
-
 
     def _property_update(self, prop):
@@ -151 +155 @@
 
 
-
 # -----------------------------------------------------------------------------
 # Connection handling
@@ -166 +169 @@
 def start():
     """
-    Connect to DBUS and start to connect to HAL.
+    Connect to DBUS and start to connect to hal.
     """
     global _bus
@@ -183 +186 @@
         return False
     try:
-        obj = _bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
+        obj = _bus.get_object(HAL, '/org/freedesktop/Hal/Manager')
     except Exception, e:
         # unable to connect to hal
         emit_signal('failed', 'hal not found on dbus')
         return False
-    hal = dbus.Interface(obj, 'org.freedesktop.Hal.Manager')
+    hal = dbus.Interface(obj, HAL + '.Manager')
     hal.GetAllDevices(reply_handler=_device_all, error_handler=log.error)
     hal.connect_to_signal('DeviceAdded', _device_new)
@@ -204 +207 @@
 def _device_all(device_names):
     """
-    HAL callback with the list of all known devices.
+    Hal callback with the list of all known devices.
     Called by dbus in GOBJECT thread.
     """
     for name in device_names:
-        obj = _bus.get_object("org.freedesktop.Hal", str(name))
-        obj.GetAllProperties(dbus_interface="org.freedesktop.Hal.Device",
+        obj = _bus.get_object(HAL, str(name))
+        obj.GetAllProperties(dbus_interface=HAL_DEVICE,
                              reply_handler=kaa.Callback(_device_add, name),
                              error_handler=log.error)
 
-
 def _device_new(udi):
     """
-    HAL callback for a new device.
+    Hal callback for a new device.
     Called by dbus in GOBJECT thread.
     """
-    obj = _bus.get_object("org.freedesktop.Hal", udi)
-    obj.GetAllProperties(dbus_interface="org.freedesktop.Hal.Device",
+    obj = _bus.get_object(HAL, udi)
+    obj.GetAllProperties(dbus_interface=HAL_DEVICE,
                          reply_handler=kaa.Callback(_device_add, udi, True),
                          error_handler=log.error)
 
-
 def _device_remove(udi):
     """
-    HAL callback when a device is removed.
+    Hal callback when a device is removed.
     Called by dbus in GOBJECT thread or by eject
     """
@@ -241 +242 @@
     # that id, but we need to unreg, right? FIXME by reading hal doc.
     sig = _bus.remove_signal_receiver
-    sig(dev._modified, "PropertyModified", 'org.freedesktop.Hal.Device',
-        "org.freedesktop.Hal", udi)
+    sig(dev._modified, "PropertyModified", HAL_DEVICE,
+        HAL, udi)
     _devices.remove(dev)
     # signal changes
@@ -248 +249 @@
         emit_signal('remove', dev)
 
-
 def _device_add(prop, udi, removable=False):
     """
-    HAL callback for property list of a new device. If removable is set to
+    Hal callback for property list of a new device. If removable is set to
     False this functions tries to detect if it is removable or not.
     Called by dbus in GOBJECT thread.
@@ -264 +264 @@
                     emit_signal('add', dev)
         return
-
     if prop.get('block.device').startswith('/dev/mapper') or \
            (prop.get('block.device') and config.discs and \
@@ -271 +270 @@
         # fixed device set in config
         return
-
     if config.discs:
         # fixed drives are set so this is a removable
         removable = True
-
     if not prop.get('volume.is_disc') and not removable:
         # No disc and not already marked as removable.
@@ -297 +294 @@
             log.exception('device checking')
             return
-
     dev = Device(prop, _bus)
     _devices.append(dev)
-    sig = _bus.add_signal_receiver
-    sig(dev._modified, "PropertyModified", 'org.freedesktop.Hal.Device',
-        "org.freedesktop.Hal", prop['info.udi'])
-
+    _bus.add_signal_receiver(dev._modified, "PropertyModified", HAL_DEVICE, HAL,
+                             prop['info.udi'])
     parent = _blockdevices.get(prop.get('info.parent'))
     if parent:
@@ -311 +305 @@
 
 
-if __name__ == '__main__':      
+if __name__ == '__main__':
     def changed(dev, prop):
         print 'changed', dev.get('info.parent')

trunk/beacon/src/server/server.py

@@ -399 +399 @@
         yield self._db.add_object(type, parent=parent, **kwargs)
 
-    
+
     @kaa.rpc.expose('item.delete')
     @kaa.coroutine()
@@ -410 +410 @@
         self._db.delete_object(id)
 
-    
+
     @kaa.rpc.expose('beacon.shutdown')
     def shutdown(self):

trunk/beacon/src/server/videothumb.py

@@ -66 +66 @@
         self.create_failed = thumbnailer.create_failed
 
-        self.child = kaa.Process(['mplayer', '-nosound', '-vo', 'png:z=2', 
+        self.child = kaa.Process(['mplayer', '-nosound', '-vo', 'png:z=2',
                                            '-frames', '10', '-osdlevel', '0', '-nocache',
                                            '-zoom', '-ss' ])