Merge lp:~rafalcieslak256/ubuntu-accomplishments-daemon/fixnotify into lp:ubuntu-accomplishments-daemon

[Rafał Cieślak]

This fixes #1003010 (Daemon hangs when calling pynotify, if run without -n flag).

The problem was that pynotify was unable to process, as it's own event loops were not running. We need some kind of twisted reactor that would take care of them, and a GIreactor looked fine, as it implements integration with all that GObject stuff. Therefore I switched to it (from glib2reactor, did we use it at all? I can find trails of it's usage, so probably this will need some more testing). That of course means switching to gi.repository (and gi.repository.Notify) instead of gobject module. Finally, that means a small change in package deps, since we need GI bindings for pynotify.

[Jono Bacon (jonobacon)]

I just tested this and I don't see any notification bubbles. I ran this with:

   twistd -oy bin/accomplishments-daemon

The bubbles not appearing may be our old friend https://bugs.launchpad.net/ubuntu-accomplishments-daemon/+bug/1031190 so I checked the log and when I run the command above I oddly don't get any logging in .cache/accomplishments/logs.

review: Needs Fixing

[Rafał Cieślak (rafalcieslak256)]

The log will appear in ~/.cache/accomplishments/logs if and only if this path is provided as an argument to twistd. To save the log there, you will need to use --logfile flag. Also, we have never used -o flag without -n. Can you retry using:
twistd -y bin/accomplishments-daemon --logfile=/home/USER/.cache/accomplishments/logs/daemon.log

Also, if you are affected by that other bug, try accomplish()ing something you have full control of, e.g. the "edit credentials" accomplishment, this one is easy to remove and then imediately test using the viewer.

review: Needs Information

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-07-23 16:27:15 +0000
+++ accomplishments/daemon/api.py	2012-07-30 17:55:22 +0000
@@ -19,7 +19,7 @@
 import datetime
 import getpass
 import glob
-import gobject
+#import gobject
 import gpgme
 import json
 import os
@@ -40,9 +40,10 @@
 import xdg.BaseDirectory
 
 try:
-    import pynotify
+    from gi.repository import Notify
+    useNotify = True
 except ImportError:
-    pynotify = None
+    useNotify = False
 
 from ubuntuone.platform.tools import SyncDaemonTool
 from ubuntuone.platform.credentials import CredentialsManagementTool
@@ -1678,9 +1679,9 @@
         return accomID.split("/")[0]
 
     def _display_accomplished_bubble(self,accomID):
-        if self.show_notifications == True and pynotify and (
-            pynotify.is_initted() or pynotify.init("icon-summary-body")):
-            n = pynotify.Notification(
+        if self.show_notifications == True and useNotify and (
+            Notify.is_initted() or Notify.init("icon-summary-body")):
+            n = Notify.Notification.new(
                 _("You have accomplished something!"),
                 self.get_acc_title(accomID),
                 self.get_acc_icon_path(accomID) )
@@ -1690,10 +1691,10 @@
     def _display_unlocked_bubble(self,accomID):
         unlocked = len(self.list_depending_on(accomID))
         if unlocked is not 0:
-            if self.show_notifications == True and pynotify and (
-                pynotify.is_initted() or pynotify.init("icon-summary-body")):
+            if self.show_notifications == True and useNotify and (
+                Notify.is_initted() or Notify.init("icon-summary-body")):
                 message = (N_("You have unlocked %s new opportunity.","You have unlocked %s new opportunities.",unlocked) % str(unlocked))
-                n = pynotify.Notification(
+                n = Notify.Notification.new(
                     _("Opportunities Unlocked!"), message,
                     self.get_media_file("unlocked.png"))
                 n.show()

=== modified file 'bin/accomplishments-daemon'
--- bin/accomplishments-daemon	2012-07-08 12:32:14 +0000
+++ bin/accomplishments-daemon	2012-07-30 17:55:22 +0000
@@ -5,8 +5,8 @@
 import sys
 import os
 
-from twisted.internet import glib2reactor
-glib2reactor.install()
+from twisted.internet import gireactor
+gireactor.install()
 
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop

=== modified file 'debian/control'
--- debian/control	2012-07-16 17:13:42 +0000
+++ debian/control	2012-07-30 17:55:22 +0000
@@ -30,7 +30,7 @@
  python-ubuntu-sso-client,
  ubuntuone-couch,
  python-twisted-core,
- python-notify,
+ gir1.2-notify-0.7,
  python-gobject-2,
  ubuntuone-client,
  python-imaging,