Trying to improve threading for the location

[gigfinder] / src / opt / gigfinder / gigfinder.py

diff --git a/src/opt/gigfinder/gigfinder.py b/src/opt/gigfinder/gigfinder.py
index 7e159ef..c5dc609 100755 (executable)
--- a/src/opt/gigfinder/gigfinder.py
+++ b/src/opt/gigfinder/gigfinder.py
@@ -39,6 +39,7 @@ class GigFinder:
         self.events = Events()
         self.win = hildon.StackableWindow()
         self.app_title = "Gig Finder"
+        self.update_thread = Thread(target=self.update_gigs)
 
     def main(self):
         """ Build the gui and start the update thread """
@@ -48,11 +49,14 @@ class GigFinder:
         self.win.set_title(self.app_title)
         self.win.connect("destroy", gtk.main_quit, None)
         self.win.set_app_menu(menu)
+        self.add_button_area()
 
-        Thread(target=self.update_gigs).start()
+        self.update_thread.start()
 
         self.win.show_all()
+       gtk.gdk.threads_enter()
         gtk.main()
+       gtk.gdk.threads_leave()
 
     def show_about(self, widget, data):
         """ Show about dialog """
@@ -70,7 +74,7 @@ class GigFinder:
         self.win.set_title(self.app_title)
         self.location.reset()
         self.win.remove(self.pannable_area)
-        Thread(target=self.update_gigs).start()
+        self.update_thread.start()
 
     def update_gigs(self):
         """ Get gig info """
@@ -86,13 +90,12 @@ class GigFinder:
         else:
             self.location.lat = float(51.517369)
             self.location.long = float(-0.082998)
-
+         
         events = self.events.get_events(self.location.lat, 
                                         self.location.long, 
-                                        self.distance)
-        gobject.idle_add(self.hide_message)
+                                        self.distance,)
         gobject.idle_add(self.show_events, events)
-        thread.exit()
+        gobject.idle_add(self.hide_message)
 
     def show_message(self, message):
         """ Set window progress indicator and show message """
@@ -141,7 +144,7 @@ class GigFinder:
     def show_details(self, widget, data):
         """ Open new window showing gig details """
         win = hildon.StackableWindow()
-        win.set_title(data['title'])
+        win.set_title(data.title)
 
         win.vbox = gtk.VBox()
         win.add(win.vbox)
@@ -155,40 +158,32 @@ class GigFinder:
         view.set_wrap_mode(gtk.WRAP_WORD)
         buffer = view.get_buffer()
         end = buffer.get_end_iter()
-        buffer.insert(end, '%s\n' % data['title'])
-        buffer.insert(end, 'Artists: %s\n' % data['artists'])
-        buffer.insert(end, 'Venue: %s\n' % data['venue'])
-        buffer.insert(end, '%s\n' % data['address'])
-        buffer.insert(end, 'When: %s\n' % data['date'].strftime('%H:%M %d/%M/%Y'))
+        buffer.insert(end, '%s\n' % data.title)
+        buffer.insert(end, 'Artists: %s\n' % data.artists)
+        buffer.insert(end, 'Venue: %s\n' % data.venue_name)
+        buffer.insert(end, '%s\n' % data.address)
+        buffer.insert(end, 'When: %s\n' % data.start_date.strftime('%H:%M %d/%m/%Y'))
         buffer.insert(end, '\n')
         scroll.add_with_viewport(view)
 
         win.show_all()
 
-    def add_table(self):
-        """ Add table for events """
-        self.table = gtk.Table(columns=1)
-        self.table.set_row_spacings(10)
-        self.table.set_col_spacings(10)
-
+    def add_button_area(self):
+        self.box = gtk.VBox(True,0)
         self.pannable_area = hildon.PannableArea()
-        self.pannable_area.add_with_viewport(self.table)
+        self.pannable_area.add_with_viewport(self.box)
         self.pannable_area.show_all()
         self.win.add(self.pannable_area)
         
     def add_events(self, events):
         """ Add a table of buttons """
-        self.add_table()
-        pos = 0
-        
         for event in events:
             button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, 
                                    hildon.BUTTON_ARRANGEMENT_VERTICAL)
-            button.set_text(event['title'], "distance: %0.02f km" % event['distance'])
+            button.set_text(event.title, "distance: %0.02f km" % event.get_distance_from(self.location.long, self.location.lat))
             button.connect("clicked", self.show_details, event)
-            self.table.attach(button, 0, 1, pos, pos+1, yoptions=gtk.FILL)
-            pos += 1
-        self.table.show_all()
+            self.box.pack_start(button)
+        self.box.show_all()
             
 if __name__ == "__main__":
     finder = GigFinder()