Merge lp:~rafalcieslak256/ubuntu-accomplishments-daemon/local-accoms into lp:ubuntu-accomplishments-daemon

[Rafał Cieślak]

This enables support for local accomplishments.
This is implemented by replacing all pieces of code that rely on .asc file presence with code that checks also if the accomplishment needs-signing.

[lp:~rafalcieslak256/ubuntu-accomplishments-daemon/local-accoms]

40. By Rafał Cieślak on 2012-05-04

fixed re-waiting for sig file if last recieved was not valid

[Rafał Cieślak (rafalcieslak256)]

Right. The issue of scripts not re-running when .asc was received was indeed not introduced in trunk, but since that was a simple thing (see 40th commit to my branch, thing was that run_scripts and wait_for_a_sig_file were called only it the received .asc file was valid), I fixed that here, so now you should experience no problems testing this MP.

Well, almost.

There is another bug, which is present in trunk too, but is triggered somehow randomly, so at first I had an impression that it is introduced by my branch, but it's not.

The problem is that when validate_trophy checks if .asc file is correct JUST after it has been received, it fails because of missing .asc file. Yup, os.path.exists(...) returns 0 for the just-received asc file. I'll report a bug on this.
So in result you may not see some of your global accomplishments, but this branch should now work as intended.

[Jono Bacon (jonobacon)]

Awesome work, Rafal! Merging in now. :-)

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-04-28 21:57:30 +0000
+++ accomplishments/daemon/api.py	2012-05-04 18:22:17 +0000
@@ -102,6 +102,8 @@
             os.path.split(path)[1])[0])[0]
         
         valid = self.parent.validate_trophy(path)
+        if not valid:
+            log.msg("WARNING: invalid .asc signature recieved from the server!")
         
         if valid == True:
             item = os.path.split(path)[1][:-11]
@@ -127,8 +129,8 @@
             # check to see if there are any unlocked accomplishments
             self.parent.show_unlocked_accomplishments(app, item)
             
-            self.parent.run_scripts(0)
-            self.wait_until_a_sig_file_arrives()
+        self.parent.run_scripts(0)
+        self.wait_until_a_sig_file_arrives()
 
     # XXX let's rewrite this to use deferreds explicitly
     @defer.inlineCallbacks
@@ -813,10 +815,27 @@
         if "depends" in data:
             for dependency in data["depends"].split(","):
                 dapp, dname = dependency.split("/")
+                #XXX: Below application's default language should be used
+                # instead of "en", but this will work well in most cases,
+                # and implementing this properli will be much much easier
+                # in the new API.
+                dpath = os.path.join(self.accomplishments_path, dapp, "en",
+            "%s.accomplishment" % dname)
+                dcp = ConfigParser.RawConfigParser()
+                dcp.read(dpath)
+                dacc_data = dict(dcp._sections["accomplishment"])
                 dtrophy_file = os.path.join(
                     self.trophies_path, dapp,
-                    "%s.trophy.asc" % dname)
-                if not os.path.exists(dtrophy_file):
+                    "%s.trophy" % dname)
+                dtrophysigned = dtrophy_file + ".asc"
+                if(dacc_data.has_key("needs-signing") and (dacc_data["needs-signing"] == True or dacc_data["needs-signing"] == "True" or dacc_data["needs-signing"] == "true")):
+                    # the dependent accom needs to be signed
+                    dvalid = self.validate_trophy(dtrophysigned)
+                else:
+                    # this dependency trophy does not require signature
+                    dvalid = os.path.exists(dtrophy_file)
+                
+                if not dvalid:
                     raise exceptions.AccomplishmentLocked()
 
         cp = ConfigParser.RawConfigParser()
@@ -839,15 +858,30 @@
         fp.close()
         
         if data.has_key("needs-signing") == False or data["needs-signing"] is False:
-            #self.service.trophy_received()
+            self.service.trophy_received("foo")
+            iconpath = os.path.join(
+                self.accomplishments_path,
+                data["application"],
+                "trophyimages",
+                data["icon"])
+                
             if self.show_notifications is True and pynotify and (
             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(media_dir, "unlocked.png"))
                 n = pynotify.Notification(_("You have accomplished something!"),
-                    data["title"], trophy_icon_path)
+                    data["title"], iconpath)
                 n.show()
+                
+            self.show_unlocked_accomplishments(app,accomplishment_name)
+            # Because something new has been accomplished and it does not
+            # require to wait for .asc file, scripts have to be re-run to check
+            # if something that has been just unlocked hasn't been already
+            # achieved. Because this function is usually called from
+            # scriptrunner, the following will schedule scripts for re-running.
+            self.run_scripts(0)
+            
         else:
             # if the trophy needs signing we wait for wait_until_a_sig_file_arrives
             # to display the notification
@@ -1090,9 +1124,19 @@
                 self.trophies_path, app, "%s.trophy" % name)
                 
             trophysigned = str(trophy_file) + ".asc"
-
-            # validate all files that have been signed
-            if self.validate_trophy(trophysigned) == True:
+            
+            acc_file_cfg = ConfigParser.RawConfigParser()
+            acc_file_cfg.read(accomplishment_file)
+            acc_data = dict(acc_file_cfg._sections["accomplishment"])
+            if(acc_data.has_key("needs-signing") and (acc_data["needs-signing"] == True or acc_data["needs-signing"] == "True" or acc_data["needs-signing"] == "true")):
+                # this trophy needs to be signed in order to be validated
+                valid = self.validate_trophy(trophysigned)
+            else:
+                # this trophy does not require signature
+                valid = os.path.exists(trophy_file)
+
+
+            if valid:
                 data["accomplished"] = True
                 data["locked"] = False
                 data.update(self._load_trophy_file(trophy_file))
@@ -1100,7 +1144,7 @@
             else:
                 if os.path.exists(trophysigned):
                     os.remove(trophysigned)
-                    os.remove(trophy_file)
+                    # os.remove(trophy_file)
                 data["accomplished"] = False
                 data["iconpath"] = os.path.join(icondir, (
                     iconname + "-opportunity" + iconext))

=== modified file 'po/accomplishments-daemon.pot'
--- po/accomplishments-daemon.pot	2012-04-28 21:57:30 +0000
+++ po/accomplishments-daemon.pot	2012-05-04 18:22:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-28 14:56-0700\n"
+"POT-Creation-Date: 2012-05-02 21:23+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"
@@ -25,7 +25,7 @@
 msgid "Clear your trophies collection"
 msgstr ""
 
-#: ../accomplishments/daemon/api.py:124 ../accomplishments/daemon/api.py:848
+#: ../accomplishments/daemon/api.py:124 ../accomplishments/daemon/api.py:871
 msgid "You have accomplished something!"
 msgstr ""