X-Git-Url: https://git.linta.de/?p=~helmut%2Fonoff.git;a=blobdiff_plain;f=dbus_service.py;h=94ff9b5d45b6b63ecbea853672538b820c3bc7a7;hp=a35936c1de8f8baa724825c81fbf8ae4b64ec436;hb=296ba160a075b2da20ba4ec5a1d50cdccd1bec38;hpb=824e1c41bdb9d6385ad419e967f54eef4f4d73f3

diff --git a/dbus_service.py b/dbus_service.py
index a35936c..94ff9b5 100755
--- a/dbus_service.py
+++ b/dbus_service.py
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
+"""
+A dbus service example currently providing a device called redshift, that runs
+redshift whenever it is not activated. This could be useful to temporarily
+disable redshift e.g. while watching a movie.
+"""
 
 import logging
-import os
 
 import dbus
 import dbus.service
@@ -9,62 +13,9 @@ from dbus.mainloop.glib import DBusGMainLoop
 from gi.repository import GObject
 
 import onoff.common
+import onoff.dbusutils
 import onoff.process
 
-logger = logging.getLogger("dbus_service")
-
-class OnoffControl(dbus.service.Object):
-    domain = "de.subdivi.onoff"
-    path = "/de/subdivi/onoff"
-
-    def __init__(self, bus, name, device):
-        busname = dbus.service.BusName(self.domain, bus=bus)
-        dbus.service.Object.__init__(self, busname, "%s/%s" % (self.path, name))
-        self.device = device
-        device.notify.add(self.changestate)
-        self.usecount = 0
-
-    @dbus.service.signal(domain, signature="q")
-    def changestate(self, st):
-        logger.debug("emitting state %d", st)
-
-    @dbus.service.method(domain, out_signature="q")
-    def state(self):
-        return self.device.state
-
-    @dbus.service.method(domain, in_signature="q", out_signature="q")
-    def activatetime(self, duration):
-        logger.info("activatetime %d", duration)
-        GObject.timeout_add(duration * 1000, self.unuse)
-        return self.use()
-
-    @dbus.service.method(domain, in_signature="hq", out_signature="q")
-    def activatefd(self, fd, duration):
-        fd = fd.take()
-        logger.info("activatefd fd %d, duration %d", fd, duration)
-        def callback(fd, _):
-            logger.info("fd %d completed", fd)
-            os.close(fd)
-            GObject.timeout_add(duration * 1000, self.unuse)
-            return False
-        GObject.io_add_watch(fd, GObject.IO_HUP|GObject.IO_ERR, callback)
-        return self.use()
-
-    def use(self):
-        self.usecount += 1
-        if self.usecount <= 1:
-            self.device.activate()
-        return self.device.state
-
-    def unuse(self):
-        self.usecount -= 1
-        if not self.usecount:
-            self.device.deactivate()
-        else:
-            logger.debug("%d users left", self.usecount)
-        return False
-
-
 def main():
     logging.basicConfig()
     logging.getLogger().setLevel(logging.DEBUG)
@@ -72,7 +23,8 @@ def main():
     bus = dbus.SessionBus()
     dev = onoff.process.OnoffProcess(["redshift"], 3)
     dev = onoff.common.InvertedDevice(dev)
-    OnoffControl(bus, "redshift", dev)
+    dev = onoff.common.ThrottledDevice(dev, 1, 5)
+    onoff.dbusutils.OnoffControl(bus, "redshift", dev)
     GObject.MainLoop().run()
 
 if __name__ == "__main__":