Hack Dan's DataStore for doing what we need for 6th March demo.

1 files changed, 5 insertions, 147 deletions

diff --git a/listview.py b/listview.py
index 0f6107b..36e8551 100644
--- a/listview.py
+++ b/listview.py
@@ -20,6 +20,7 @@ import gobject
 import gtk
 
 from sugar.activity import activity
+from sugar.datastore import datastore
 from sugar.graphics import color
 from sugar.graphics import units
 from sugar.graphics.canvasicon import CanvasIcon
@@ -47,149 +48,7 @@ class ListView(hippo.CanvasWidget, hippo.CanvasItem):
 
         hippo.CanvasWidget.__init__(self)
 
-        self._model = [
-            { 'date'    : 1000900000,
-              'title'   : 'Fishes in the Sea',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C2B00C,#785C78',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Marco',
-                              'color' : '#C2B00C,#785C78' },
-                            { 'name'  : 'Dan', 
-                              'color' : '#75C228,#3A6E3A' } ]
-            },
-            { 'date'    : 1000800000,
-              'title'   : 'Thai history',
-              'preview' : None,
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : True,
-              'buddies' : [ { 'name'  : 'Tomeu',
-                              'color' : '#C29CFD,#308C30' },
-                            { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' } ]
-            },
-            { 'date'    : 1000700000,
-              'title'   : 'A Photo of My Cat 4',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C2B00C,#785C78',
-              'keep'    : False,
-              'buddies' : []
-            },
-            { 'date'    : 1000600000,
-              'title'   : 'A Photo of My Cat',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon2.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : True,
-              'buddies' : []
-            },
-            { 'date'    : 1000500000,
-              'title'   : 'About Cats',
-              'preview' : None,
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' } ]
-            },
-            { 'date'    : 1000400000,
-              'title'   : 'Our school',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon2.svg'),
-              'icon-color' : '#C2B00C,#785C78',
-              'keep'    : True,
-              'buddies' : [ { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' },
-                            { 'name'  : 'Marco',
-                              'color' : '#C2B00C,#785C78' },
-                            { 'name'  : 'Dan', 
-                              'color' : '#75C228,#3A6E3A' } ]
-            },
-            { 'date'    : 1000800000,
-              'title'   : 'Thai history',
-              'preview' : None,
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon2.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Tomeu',
-                              'color' : '#C29CFD,#308C30' },
-                            { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' } ]
-            },
-            { 'date'    : 1000700000,
-              'title'   : 'A Photo of My Cat 4',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C2B00C,#785C78',
-              'keep'    : False,
-              'buddies' : []
-            },
-            { 'date'    : 1000600000,
-              'title'   : 'A Photo of My Cat',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon2.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : False,
-              'buddies' : []
-            },
-            { 'date'    : 1000500000,
-              'title'   : 'About Cats',
-              'preview' : None,
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon2.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' } ]
-            },
-            { 'date'    : 1000400000,
-              'title'   : 'Our school',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C2B00C,#785C78',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' },
-                            { 'name'  : 'Marco',
-                              'color' : '#C2B00C,#785C78' },
-                            { 'name'  : 'Dan', 
-                              'color' : '#75C228,#3A6E3A' } ]
-            },
-            { 'date'    : 1000600000,
-              'title'   : 'A Photo of My Cat',
-              'preview' : None,
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : False,
-              'buddies' : []
-            },
-            { 'date'    : 1000500000,
-              'title'   : 'About Cats',
-              'preview' : os.path.join(activity.get_bundle_path(), 'preview.png'),
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon2.svg'),
-              'icon-color' : '#C29CFD,#308C30',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' } ]
-            },
-            { 'date'    : 1000400000,
-              'title'   : 'Our school',
-              'preview' : None,
-              'icon'    : os.path.join(activity.get_bundle_path(), 'icon1.svg'),
-              'icon-color' : '#C2B00C,#785C78',
-              'keep'    : False,
-              'buddies' : [ { 'name'  : 'Eben', 
-                              'color' : '#0C3A19, #356835' },
-                            { 'name'  : 'Marco',
-                              'color' : '#C2B00C,#785C78' },
-                            { 'name'  : 'Dan', 
-                              'color' : '#75C228,#3A6E3A' } ]
-            }
-        ]
-
-        self._entries = None
+        self._entries = datastore.find('')
 
         self._box = hippo.CanvasBox()
         self._box.props.background_color = color.DESKTOP_BACKGROUND.get_int()
@@ -209,16 +68,15 @@ class ListView(hippo.CanvasWidget, hippo.CanvasItem):
         canvas.show()
 
     def update_with_query(self, query):
-        self._entries = self._model #journalmodel.execute_query(query)
+        self._entries = datastore.find(query)
         self._update()
 
     def _update(self):
-        self.remove_all()
+        self._box.remove_all()
         for entry in self._entries:
             hbox = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL,
                                    spacing=units.points_to_pixels(5))
-            
-            fav_icon = KeepIcon(entry['keep'])
+            fav_icon = KeepIcon(entry.get_metadata()['keep'] == '1')
             hbox.append(fav_icon)
 
             if self._expanded: