Merge lp:~manishsinha/cheers/fixed-getsets into lp:cheers

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

Fixed the GetSets method problem

=== modified file 'cheers/datamodel.py'
--- cheers/datamodel.py	2010-11-07 14:49:24 +0000
+++ cheers/datamodel.py	2010-11-30 20:13:59 +0000
@@ -32,8 +32,7 @@
         "stockicon",
         "application",
         "title",
-        "description",
-        "private_application_annotations"
+        "description"
         ]
 
 TROPHY_SET_KEYS = [
 
=== modified file 'cheers/datastore.py'
--- cheers/datastore.py	2010-11-14 18:54:38 +0000
+++ cheers/datastore.py	2010-11-30 20:13:59 +0000
@@ -37,8 +37,16 @@
     
     def __init__(self):
         self.database = CouchDatabase(config.desktopcouch_db, create=True)
-        self.trophy_view = 'function(doc) { emit(doc.record_type, doc); }'
-        self.trophy_sets_view = 'function(doc) { emit(doc.record_type, doc); }'
+        self.trophy_view = """function(doc) {
+	        					if (doc.record_type == 'http://cheers-project.com/records/Trophy')
+	        					{
+	        						emit(doc.record_type, doc); }
+	        				}"""
+        self.trophy_sets_view = """function(doc) {
+	        					if (doc.record_type == 'http://cheers-project.com/records/TrophySet')
+	        					{
+	        						emit(doc.record_type, doc); }
+	        				}"""
         self.single_trophy_view = 'function(doc) { emit([doc.record_type, doc.id], doc); }'
         self.database.add_view("trophies", self.trophy_view, None, "cheers")
         self.database.add_view("trophy_sets", self.trophy_sets_view, None, "cheers")
@@ -57,8 +65,9 @@
         #FIXME: There must be a more elegant way of doing this
         results = self.database.execute_view(rec_type, "cheers")
         for rec in results:
-            if not ids or rec["value"]["id"] in ids:
-                yield rec
+			print rec
+			if not ids or rec["value"]["id"] in ids:
+				yield rec
     
     def get_trophies(self, ids=None):
         """ Get all the trophies registered in cheers """
@@ -75,11 +84,12 @@
              rec["value"]["private_application_annotations"]["cheers"]["awarded"]:
                 yield rec["value"]
 
-    def get_sets(self, ids):
+    def get_sets(self, ids=None):
         """ Get all the trophies registered in cheers """
         #FIXME: There must be a more elegant way of doing this
+        print "***************"
         for rec in self._get_records("trophy_sets", ids):
-            yield rec["value"]
+            yield rec["value"]["id"]
 
     def delete_trophy(self, id):
         """ Delete the trophy for the provided id """
 
=== modified file 'cheers/logic.py'
--- cheers/logic.py	2010-11-14 19:08:30 +0000
+++ cheers/logic.py	2010-11-30 20:13:59 +0000
@@ -109,6 +109,7 @@
         return set(trophy.keys()) == set(datamodel.TROPHY_KEYS)
     
     def _is_trophy_set_valid(self, trophy_set):
+        print trophy_set.keys()
         return set(trophy_set.keys()) == set(datamodel.TROPHY_SET_KEYS)
     
     def get_trophy(self, id):
@@ -125,9 +126,10 @@
         trophy_list = self.__store.get_awarded_trophies()
         return [datamodel.TrophyDBus(trophy) for trophy in trophy_list]
 
-    def get_sets(self, ids):
+    def get_sets(self):
         """ Get all the trophy sets in cheers """
-        pass
+        return [i for i in self.__store.get_sets()]
+
 
     def delete_trophy(self, id):
         """ Delete the trophy for the provided id """
 
=== modified file 'cheers/server.py'
--- cheers/server.py	2010-11-14 19:08:30 +0000
+++ cheers/server.py	2010-11-30 20:13:59 +0000
@@ -60,11 +60,10 @@
 
         return self.logic.get_trophies()
     
-    @dbus.service.method(config.CHEERS_BUS_NAME)
-    def GetSet(self, setid_list):
+    @dbus.service.method(config.CHEERS_BUS_NAME, out_signature='as')
+    def GetSets(self):
         """ Get the list of all the trophy sets available in cheers """
-
-        return self.logic.get_sets(setid_list)
+        return self.logic.get_sets()
         
     @dbus.service.method(config.CHEERS_BUS_NAME, out_signature='a(saasaasssssb)')
     def GetAwardedTrophies(self):
 
=== modified file 'samples/valid.set'
--- samples/valid.set	2010-11-05 15:21:41 +0000
+++ samples/valid.set	2010-11-30 20:13:59 +0000
@@ -13,3 +13,4 @@
     "fr-fr": "Un Set des Trophies pour les grandes"
   }
 }
+
 
=== added file 'samples/valid.trophy'
--- samples/valid.trophy	1970-01-01 00:00:00 +0000
+++ samples/valid.trophy	2010-11-30 20:13:59 +0000
@@ -0,0 +1,17 @@
+{
+  "record_type": "http://cheersproject.example.org/records/trophy",
+  "id": "some-id-for-trophy",
+  "trophyset": "my-great-trophy-set",
+  "trophyicon": "gtk-info", 
+  "stockicon": "gtk-info",
+  "application": "application://banshee.desktop",
+  "title": {
+    "default": "My Great Trophy",
+    "fr-fr": "Mon Trophie a la Magnifique"
+  },
+  "description": {
+    "default": "You must be really great! That's why you've got this trophy.",
+    "fr-fr": "Vous êtes tres magnifique!"
+  }
+}
+