Background loading, initially implemented for search window

[jamaendo] / jamaui / search.py

diff --git a/jamaui/search.py b/jamaui/search.py
index e487765..ec3f366 100644 (file)
--- a/jamaui/search.py
+++ b/jamaui/search.py
@@ -22,11 +22,16 @@
 #  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
 #
 import gtk
-import hildon
+try:
+    import hildon
+except:
+    import helldon as hildon
 import jamaendo
 from playerwindow import open_playerwindow
 from showartist import ShowArtist
 from showalbum import ShowAlbum
+from albumlist import MusicList
+from fetcher import Fetcher
 
 class SearchWindow(hildon.StackableWindow):
     def __init__(self):
@@ -36,22 +41,16 @@ class SearchWindow(hildon.StackableWindow):
 
         vbox = gtk.VBox(False, 0)
 
+        self.fetcher = None
+        self.connect('destroy', self.on_destroy)
 
         # Results list
         self.panarea = hildon.PannableArea()
-        self.result_store = gtk.ListStore(str, int)
-        #self.result_store.append(['red'])
-        self.result_view = gtk.TreeView(self.result_store)
-        col = gtk.TreeViewColumn('Name')
-        self.result_view.append_column(col)
-        cell = gtk.CellRendererText()
-        col.pack_start(cell, True)
-        col.add_attribute(cell, 'text', 0)
-        self.result_view.set_search_column(0)
-        col.set_sort_column_id(0)
-        self.result_view.connect('row-activated', self.row_activated)
-
-        self.panarea.add(self.result_view)
+        self.musiclist = MusicList()
+        self.musiclist.loading_message = "Nothing found yet"
+        self.musiclist.empty_message = "No matching results"
+        self.musiclist.connect('row-activated', self.row_activated)
+        self.panarea.add(self.musiclist)
         vbox.pack_start(self.panarea, True, True, 0)
 
 
@@ -98,6 +97,11 @@ class SearchWindow(hildon.StackableWindow):
         self.menu.show_all()
         self.set_app_menu(self.menu)
 
+    def on_destroy(self, wnd):
+        if self.fetcher:
+            self.fetcher.stop()
+            self.fetcher = None
+
     def mode_changed(self, selector, user_data):
         pass
         #current_selection = selector.get_current_text()
@@ -105,28 +109,65 @@ class SearchWindow(hildon.StackableWindow):
     def on_search(self, w):
         mode = self.mode.get_active()
         txt = self.entry.get_text()
-        self.result_store.clear()
+        self.musiclist.set_loading(False)
+        self.musiclist.get_model().clear()
+
+        if self.fetcher:
+            self.fetcher.stop()
+            self.fetcher = None
+
+        itemgen = None
         if mode == 0:
-            for artist in jamaendo.search_artists(query=txt):
-                title = artist.name
-                self.idmap[artist.ID] = artist
-                self.result_store.append([title, artist.ID])
+            itemgen = lambda: jamaendo.search_artists(query=txt)
         elif mode == 1:
-            for album in jamaendo.search_albums(query=txt):
-                title = "%s - %s" % (album.artist_name, album.name)
-                self.idmap[album.ID] = album
-                self.result_store.append([title, album.ID])
+            itemgen = lambda: jamaendo.search_albums(query=txt)
         elif mode == 2:
-            for track in jamaendo.search_tracks(query=txt):
-                title = "%s - %s" % (track.artist_name, track.name)
-                self.idmap[track.ID] = track
-                self.result_store.append([title, track.ID])
+            itemgen = lambda: jamaendo.search_tracks(query=txt)
+        else:
+            return
+
+        self.fetcher = Fetcher(itemgen, self,
+                               on_item = self.on_add_result,
+                               on_ok = self.on_add_ok,
+                               on_fail = self.on_add_fail)
+        self.fetcher.start()
+        '''
+        try:
+            if mode == 0:
+                items = jamaendo.search_artists(query=txt)
+            elif mode == 1:
+                items = jamaendo.search_albums(query=txt)
+            elif mode == 2:
+                items = jamaendo.search_tracks(query=txt)
+
+            for item in items:
+                self.idmap[item.ID] = item
+
+            self.musiclist.add_items(items)
+        except jamaendo.JamaendoAPIException:
+            # nothing found, force redraw
+            self.musiclist.queue_draw()
+        '''
+
+    def on_add_result(self, wnd, item):
+        if wnd is self:
+            self.musiclist.add_items([item])
+            self.idmap[item.ID] = item
+
+    def on_add_ok(self, wnd):
+        if wnd is self:
+            self.fetcher.stop()
+            self.fetcher = None
+
+    def on_add_fail(self, wnd, error):
+        if wnd is self:
+            self.musiclist.queue_draw()
+            self.fetcher.stop()
+            self.fetcher = None
 
     def row_activated(self, treeview, path, view_column):
-        treeiter = self.result_store.get_iter(path)
-        title, _id = self.result_store.get(treeiter, 0, 1)
+        _id = self.musiclist.get_item_id(path)
         item = self.idmap[_id]
-        #print _id, item
         self.open_item(item)
 
     def open_item(self, item):