Merge lp:~kamstrup/unity-lens-music/u1-tweaks into lp:~alexlauni/unity-lens-music/musicstore

[Mikkel Kamstrup Erlandsen]

Fixes to Alex' U1 music store branch

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'src/musicstore-collection.vala'
--- src/musicstore-collection.vala	2011-09-14 18:33:52 +0000
+++ src/musicstore-collection.vala	2011-09-15 15:15:11 +0000
@@ -39,7 +39,6 @@
       if (uri == null)
 	return;	  
       
-      debug ("searching %s", uri);
       File file = File.new_for_uri (uri);
 
 //    if (cancellable != null) {
@@ -53,6 +52,9 @@
 
     private async void read_musicstore_search_result_async (File file, Dee.Model model)
     {
+      var timer = new Timer ();
+      debug ("Searching %s", file.get_uri ());
+      
       try {
 	var dis = new DataInputStream (file.read (cancellable));
 	var parser = new Json.Parser ();
@@ -85,16 +87,19 @@
 	  }
         }
 	cancellable = null;
+	debug ("Retrieved '%s' in %fms", file.get_uri (), timer.elapsed()*1000);
 
       } catch (Error e) {
-	stdout.printf (e.message);
+	warning ("Error reading URL '%s': %s", file.get_uri (), e.message);
       }
     }
 
-    private string build_search_uri (string query, List<FilterParser> filters)
+    private string? build_search_uri (string query, List<FilterParser> filters)
     {
+      if (query.strip() == "")
+        return null;
+    
       MusicStoreFilterParser store_parser;
-
       StringBuilder uri = new StringBuilder (MUSICSTORE_BASE_URI);
       uri.append ("search?q=");
       uri.append (Uri.escape_string (query, "", false));
@@ -115,4 +120,4 @@
       return uri.str;
     }
   }
-}
\ No newline at end of file
+}

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2011-09-14 18:33:52 +0000
+++ src/musicstore-scope.vala	2011-09-15 15:15:11 +0000
@@ -30,7 +30,7 @@
       base ();
 
       scope = new Unity.Scope ("/com/canonical/unity/scope/musicstore");
-      scope.search_in_global = true;
+      scope.search_in_global = false;
       scope.activate_uri.connect (activate);
 
       base.initialize ();
@@ -59,10 +59,13 @@
     public override void perform_search (LensSearch? search, Dee.Model results_model,
 					 List<FilterParser> filters, int max_results = -1)
     {
+      if (search_is_invalid (search))
+        return;
+      
       try {
 	collection.search (search, results_model, filters, max_results);	  
       } catch (IOError e) {
-	stdout.printf (e.message);
+	warning ("Failed to search for '%s': %s", search.search_string, e.message);
       }
     }
 
@@ -83,4 +86,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

=== modified file 'src/simple-scope.vala'
--- src/simple-scope.vala	2011-09-14 18:33:52 +0000
+++ src/simple-scope.vala	2011-09-15 15:15:11 +0000
@@ -85,9 +85,9 @@
     /* 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)
+    private async void update_without_search_async (LensSearch search, Dee.Model results_model)
     {
-      perform_search_async.begin (search, num_results_without_search);
+      perform_search_async.begin (search, results_model, num_results_without_search);
     }
     
     /**
@@ -104,7 +104,7 @@
 	  return;
 	}
       
-      perform_search_async.begin (search, num_results_global_search);
+      perform_search_async.begin (search, scope.global_results_model, num_results_global_search);
     }
     
     private async void update_search_async (LensSearch search)
@@ -112,20 +112,20 @@
       // just pretend like there's no search
       if (search_is_invalid (search))
 	{
-	  update_without_search_async.begin (search);
+	  update_without_search_async.begin (search, scope.results_model);
 	  return;
 	}
       
-      perform_search_async.begin (search, num_results_lens_search);
+      perform_search_async.begin (search, scope.results_model, num_results_lens_search);
     }
 
-    private async void perform_search_async (LensSearch search, int max_results)
-    {
-      var results_model = scope.results_model;
-            
+    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 ();
+      
       List<FilterParser> filters = new List<FilterParser> ();
       Filter filter = scope.get_filter ("genre");
       if (filter.filtering)
@@ -134,8 +134,6 @@
       filter = scope.get_filter ("decade");
       if (filter.filtering)
 	filters.append (new DecadeFilterParser (filter as MultiRangeFilter));
-
-      scope.freeze_notify ();
       
       results_model.clear ();
       perform_search (search, results_model, filters, max_results);
@@ -152,7 +150,7 @@
       search.finished ();
     }
 
-    private bool search_is_invalid (LensSearch? search)
+    protected bool search_is_invalid (LensSearch? search)
     {
       /* This boolean expression is unfolded as we seem to get
        * some null dereference if we join them in a big || expression */