Merge lp:~mhr3/unity-lens-music/new-libunity-api into lp:unity-lens-music/0.3

[Michal Hruby]

Use libunity-5.0 API.

[Mirco Müller (macslow)]

Looking good to me. +1 from me, but I would suggest someone else, with more experience in dee/lenses takes a look at this too, before marking it as "Approved".

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-09-29 15:16:02 +0000
+++ configure.ac	2011-12-07 11:23:23 +0000
@@ -64,7 +64,7 @@
                   sqlite3 >= 3.7.7
                   gee-1.0
 		  json-glib-1.0
-                  unity >= 4.0.2)
+                  unity >= 4.99.0)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)
 AC_SUBST(LENS_DAEMON_LIBS)
 
=== modified file 'src/simple-scope.vala'
--- src/simple-scope.vala	2011-09-15 14:34:15 +0000
+++ src/simple-scope.vala	2011-12-07 11:23:23 +0000
@@ -31,63 +31,37 @@
 
     protected abstract void perform_search (LensSearch? search, Dee.Model results_model, List<FilterParser> filters, int max_results = -1);
     
-    protected bool is_dirty;
-    protected LensSearch? previous_search;
-
     public SimpleScope ()
     {
-      is_dirty = true;
-      previous_search = null;
     }
 
     protected void initialize ()
     {
       /* Listen for filter changes */
-      scope.filters_changed.connect(
-				    () => { 
-				      if (scope.active_search != null)
-					{
-					  is_dirty = true;
-					  scope.notify_property ("active-search");
-					}
-				    }
-				    );
-      
+      scope.filters_changed.connect (() => {
+        scope.queue_search_changed (SearchType.DEFAULT);
+      });
+
+      /* No need to search if only the whitespace changes */
+      scope.generate_search_key.connect ((lens_search) => {
+        return lens_search.search_string.strip ();
+      });
+
       /* Listen for changes to the lens search entry */
-      scope.notify["active-search"].connect (
-					     (obj, pspec) => { 
-					       var search = scope.active_search;
-					       if (!(is_dirty || search_has_really_changed (previous_search, search)))
-						 return;
-					       is_dirty = false;
-					       update_search_async.begin (search);
-					       previous_search = search;
-					     }
-					     );
-      
-      /* Listen for changes to the global search */
-      scope.notify["active-global-search"].connect (
-						    (obj, pspec) => { 
-						      var search = scope.active_global_search;
-						      
-						      if (search_is_invalid (search))
-							return;
-						      
-						      if (!search_has_really_changed (previous_search, search))
-							return;
-						      
-						      update_global_search_async.begin (search);
-						      previous_search = search;
-						    }
-						    );
+      scope.search_changed.connect ((search, search_type, cancellable) => {
+        if (search_type == SearchType.DEFAULT)
+          update_search_async.begin (search);
+        else
+          update_global_search_async.begin (search);
+      });
     }
 
     /* based on the filters(?) get the default results to show when the music lens is
      * just opened without filters, like when someone hits Super+M
      */
-    private async void update_without_search_async (LensSearch search, Dee.Model results_model)
+    private async void update_without_search_async (LensSearch search)
     {
-      perform_search_async.begin (search, results_model, num_results_without_search);
+      yield perform_search_async (search, num_results_without_search);
     }
     
     /**
@@ -96,15 +70,14 @@
      */
     private async void update_global_search_async (LensSearch search)
     {
-      var results_model = scope.global_results_model;
-      
       if (search_is_invalid (search))
-	{
-	  results_model.clear ();
-	  return;
-	}
-      
-      perform_search_async.begin (search, scope.global_results_model, num_results_global_search);
+      {
+        search.results_model.clear ();
+        search.finished ();
+        return;
+      }
+
+      yield perform_search_async (search, num_results_global_search);
     }
     
     private async void update_search_async (LensSearch search)
@@ -112,20 +85,17 @@
       // just pretend like there's no search
       if (search_is_invalid (search))
 	{
-	  update_without_search_async.begin (search, scope.results_model);
+	  yield update_without_search_async (search);
 	  return;
 	}
       
-      perform_search_async.begin (search, scope.results_model, num_results_lens_search);
+      yield perform_search_async (search, num_results_lens_search);
     }
 
-    private async void perform_search_async (LensSearch search, Dee.Model results_model, int max_results)
-    {       
-      /* Prevent concurrent searches and concurrent updates of our models,
-       * by preventing any notify signals from propagating to us.
-       * Important: Remeber to thaw the notifys again! */
-      scope.freeze_notify ();
-      
+    private async void perform_search_async (LensSearch search, int max_results)
+    {
+      var results_model = search.results_model;
+
       List<FilterParser> filters = new List<FilterParser> ();
       Filter filter = scope.get_filter ("genre");
       if (filter.filtering)
@@ -138,15 +108,6 @@
       results_model.clear ();
       perform_search (search, results_model, filters, max_results);
       
-      /* Allow new searches once we enter an idle again.
-       * We don't do it directly from here as that could mean we start
-       * changing the model even before we had flushed out current changes
-       */
-      Idle.add (() => {
-	  scope.thaw_notify ();
-	  return false;
-	});
-      
       search.finished ();
     }
 
@@ -161,52 +122,5 @@
       
       return search.search_string.strip() == "";
     }
-    
-    private bool search_has_really_changed (LensSearch? old_search,
-					    LensSearch? new_search)
-    {
-      if (old_search == null && new_search == null)
-	return false;
-      
-      string s1, s2;
-      
-      if (old_search == null)
-        {
-	  s1 = new_search.search_string;
-	  if (s1 == null || s1.strip() == "")
-	    return false;
-	  else
-	    return true;
-        }
-      else if (new_search == null)
-	{
-	  s2 = old_search.search_string;
-	  if (s2 == null || s2.strip() == "")
-	    return false;
-	  else
-	    return true;
-	}
-      else
-	{
-	  s1 = new_search.search_string;
-	  s2 = old_search.search_string;
-	  if (s1 == null)
-	    {
-	      if (s2 == null || s2.strip() == "")
-		return false;
-	      else
-		return true;
-	    }
-	  else if (s2 == null)
-	    {
-	      if (s1 == null || s1.strip() == "")
-		return false;
-	      else
-		return true;
-	    }
-	  else
-	    return s1.strip () != s2.strip ();
-	}
-    }
   }
 }