Merge lp:~dholbach/ubuntu-accomplishments-daemon/paths-fix into lp:~jonobacon/ubuntu-accomplishments-daemon/ubuntu-accomplishments-daemon

[Daniel Holbach]

This should install the GPG key in the right place and tests where we are
running from (from branch or from system libs) when starting the daemon.

Also checks for .png files in the right place.

[Jono Bacon (jonobacon)]

Hi Daniel,

Firstly, thanks so much for helping. I really appreciate it!

I noticed a few things when reviewing the merge. When I package the daemon and install it run:

   accomplishments-daemon

it seems to start it with 'twistd -noy'. I saw you added this at the beginning of the source file.

Unfortunately we will need to be able to start the daemon using other twistd command line options (e.g -noy is good for debugging so it runs in the foreground, but when it runs as a daemon we will want to run it with 'twistd -y'.

When I started the daemon (running 'accomplishments-daemon') it ran well but I noticed one bug. When the first few accomplishments are achieved, the first trophy appears correctly in the GUI but any other trophies don't. There is also the following output in the daemon's terminal:

2012-04-10 21:04:09-0700 [-] Looking for accomplishments files in /home/jono/accomplishments/accomplishments/ubuntu-community/en
2012-04-10 21:04:09-0700 [-] Looking for accomplishments files in /home/jono/accomplishments/accomplishments/ubuntu-italian/it
2012-04-10 21:04:09-0700 [-] ['/home/jono/accomplishments/accomplishments/ubuntu-community/en/*.accomplishment', '/home/jono/accomplishments/accomplishments/ubuntu-italian/it/*.accomplishment']
2012-04-10 21:04:09-0700 [-] Unhandled error in Deferred:
2012-04-10 21:04:09-0700 [-] Unhandled Error
 Traceback (most recent call last):
   File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 362, in callback
     self._startRunCallbacks(result)
   File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 458, in _startRunCallbacks
     self._runCallbacks()
   File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 545, in _runCallbacks
     current.result = callback(current.result, *args, **kw)
   File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1095, in gotResult
     _inlineCallbacks(r, g, deferred)
 --- <exception caught here> ---
   File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
     result = g.send(result)
   File "/usr/lib/python2.7/dist-packages/accomplishments/daemon/api.py", line 106, in wait_until_a_sig_file_arrives
     self.parent.show_unlocked_accomplishments()
   File "/usr/lib/python2.7/dist-packages/accomplishments/daemon/api.py", line 378, in show_unlocked_accomplishments
     self.get_media_file("unlocked.png"))
   File "/usr/lib/python2.7/dist-packages/accomplishments/daemon/api.py", line 346, in get_media_file
     media_filename = get_data_file('media', '%s' % (media_file_name,))
   File "/usr/lib/python2.7/dist-packages/accomplishments/util/__init__.py", line 80, in get_data_file
     return os.path.join(get_data_path(), *path_segments)
   File "/usr/lib/python2.7/dist-packages/accomplishments/util/__init__.py", line 69, in get_data_path
     raise exceptions.PathNotFound(msg)
 accomplishments.exceptions.PathNotFound: Could not find the project data directory.

This obviously points to an issue with the packaging. This is definitely an issue with the packaging as when I run from the source directory as opposed to the packaged daemon the bug isn't triggered.

...

review: Needs Information

[lp:~dholbach/ubuntu-accomplishments-daemon/paths-fix]

119. By Daniel Holbach on 2012-04-11

merge from trunk

120. By Daniel Holbach on 2012-04-11

run daemon with -y instead of -noy

121. By Daniel Holbach on 2012-04-11

look for media files in media_dir - which depends on where we run the daemon from

[Daniel Holbach (dholbach)]

On 11.04.2012 06:23, Jono Bacon wrote:
> Unfortunately we will need to be able to start the daemon using other twistd command line options (e.g -noy is good for debugging so it runs in the foreground, but when it runs as a daemon we will want to run it with 'twistd -y'.

Ok. I fixed this in r120 of my branch.

> When I started the daemon (running 'accomplishments-daemon') it ran well but I noticed one bug. When the first few accomplishments are achieved, the first trophy appears correctly in the GUI but any other trophies don't. There is also the following output in the daemon's terminal:
>
> 2012-04-10 21:04:09-0700 [-] Looking for accomplishments files in /home/jono/accomplishments/accomplishments/ubuntu-community/en
> 2012-04-10 21:04:09-0700 [-] Looking for accomplishments files in /home/jono/accomplishments/accomplishments/ubuntu-italian/it
> 2012-04-10 21:04:09-0700 [-] ['/home/jono/accomplishments/accomplishments/ubuntu-community/en/*.accomplishment', '/home/jono/accomplishments/accomplishments/ubuntu-italian/it/*.accomplishment']
> 2012-04-10 21:04:09-0700 [-] Unhandled error in Deferred:
> 2012-04-10 21:04:09-0700 [-] Unhandled Error
> Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 362, in callback
> self._startRunCallbacks(result)
> File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 458, in _startRunCallbacks
> self._runCallbacks()
> File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 545, in _runCallbacks
> current.result = callback(current.result, *args, **kw)
> File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1095, in gotResult
> _inlineCallbacks(r, g, deferred)
> --- <exception caught here> ---
> File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
> result = g.send(result)
> File "/usr/lib/python2.7/dist-packages/accomplishments/daemon/api.py", line 106, in wait_until_a_sig_file_arrives
> self.parent.show_unlocked_accomplishments()
> File "/usr/lib/python2.7/dist-packages/accomplishments/daemon/api.py", line 378, in show_unlocked_accomplishments
> self.get_media_file("unlocked.png"))
> File "/usr/lib/python2.7/dist-packages/accomplishments/daemon/api.py", line 346, in get_media_file
> media_filename = get_data_file('media', '%s' % (media_file_name,))
> File "/usr/lib/python2.7/dist-packages/accomplishments/util/__init__.py", line 80, in get_data_file
> return os.path.join(get_data_path(), *path_segments)
> File "/usr/lib/python2.7/dist-packages/accomplishments/util/__init__.py", line 69, in get_data_path
> raise exceptions.PathNotFound(msg)
> accomplishments.exceptions.PathNotFound: Could not find the project data directory.
>
> This obviously points to an issue with the packaging. This is definitely an issue with the packaging as when I run from the source directory as opposed to the packaged daemon the bug isn't triggered.

It's not an issue with the packaging, but in the code. I fixed this in
r121 of my branch.

This piece of code:

 get_data_file('media', '%s' % (media_fi...

Unmerged revisions

121. By Daniel Holbach on 2012-04-11

look for media files in media_dir - which depends on where we run the daemon from

120. By Daniel Holbach on 2012-04-11

run daemon with -y instead of -noy

119. By Daniel Holbach on 2012-04-11

merge from trunk

118. By Daniel Holbach on 2012-04-10

check for .png files in the right place depending on where we run the daemon from

117. By Daniel Holbach on 2012-04-10

update potfile

116. By Daniel Holbach on 2012-04-10

install gpg key into /usr/share/ and test if we are running from branch or not

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-04-09 20:15:10 +0000
+++ accomplishments/daemon/api.py	2012-04-11 07:48:18 +0000
@@ -44,7 +44,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
 
 MATRIX_USERNAME = "openiduser155707"
 LOCAL_USERNAME = getpass.getuser()
@@ -343,7 +343,7 @@
 
 
     def get_media_file(self, media_file_name):
-        media_filename = get_data_file('media', '%s' % (media_file_name,))
+        media_filename = get_data_file(media_dir, '%s' % (media_file_name,))
         if not os.path.exists(media_filename):
             media_filename = None
 
@@ -543,9 +543,7 @@
                 os.remove(o)
 
             # now generate our trophy images
-            lock_image_path = os.path.join(
-                os.path.dirname(accomplishments.__path__[0]),
-                "data/media/lock.png")
+            lock_image_path = os.path.join(media_dir, "lock.png")
             self.generate_trophy_images(
                 app_trophyimagespath, cache_trophyimagespath, lock_image_path)
 
@@ -729,8 +727,7 @@
             pynotify.is_initted() or pynotify.init("icon-summary-body")):
                 # XXX: need to fix loading the right icon
                 trophy_icon_path = "file://%s" % os.path.realpath(
-                    os.path.join(
-                        os.path.split(__file__)[0], "unlocked.png"))
+                    os.path.join(media_dir, "unlocked.png"))
                 n = pynotify.Notification(_("You have accomplished something!"),
                     data["title"], trophy_icon_path)
                 n.show()

=== added file 'accomplishments/util/paths.py'
--- accomplishments/util/paths.py	1970-01-01 00:00:00 +0000
+++ accomplishments/util/paths.py	2012-04-11 07:48:18 +0000
@@ -0,0 +1,11 @@
+import os
+
+def uses_system_lib():
+    return os.path.dirname(__file__).startswith("/usr")
+
+runs_in_branch = not uses_system_lib()
+systemdata_dir = "data/daemon/"
+media_dir      = "data/media/"
+if not runs_in_branch:
+    systemdata_dir = "/usr/share/accomplishments-daemon/"
+    media_dir      = "/usr/share/accomplishments-daemon/media/"

=== modified file 'bin/accomplishments-daemon'
--- bin/accomplishments-daemon	2012-04-08 22:11:10 +0000
+++ bin/accomplishments-daemon	2012-04-11 07:48:18 +0000
@@ -1,8 +1,9 @@
-#!/usr/bin/twistd
+#!/usr/bin/twistd -y
 """
 Run the Accomplishments daemon!
 """
 import sys
+import os
 
 from twisted.internet import glib2reactor
 glib2reactor.install()
@@ -11,10 +12,12 @@
 from dbus.mainloop.glib import DBusGMainLoop
 
 from accomplishments.daemon import app
-
-
-# PYTHONPATH mangling
-sys.path.insert(0, ".")
+from accomplishments.util import paths
+
+
+if paths.runs_in_branch:
+    # PYTHONPATH mangling
+    sys.path.insert(0, ".")
 
 dbus_loop = DBusGMainLoop(set_as_default=True)
 application = app.applicationFactory(
@@ -25,4 +28,4 @@
     object_path="/",
     # Let's execute the timer service every 15 minutes
     update_interval=15 * 60,
-    gpg_key="./data/daemon/validation-key.pub")
+    gpg_key=os.path.join(paths.systemdata_dir, "validation-key.pub"))

=== modified file 'debian/copyright'
--- debian/copyright	2012-04-09 04:52:29 +0000
+++ debian/copyright	2012-04-11 07:48:18 +0000
@@ -5,6 +5,7 @@
 
 Files: *
 Copyright: (C) 2012 Jono Bacon <[e-mail]>
+Copyright: (C) 2012 Rosetta Contributors and Canonical Ltd 2012
 License: GPL-3
  The full text of the GPL is distributed in
  /usr/share/common-licenses/GPL-3 on Debian systems.

=== modified file 'po/accomplishments-daemon.pot'
--- po/accomplishments-daemon.pot	2012-04-09 06:08:40 +0000
+++ po/accomplishments-daemon.pot	2012-04-11 07:48:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-08 23:07-0700\n"
+"POT-Creation-Date: 2012-04-10 10:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,10 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../accomplishments/daemon/api.py:102 ../accomplishments/daemon/api.py:731
+msgid "You have accomplished something!"
+msgstr ""
+
 #: ../accomplishments/util/__init__.py:88
 msgid "Show debug messages (-vv debugs accomplishments_daemon_lib also)"
 msgstr ""
@@ -24,7 +28,3 @@
 #: ../accomplishments/util/__init__.py:91
 msgid "Clear your trophies collection"
 msgstr ""
-
-#: ../accomplishments/daemon/api.py:100 ../accomplishments/daemon/api.py:732
-msgid "You have accomplished something!"
-msgstr ""

=== modified file 'setup.py'
--- setup.py	2012-04-09 04:52:29 +0000
+++ setup.py	2012-04-11 07:48:18 +0000
@@ -15,5 +15,8 @@
     description='Daemon for Ubuntu Accomplishments.',
     long_description='Daemon for Ubuntu Accomplishments.',
     url='https://launchpad.net/ubuntu-accomplishments-daemon',
-    cmdclass={'install': dist.InstallAndUpdateDataDirectory}
-    )
+    cmdclass={'install': dist.InstallAndUpdateDataDirectory},
+    data_files=[
+        ('share/accomplishments-daemon', ['data/daemon/validation-key.pub'])
+        ],
+)