Merge lp:~manishsinha/cheers/signals-handled into lp:~manishsinha/cheers/insertion

[Manish Sinha (मनीष सिन्हा)]

[lp:~manishsinha/cheers/signals-handled]

21. By Manish Sinha (मनीष सिन्हा) on 2010-10-27

Changed all the wrapper methods in lower case _ seperated names and set the default awarded state to 0

[Stuart Langridge (sil)]

Broadly looks OK to me, although I'm not hugely familiar with the code yet.

review: Approve

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

The code in this merge is already present in the trunk via some weird graph like merges. So this hardly makes much sense.

review: Disapprove

Unmerged revisions

21. By Manish Sinha (मनीष सिन्हा) on 2010-10-27

Changed all the wrapper methods in lower case _ seperated names and set the default awarded state to 0

20. By Manish Sinha (मनीष सिन्हा) on 2010-10-27

Added event TrophyAwarded, TrophyDeleted and TrophyUnAwarded

19. By Manish Sinha (मनीष सिन्हा) on 2010-10-27

Added event callback support, Implemented GetAllSetNames DBus API method and added a test file to run for event handling

18. By Manish Sinha (मनीष सिन्हा) on 2010-10-27

Implemented setup script using distutils

=== modified file 'README'
--- README	2010-10-27 12:40:29 +0000
+++ README	2010-10-27 20:47:48 +0000
@@ -1,4 +1,5 @@
-Cheers is a trophya warding framework. It runs as a daemon activating a DBus Session bus over which applications can talk to it.
+Cheers is a trophy awarding framework. It runs as a daemon activating a DBus Session bus over which applications can talk to it.
+The aim of cheers is to have a centralized system where all the trophies can be stored. This removes the reduendency of every application with requirements which sounds like trophjy/medal/badges to have their own implementation.
 
 It is written using python, sqlite, dbus
 
 
=== modified file 'cheers/client.py'
--- cheers/client.py	2010-10-27 12:00:33 +0000
+++ cheers/client.py	2010-10-27 20:47:48 +0000
@@ -23,6 +23,9 @@
 from config import *
 from datamodel import *
 
+from dbus.mainloop.glib import DBusGMainLoop
+DBusGMainLoop(set_as_default=True)
+
 class Cheers(object):
     """ The actual client which interfaces with the OMG Daemon """
 
@@ -32,66 +35,87 @@
         bus = dbus.SessionBus()
         self.__interface = bus.get_object(CHEERS_BUS_NAME, CHEERS_OBJECT_PATH)
 
-    def AwardTrophy(self, id, setname):
+    def connect(self, signal, callback, **kwargs):
+        """Connect a callback to a signal of the current proxy instance."""
+        def _callback(*args, **kwargs):
+            callback(args)
+        self.__interface.connect_to_signal(signal, _callback, sender_keyword='sender')
+
+    def trophy_awarded(self, callback, **kwargs):
+        """ Connect the callback to TrophyAwarded signal """
+        
+        self.connect("TrophyAwarded", callback)
+    
+    def trophy_deleted(self, callback, **kwargs):
+        """ Connect the callback to TrophyDeleted signal """
+        
+        self.connect("TrophyDeleted", callback)
+    
+    def trophy_unawarded(self, callback, **kwargs):
+        """ Connect the callback to TrophyUnAwarded signal """
+        
+        self.connect("TrophyUnAwarded", callback)
+
+    def award_trophy(self, id, setname):
         """ Awards the trophy specified by it's id and the setName. 
 
         Even though the id contains the setname, it is required that setname be explicitly passed
-        If the trophy has been registered, then it is awarded a small notify-osd(libnotify) notification is shown.
+        If the trophy has been registered, then a notify-osd(libnotify) notification is shown.
         If the trophy is not registered or has already been awarded, then nothing happens. Call GetTrophy(id,set) to check whether it trophy exists or has already been awarded.
         """
         self.__interface.AwardTrophy(id)
 
-    def DeleteTrophy(self, id, setname):
+    def delete_trophy(self, id, setname):
         """ Deletes the trophy permanently from the trophy store. 
         
         This is reverse of registering a trophy. This action is irreversible. Use with caution """
 
         self.__interface.DeleteTrophy(id)
 
-    def UnAwardTrophy(self, id):
+    def unaward_trophy(self, id):
         """ Do the reverse of awarding the trophy. Useful for debugging purposes """
     
         self.__interface.UnAwardTrophy(id)
     
 
-    def GetTrophies(self):
+    def get_trophies(self):
         """ Get all the trophies registsred by OMG """
 
         trophy_list = self.__interface.GetTrophies()
         return [self.__UnwrapTrophy(trp) for trp in trophy_list]
 
-    def GetTrophy(self, id):
+    def get_trophy(self, id):
         """ Get a trophy given it's id and setname """
 
         trophy = self.__interface.GetTrophy(str(id))
         return self.__UnwrapTrophy(trophy)
 
-    def GetTrophyBySet(self, setname):
+    def get_trophy_by_set(self, setname):
         """ Get all the trophies for the supplied set """
 
         trophy_list = self.__interface.GetTrophyBySet(str(setname))
         return [self.__UnwrapTrophy(trp) for trp in trophy_list]
 
-    def GetTrophyByApp(self, appname):
+    def get_trophy_by_app(self, appname):
         """ Get all the trophies registered by a specific application"""
 
         trophy_list = self.__interface.GetTrophyByApp(str(appname))
         return [self.__UnwrapTrophy(trp) for trp in trophy_list]
 
-    def GetTrophy(self, id):
+    def get_trophy(self, id):
         """ Get the trophie registered by it's ID"""
 
         trophy_list = self.__interface.GetTrophyById(str(id))
         return [self.__UnwrapTrophy(trp) for trp in trophy_list]
 
-    def GetAllSetNames(self):
+    def get_all_setnames(self):
         """ Get the name of all the Trophy sets """
 
         set_names = self.__interface.GetAllSetNames()
         return [str(name) for name in set_names]
 
 
-    def Quit(self):
+    def quit(self):
         """ Exits the OMG Daemon """
         try:
             self.__interface.Quit()
 
=== modified file 'cheers/config.py'
--- cheers/config.py	2010-10-27 12:40:29 +0000
+++ cheers/config.py	2010-10-27 20:47:48 +0000
@@ -62,6 +62,7 @@
 fetch_history = "SELECT * FROM history WHERE id=?"
 fetch_set_byname = "SELECT * FROM appset WHERE setname=?"
 fetch_app_byapp = "SELECT * FROM app where app=?"
+fetch_sets = "SELECT setname FROM appset"
 
 award_trophy_command = "UPDATE trophy SET unlocked=1 WHERE id=?"
 unaward_trophy_command = "UPDATE trophy SET unlocked=0 WHERE id=?"
 
=== modified file 'cheers/datastore.py'
--- cheers/datastore.py	2010-10-27 12:00:33 +0000
+++ cheers/datastore.py	2010-10-27 20:47:48 +0000
@@ -130,7 +130,7 @@
                                                                         appid, \
                                                                         setid, \
                                                                         int(json_data["priority"]), \
-                                                                        bool(json_data["unlocked"]), \
+                                                                        0, \
                                                                         timestamp, \
                                                                         json_data["stockicon"]))
                 
@@ -196,6 +196,12 @@
         
         return trophy_list
     
+    def GetSetList(self):
+        """ Get a list of app the sets present in the database """
+        
+        set_list = self.__cur.execute(config.fetch_sets)
+        return [setname[0] for setname in set_list.fetchall()]
+    
     def _CreateTrophyDBus(self, desc_list, trp):
         """ Create the DBus representation of Trophy which is to be sent
         over DBus matching the signature a(ssaasssssisbxs) 
 
=== modified file 'cheers/server.py'
--- cheers/server.py	2010-10-27 12:40:29 +0000
+++ cheers/server.py	2010-10-27 20:47:48 +0000
@@ -28,6 +28,7 @@
 import json
 import gio
 import glib
+import pynotify
 import gtk
 import threading
 
@@ -200,13 +201,5 @@
     
     @dbus.service.method(config.CHEERS_BUS_NAME, out_signature='as')
     def GetAllSetNames(self):
-        pass
-
-
-class MyThread(threading.Thread):
-    def __init__(self, notifier):
-        self.__notifier = notifier
-        threading.Thread.__init__ ( self )
-    def run(self):
-        print("inotify started")
-        self.__notifier.loop()
+        """ Get the list of all the trophy set known by cheers """
+        return self.__store.GetSetList()
 
=== added file 'cheers/test_client.py'
--- cheers/test_client.py	1970-01-01 00:00:00 +0000
+++ cheers/test_client.py	2010-10-27 20:47:48 +0000
@@ -0,0 +1,41 @@
+# The MIT/X11/Expat License
+# Copyright (c) 2010 Seif Lotfy<[e-mail]>
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+from client import Cheers
+import gtk
+
+
+def handle_awarded(trophies):
+    print "Awarded"
+
+def handle_deleted(trophies):
+    print "Deleted"
+
+def handle_unawarded(trophies):
+    print "Unawarded"
+
+cheers = Cheers()
+
+cheers.trophy_awarded(handle_awarded)
+cheers.trophy_deleted(handle_deleted)
+cheers.trophy_unawarded(handle_unawarded)
+
+gtk.main()
 
=== modified file 'setup.py'
--- setup.py	2010-10-03 18:20:14 +0000
+++ setup.py	2010-10-27 20:47:48 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(name='cheers',
+        version='0.1.0',
+        description='Trophy awarding framework',
+        long_description='Cheers is a trophy awarding framework. It runs as a daemon activating a DBus Session bus over which applications can talk to it. The aim of cheers is to have a centralized system where all the trophies can be stored. This removes the reduendency of every application with requirements which sounds like trophjy/medal/badges to have their own implementation.',
+        author='Manish Sinha',
+        author_email='[e-mail]',
+        url='http://cheers-project.com/',
+        license='MIT/X11/Expat License',
+        platforms='Posix; MacOSX',
+        py_modules=['cheers.client',
+                    'cheers.config',
+                    'cheers.datamodel',
+                    'cheers.datastore',
+                    'cheers.server'],
+        scripts=['cheers-daemon'],
+        data_files=[('share/doc/apt-offline', ['LICENSE',
+                    'MAINTAINERS', 'README'])]
+     )