Merge lp:~jonobacon/ubuntu-accomplishments-daemon/daemon-session-start into lp:ubuntu-accomplishments-daemon

[Jono Bacon]

This is the branch for auto-starting the daemon on login.

Please note:

 * I added some additional API functionality to make this happen:
     - enable_daemon_session_start()
     - disable_daemon_session_start() <- this doesnt do anything yet, will add later
     - read_config_file_item() - we already had the write_config_file_item() method, this just provides a read.

You will need to have lp:~jonobacon/ubuntu-accomplishments-viewer/daemon-session-start branch to test this feature too.

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-05-22 01:54:22 +0000
+++ accomplishments/daemon/api.py	2012-05-22 23:19:20 +0000
@@ -50,7 +50,7 @@
 from accomplishments import exceptions
 from accomplishments.daemon import dbusapi
 from accomplishments.util import get_data_file, SubprocessReturnCodeProtocol
-from accomplishments.util.paths import media_dir, module_dir1, module_dir2, installed, locale_dir
+from accomplishments.util.paths import daemon_exec_dir, media_dir, module_dir1, module_dir2, installed, locale_dir
 
 gettext.bindtextdomain('accomplishments-daemon',locale_dir)
 gettext.textdomain('accomplishments-daemon')
@@ -367,6 +367,9 @@
         if not os.path.exists(self.dir_cache):
             os.makedirs(self.dir_cache)
 
+        self.dir_autostart = os.path.join(
+            xdg.BaseDirectory.xdg_config_home, "autostart")
+
         print str("------------------- Ubuntu Accomplishments Daemon "
             "- "+ str(datetime.datetime.now()) +" -------------------")
 
@@ -504,6 +507,19 @@
             item = config.get(section, item)
             return item
 
+    def read_config_file_item(self, section, item):
+        log.msg(
+            "Read configuration file value in '%s': %s", section, item)
+        homedir = os.getenv("HOME")
+        config = ConfigParser.RawConfigParser()
+        cfile = self.dir_config + "/.accomplishments"
+
+        config.read(cfile)
+        if config.has_option(section, item):
+            return config.get(section, item)
+        else:
+            return "NoOption"
+
     def write_config_file_item(self, section, item, value):
         """Set a configuration value in the .accomplishments file"""
         log.msg(
@@ -1103,6 +1119,26 @@
         return db
         
     # ================================
+
+    def enable_daemon_session_start(self):
+        command = "twistd -noy " + daemon_exec_dir + "/accomplishments-daemon --logfile=" + os.path.join(self.dir_cache, "logs", "daemon.log")
+        filetext = "[Desktop Entry]\n\
+Type=Application\n\
+Encoding=UTF-8\n\
+Name=Accomplishments Daemon\n\
+Exec=" + command + "\n\
+NoDisplay=true"
+
+        filename = os.path.join(self.dir_autostart, "accomplishments-daemon.desktop")
+        file = open(filename, "w")
+        file.write(filetext)
+        file.close
+        
+        self.write_config_file_item("config", "daemon_sessionstart", "true")
+
+    def disable_daemon_session_start(self):
+        filename = os.path.join(self.dir_autostart, "accomplishments-daemon.desktop")
+        os.path.unlink(filename)
     
     def accomplish(self,accomID):
         log.msg("Accomplishing: %s" % accomID)

=== modified file 'accomplishments/daemon/dbusapi.py'
--- accomplishments/daemon/dbusapi.py	2012-05-21 19:39:27 +0000
+++ accomplishments/daemon/dbusapi.py	2012-05-22 23:19:20 +0000
@@ -95,6 +95,16 @@
 
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="")
+    def enable_daemon_session_start(self):
+        return self.api.enable_daemon_session_start()
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="", out_signature="")
+    def disable_daemon_session_start(self):
+        return self.api.disable_daemon_session_start()
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="", out_signature="")
     def write_extra_information_file(self, item, data):
         return self.api.write_extra_information_file(item, data)
 
@@ -124,12 +134,15 @@
         return self.api.write_config_file_item(section, item, value)
 
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="vv", out_signature="v")
+    def read_config_file_item(self, section, item):
+        return self.api.read_config_file_item(section, item)
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="b")
     def verify_ubuntu_one_account(self):
         return self.api.verify_ubuntu_one_account()
         
-        
-        
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="")
     def reload_accom_database(self):