Merge lp:~jonobacon/ubuntu-accomplishments-daemon/publishonline into lp:ubuntu-accomplishments-daemon

[Jono Bacon]

This branch adds support to the desktop client for a user to publish their trophies to the web application that will be landing as part of the 0.3 release. Please note, you will also need to have lp:~jonobacon/ubuntu-accomplishments-viewer/publishonline to use this.

This is how it works:

 * The user loads Edit -> Preferences and can click a Publish button to share their trophies online. If they are currently publishing they instead see a Stop Publishing button.

Publishing involves the following:

 * We scan the list of shared directories for ones that are shared with the validation server.
 * For the share that is active, we create a WEBVIEW file in the trophy dir (this is used by the web app to show publishing.
 * We also generate a URL with the share name and share id for the user to set up their online trophy cabinet.

This feature should now be complete to land in trunk.

[lp:~jonobacon/ubuntu-accomplishments-daemon/publishonline]

84. By Jono Bacon on 2012-06-25

 * Fixed this branch to use DBUS signals to handle this more elegantly.

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-06-12 20:23:01 +0000
+++ accomplishments/daemon/api.py	2012-06-25 22:36:20 +0000
@@ -65,6 +65,7 @@
 
 LOCAL_USERNAME = getpass.getuser()
 SCRIPT_DELAY = 900
+ONLINETROPHIESHOST = "213.138.100.229:8000"
 
 #flags used for scripts_state
 NOT_RUNNING = 0
@@ -88,7 +89,7 @@
         pprotocol = SubprocessReturnCodeProtocol()
         reactor.spawnProcess(pprotocol, command[0], command, env=os.environ)
         return pprotocol.returnCodeDeferred
-    
+
     @defer.inlineCallbacks
     def verify_ubuntu_one_account(self):
         # check if this machine has an Ubuntu One account
@@ -587,6 +588,33 @@
 
             self._write_config_file()
 
+    def _get_active_share(self, shares):
+        matchingshares = []
+
+        for s in shares:
+            if s["other_username"] == self.matrix_username:
+                if s["subscribed"] == "True":
+                    matchingshares.append( { "name" : s["name"], "share_id" : s["node_id"] } )
+
+        trophydir = self.get_config_value("config", "trophypath")
+
+        if len(matchingshares) > 1:
+            log.msg("Error Publishing Online: could not find unique active share")
+        else:
+            webviewfile = open(os.path.join(trophydir, "WEBVIEW"), 'w')
+            string = " "
+            webviewfile.write(string)
+            url = "http://" + ONLINETROPHIESHOST + "/user/addshare?share_name=" + matchingshares[0]["name"] + "&share_id=" + matchingshares[0]["share_id"]
+            self.service.publish_trophies_online_completed(url)
+
+    def publish_trophies_online(self):
+        l = self.sd.list_shared()
+        l.addCallback(self._get_active_share)
+
+    def unpublish_trophies_online(self):
+        trophydir = self.get_config_value("config", "trophypath")
+        os.remove(os.path.join(trophydir, "WEBVIEW"))
+
     def get_all_extra_information(self):
         """
         Return a dictionary of all information for the accomplishments
@@ -1104,6 +1132,16 @@
         
     # ========= Misc functions ===========
     
+    def get_published_status(self):
+        """Detect if we are currently publishing online or not. Returns
+        True if we are or False if we are not. """
+        
+        trophydir = self.get_config_value("config", "trophypath")
+        print trophydir
+        if os.path.exists(os.path.join(trophydir, "WEBVIEW")):
+            return True
+        else:
+            return False
     
     def accomplish(self,accomID):
         log.msg("Accomplishing: %s" % accomID)

=== modified file 'accomplishments/daemon/dbusapi.py'
--- accomplishments/daemon/dbusapi.py	2012-06-07 23:41:03 +0000
+++ accomplishments/daemon/dbusapi.py	2012-06-25 22:36:20 +0000
@@ -207,6 +207,11 @@
         in_signature="s", out_signature="b")
     def get_acc_is_completed(self,accomID):
         return self.api.get_acc_is_completed(accomID)
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="", out_signature="b")
+    def get_published_status(self):
+        return self.api.get_published_status()
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
@@ -302,6 +307,16 @@
         in_signature="", out_signature="s")
     def get_API_version(self):
         return self.api.get_API_version()
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="", out_signature="")
+    def publish_trophies_online(self):
+        return self.api.publish_trophies_online()
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
+        in_signature="", out_signature="")
+    def unpublish_trophies_online(self):
+        return self.api.unpublish_trophies_online()
         
     # XXX this looks like an unintentional duplicate of the "other"
     # trophy_received... I've moved them here together so that someone in the
@@ -314,6 +329,10 @@
         return trophy
 
     @dbus.service.signal(dbus_interface='org.ubuntu.accomplishments')
+    def publish_trophies_online_completed(self, url):
+        return url
+
+    @dbus.service.signal(dbus_interface='org.ubuntu.accomplishments')
     def scriptrunner_start(self):
         pass