Merge lp:~segphault/gtg/dbus into lp:~gtg/gtg/old-trunk

[Ryan Paul]

=== added file 'GTG/core/dbuswrapper.py'
--- GTG/core/dbuswrapper.py	1970-01-01 00:00:00 +0000
+++ GTG/core/dbuswrapper.py	2009-07-09 20:03:12 +0000
@@ -0,0 +1,120 @@
+import gobject, dbus.glib, dbus, dbus.service
+
+BUSNAME = "org.GTG"
+
+def dsanitize(data):
+  # Clean up a dict so that it can be transmitted through D-Bus
+  for k, v in data.items():
+    # Manually specify an arbitrary content type for empty Python arrays
+    # because D-Bus can't handle the type conversion for empty arrays
+    if not v and isinstance(v, list):
+      data[k] = dbus.Array([], "s")
+    # D-Bus has no concept of a null or empty value so we have to convert None
+    # types to something else. I use an empty string because it has the same
+    # behavior as None in a Python conditional expression
+    elif v == None:
+      data[k] = ""
+
+  return data
+
+def task_to_dict(task):
+  # Translate a task object into a D-Bus dictionary
+  return dbus.Dictionary(dsanitize({
+      "id": task.get_id(),
+      "status": task.get_status(),
+      "title": task.get_title(),
+      "duedate": task.get_due_date(),
+      "startdate": task.get_start_date(),
+      "donedate": task.get_closed_date(),
+      "tags": task.get_tags_name(),
+      "text": task.get_text(),
+      "subtask": task.get_subtasks_tid(),
+    }), signature="sv")
+
+class DBusTaskWrapper(dbus.service.Object):
+  # D-Bus service object that exposes GTG's task store to third-party apps
+  def __init__(self, req, ui):
+    # Attach the object to D-Bus
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName(BUSNAME, bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, "/org/GTG")
+    self.req = req
+    self.ui = ui
+
+  @dbus.service.method(BUSNAME)
+  def get_task_ids(self):
+    # Retrieve a list of task ID values
+    return self.req.get_tasks_list(status=["Active", "Done"], started_only=False)
+
+  @dbus.service.method(BUSNAME)
+  def get_task(self, tid):
+    # Retrieve a specific task by ID and return the data
+    return task_to_dict(self.req.get_task(tid))
+
+  @dbus.service.method(BUSNAME)
+  def get_tasks(self):
+    # Retrieve a list of task data dicts
+    return [self.get_task(id) for id in self.get_task_ids()]
+
+  @dbus.service.method(BUSNAME, in_signature="asasbb")
+  def get_task_ids_filtered(self, tags, status, started_only, is_root):
+    # Retrieve a list of task IDs filtered by specified parameters
+    ids = self.req.get_tasks_list(tags, status, False, started_only, is_root)
+    # If there are no matching tasks, return an empty D-Bus array
+    return ids if ids else dbus.Array([], "s")
+
+  @dbus.service.method(BUSNAME, in_signature="asasbb")
+  def get_tasks_filtered(self, tags, status, started_only, is_root):
+    # Retrieve a list of task data discts filtered by specificed parameters
+    tasks = self.get_task_ids_filtered(tags, status, started_only, is_root)
+    # If no tasks match the filter, return an empty D-Bus array
+    return [self.get_task(id) for id in tasks] if tasks else dbus.Array([], "s")
+
+  @dbus.service.method(BUSNAME)
+  def has_task(self, tid):
+    return self.req.has_task(tid)
+
+  @dbus.service.method(BUSNAME)
+  def delete_task(self, tid):
+    self.req.delete_task(tid)
+
+  @dbus.service.method(BUSNAME, in_signature="sssssassas")
+  def new_task(self, status, title, duedate, startdate, donedate, tags, text, subtasks):
+    # Generate a new task object and return the task data as a dict
+    nt = self.req.new_task()
+    for sub in subtasks: nt.add_subtask(sub)
+    for tag in tags: nt.add_tag(tag)
+    nt.set_status(status, donedate=donedate)
+    nt.set_title(title)
+    nt.set_due_date(duedate)
+    nt.set_start_date(startdate)
+    nt.set_text(text)
+    return task_to_dict(nt)
+
+  @dbus.service.method(BUSNAME)
+  def modify_task(self, tid, task_data):
+    # Apply supplied task data to the task object with the specified ID
+    task = self.req.get_task(tid)
+    task.set_status(task_data["status"], donedate=task_data["donedate"])
+    task.set_title(task_data["title"])
+    task.set_due_date(task_data["duedate"])
+    task.set_start_date(task_data["startdate"])
+    task.set_text(task_data["text"])
+
+    for tag in task_data["tags"]: task.add_tag(tag)
+    for sub in task_data["subtask"]: task.add_subtask(sub)
+    return task_to_dict(task)
+
+  @dbus.service.method(BUSNAME)
+  def open_task_editor(self, tid):
+    self.ui.open_task(tid)
+
+  @dbus.service.method(BUSNAME)
+  def hide_task_browser(self):
+    self.ui.window.hide()
+  
+  @dbus.service.method(BUSNAME)
+  def show_task_browser(self):
+    self.ui.window.present()
+    self.ui.window.move(self.ui.priv["window_xpos"], self.ui.priv["window_ypos"])
+

=== modified file 'GTG/gtg.py'
--- GTG/gtg.py	2009-06-18 08:56:33 +0000
+++ GTG/gtg.py	2009-07-09 08:31:53 +0000
@@ -48,6 +48,7 @@
 #our own imports
 from GTG.taskbrowser.browser import TaskBrowser
 from GTG.core.datastore      import DataStore
+from GTG.core.dbuswrapper    import DBusTaskWrapper
 from GTG.core                import CoreConfig
 
 #=== OBJECTS ===================================================================
@@ -100,6 +101,7 @@
     # Launch task browser
     req = ds.get_requester()
     tb  = TaskBrowser(req, config.conf_dict)
+    DBusTaskWrapper(req, tb)
     tb.main()
 
     # Ideally we should load window geometry configuration from a config.