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

[Alex Launi]

Implements a scope to search the music store for tracks and albums available for purchase. Reworks quite a bit of the original lens to avoid duplicated code between the two scopes. Leaves lots of room for more scopes to be added very easily using the framework provided.

[Mikkel Kamstrup Erlandsen (kamstrup)]

CODE:
Compiles almost without warnings froms gcc, which is a welcome feature compared to our other Vala projects! :-D

data/musicstore-scope.service.in, src/Makefile.am:
Can we prefix the musicstore-scope-daemon with unity-* like all the lens daemons? That makes process management so much easier.

Would it make sense to do a rename 's/musicstore/u1musicstore/' and 's/MusicStore/U1MusicStore/' in filenames and classes? Is it inconceivable to we'll ever add another music store?

774 +// if (cancellable != null) {
775 +// cancellable.cancel ();
776 +// cancellable = null;
777 +// }
778 +
779 + cancellable = new Cancellable ();

Delete these lines?^^

IN PRACTICE:
It appears that the entire music lens daemon becomes unresponsive until the musicstore scope daemon has replied - which blocks until it gets an answer from the u1 search service (which seems to be somewhat unreliable). I am trying to figure out if this is a bug in libunity or because it's an issue with the musicstore/music-lens.

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

Just for note: Testing this unveils bugs in libunity as I go along. I am pushing these fixes to lp:~kamstrup/libunity/fixes-2011-09-15

[Mikkel Kamstrup Erlandsen (kamstrup)]

It also seems that both the main banshee scope as well as the u1 scope is searched when performing a global search - although the results does not show in the global result set.

I just took this by John on IRC. The intended behavior is that the results from your local collection are added to the global results, while the u1 store is not searched in the global dash search.

[Mikkel Kamstrup Erlandsen (kamstrup)]

I just rolled libunity-4.0.4 that contains some fixes very relevant for the u1 scope. Namely that each scope (remote or not) is run async when we search it. This means that the IN PRACTICE note in comment #1 no longer appears to be a problem.

[Mikkel Kamstrup Erlandsen (kamstrup)]

@Alex: I put up lp:~kamstrup/unity-lens-music/u1-tweaks for merging into this branch.

[Neil J. Patel (njpatel)]

Updated the daemon name to unity-musicstore-daemon, removed the commented out code. I left the naming of the classes as this is the only one we'll ship with the Lens, so no need to worry about classified naming. Merged.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-09 17:28:19 +0000
+++ Makefile.am	2011-09-14 18:37:04 +0000
@@ -1,12 +1,15 @@
 SUBDIRS = src data po
 
 #
-# Install the music.lens file
+# Install the music.lens and musicstore.scope files
 #
 lens_in_files = music.lens.in
 lensdir = $(LENSESDIR)/music
 lens_DATA = $(lens_in_files:.lens.in=.lens)
 
+scopedir = $(lensdir)
+scope_DATA = musicstore.scope
+
 icondir = $(datadir)/unity/themes
 
 @INTLTOOL_LENS_RULE@
@@ -16,26 +19,27 @@
 # ChangeLog file created at distcheck time
 dist-hook:
 	@if test -d "$(srcdir)/.bzr"; \
-  	then \
-    	echo Creating ChangeLog && \
+	then \
+	echo Creating ChangeLog && \
       ( cd "$(top_srcdir)" && \
-      	echo '# Generated by Makefile. Do not edit.'; echo; \
+	echo '# Generated by Makefile. Do not edit.'; echo; \
         $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
         && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
         || (rm -f ChangeLog.tmp; \
 					echo Failed to generate ChangeLog >&2 ); \
 	else \
-  	echo Failed to generate ChangeLog: not a branch >&2; \
+	echo Failed to generate ChangeLog: not a branch >&2; \
   fi
 
 EXTRA_DIST = \
   autogen.sh \
   $(lens_in_music) \
+  $(scope_DATA) \
   AUTHORS \
   COPYING \
   MAINTAINERS \
   README
 
 CLEANFILES = \
-  $(lens_DATA)
+  $(lens_DATA) 
 

=== modified file 'configure.ac'
--- configure.ac	2011-09-08 16:01:37 +0000
+++ configure.ac	2011-09-14 18:37:04 +0000
@@ -60,12 +60,12 @@
                   gobject-2.0 >= $GLIB_REQUIRED
                   gio-2.0 >= $GLIB_REQUIRED
                   gio-unix-2.0 >= $GLIB_REQUIRED
-                  gee-1.0
                   dee-1.0 >= 0.5.16
                   sqlite3 >= 3.7.7
+                  gee-1.0
+		  json-glib-1.0
                   unity >= 4.0.2)
 
-
 AC_SUBST(LENS_DAEMON_CFLAGS)
 AC_SUBST(LENS_DAEMON_LIBS)
 

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-08-09 17:28:19 +0000
+++ data/Makefile.am	2011-09-14 18:37:04 +0000
@@ -1,5 +1,8 @@
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  unity-lens-music.service.in
+service_in_files =  \
+  unity-lens-music.service.in \
+  musicstore-scope.service.in
+
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
@@ -9,4 +12,5 @@
   $(service_in_files)
 
 CLEANFILES = \
-  unity-lens-music.service
+  unity-lens-music.service \
+  musicstore-scope.service

=== added file 'data/musicstore-scope.service.in'
--- data/musicstore-scope.service.in	1970-01-01 00:00:00 +0000
+++ data/musicstore-scope.service.in	2011-09-14 18:37:04 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.Unity.Scope.MusicStore
+Exec=@libexecdir@/musicstore-scope-daemon

=== added file 'musicstore.scope'
--- musicstore.scope	1970-01-01 00:00:00 +0000
+++ musicstore.scope	2011-09-14 18:37:04 +0000
@@ -0,0 +1,4 @@
+[Scope]
+DBusName=com.canonical.Unity.Scope.MusicStore
+DBusPath=/com/canonical/unity/scope/musicstore
+

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-09-08 17:22:43 +0000
+++ src/Makefile.am	2011-09-14 18:37:04 +0000
@@ -6,7 +6,8 @@
 DATADIR = $(datadir)
 
 libexec_PROGRAMS = \
-  unity-music-daemon
+  unity-music-daemon \
+  musicstore-scope-daemon
 
 unity_music_daemon_CPPFLAGS = \
   -DDATADIR=\"$(DATADIR)\" \
@@ -36,10 +37,15 @@
 unity_music_daemon_VALASOURCES = \
   album.vala \
   banshee-collection.vala \
+  banshee-filter-parser.vala \
+  banshee-filter-parser-decade.vala \
+  banshee-filter-parser-genre.vala \
   banshee-scope.vala \
   config.vala \
   daemon.vala \
   filter-parser.vala \
+  filter-parser-decade.vala \
+  filter-parser-genre.vala \
   genre.vala \
   main.vala \
   simple-scope.vala \
@@ -50,21 +56,59 @@
   $(unity_music_daemon_VALASOURCES:.vala=.c) \
   $(NULL)
 
-BUILT_SOURCES += unity_music_daemon.vala.stamp
+musicstore_scope_daemon_CPPFLAGS = \
+  $(unity_music_daemon_CPPFLAGS)
+
+musicstore_scope_daemon_VALAFLAGS = \
+  --pkg json-glib-1.0 \
+  $(unity_music_daemon_VALAFLAGS)
+
+musicstore_scope_daemon_LDADD = \
+  $(unity_music_daemon_LDADD)
+
+musicstore_scope_daemon_VALASOURCES = \
+  album.vala \
+  config.vala \
+  filter-parser.vala \
+  filter-parser-decade.vala \
+  filter-parser-genre.vala \
+  genre.vala \
+  musicstore-collection.vala \
+  musicstore-daemon.vala \
+  musicstore-filter-parser.vala \
+  musicstore-filter-parser-decade.vala \
+  musicstore-filter-parser-genre.vala \
+  musicstore-scope.vala \
+  simple-scope.vala \
+  track.vala
+
+musicstore_scope_daemon_SOURCES = \
+  $(musicstore_scope_daemon_VALASOURCES:.vala=.c) \
+  $(NULL)
+
+BUILT_SOURCES += \
+  unity_music_daemon.vala.stamp \
+  musicstore_scope_daemon.vala.stamp
+
 EXTRA_DIST += \
   unity_music_daemon.vala.stamp \
+  musicstore_scope_daemon.vala.stamp \
   $(unity_music_daemon_VALASOURCES) \
+  $(musicstore_scope_daemon_VALASOURCES) \
   $(NULL)
 
-# Major hack alert: https://bugzilla.gnome.org/show_bug.cgi?id=621292
-# Introduced because of our requirements for the GLIB_2_22 define. See above.
 unity_music_daemon.vala.stamp: $(unity_music_daemon_VALASOURCES)
 	$(AM_V_GEN) $(VALAC) $(unity_music_daemon_VALAFLAGS) $^
 	touch unity_music_daemon.vala.stamp
 
+musicstore_scope_daemon.vala.stamp: $(musicstore_scope_daemon_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(musicstore_scope_daemon_VALAFLAGS) $^
+	touch musicstore_scope_daemon.vala.stamp
+
 CLEANFILES += \
   *.stamp \
   *.vapi \
   $(unity_music_daemon_VALASOURCES:.vala=.c) \
+  $(musicstore_scope_daemon_VALASOURCES:.vala=.c) \
   $(NULL)
 

=== modified file 'src/album.vala'
--- src/album.vala	2011-09-02 16:46:11 +0000
+++ src/album.vala	2011-09-14 18:37:04 +0000
@@ -23,7 +23,9 @@
  	
   public class Album : GLib.Object
   {
-    public string Title { get; set; }
-    public string Artist { get; set; }
+    public string title { get; set; }
+    public string artist { get; set; }
+    public string uri { get; set; }
+    public string artwork_path { get; set; }
   }
 }
\ No newline at end of file

=== modified file 'src/banshee-collection.vala'
--- src/banshee-collection.vala	2011-09-12 16:30:54 +0000
+++ src/banshee-collection.vala	2011-09-14 18:37:04 +0000
@@ -107,20 +107,23 @@
             artwork_path = "audio-x-generic";
 
           Track track = new Track ();
-	  track.Title = stmt.column_text (TRACK_TITLE);
-	  track.Artist = stmt.column_text (ARTIST_NAME);
-	  track.Uri = stmt.column_text (TRACK_URI);
-	  track.MimeType = stmt.column_text (TRACK_MIMETYPE);          
+	  track.title = stmt.column_text (TRACK_TITLE);
+	  track.artist = stmt.column_text (ARTIST_NAME);
+	  track.uri = stmt.column_text (TRACK_URI);
+	  track.mime_type = stmt.column_text (TRACK_MIMETYPE);          
+	  track.artwork_path = artwork_path;
 	  
 	  Album album = new Album ();
-	  album.Title = stmt.column_text (ALBUM_TITLE);
-	  album.Artist = stmt.column_text (ARTIST_NAME);
-	  
-	  results_model.append (track.Uri, artwork_path, 0, track.MimeType, track.Title, track.Artist);
-	  
-	  if (albums.add (album.Artist + album.Title)) {
-	    results_model.append ("album://%s/%s".printf (album.Artist, album.Title), artwork_path, 1, 
-				  "audio-x-generic", album.Title, album.Artist);
+	  album.title = stmt.column_text (ALBUM_TITLE);
+	  album.artist = stmt.column_text (ARTIST_NAME);
+	  album.uri = "album://%s/%s".printf (album.artist, album.title);
+	  album.artwork_path = artwork_path;
+	  
+	  results_model.append (track.uri, track.artwork_path, 0, track.mime_type, track.title, track.artist, track.uri);
+	  
+	  if (albums.add (album.artist + album.title)) {
+	    // FIXME drag n drop uri should be the path to the album dir?
+	    results_model.append (album.uri, album.artwork_path, 1, "audio-x-generic", album.title, album.artist, null);
 	  }
 	  
 	  break;
@@ -148,7 +151,7 @@
                           AND CoreAlbums.Title IS '%s'
                           AND CoreArtists.Name IS '%s'
                           AND CoreTracks.URI IS NOT NULL
-                    ORDER BY CoreTracks.TrackNumber ASC".printf (album.Title, album.Artist);
+                    ORDER BY CoreTracks.TrackNumber ASC".printf (album.title, album.artist);
 
       rc = execute_sql (sql, out stmt);
       
@@ -184,7 +187,20 @@
       
       foreach (FilterParser parser in filters)
       {
-        string parsed = parser.parse ();
+	BansheeFilterParser bparser;
+	debug ("parsing for %s", parser.id);
+	if (parser is GenreFilterParser)
+	  bparser = new BansheeGenreFilterParser (parser as GenreFilterParser);
+	else if (parser is DecadeFilterParser)
+	  bparser = new BansheeDecadeFilterParser (parser as DecadeFilterParser);
+	else
+	  {
+	    warning ("Recieved an unimplemented filter type");
+	    continue;	    
+	  }
+
+        string parsed = bparser.parse ();
+	debug (parsed);
 
         if (parsed == null || parsed == "")
           continue;

=== added file 'src/banshee-filter-parser-decade.vala'
--- src/banshee-filter-parser-decade.vala	1970-01-01 00:00:00 +0000
+++ src/banshee-filter-parser-decade.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class BansheeDecadeFilterParser : BansheeFilterParser, DecadeFilterParser
+  {
+
+    public BansheeDecadeFilterParser (DecadeFilterParser parser)
+    {
+      base (parser.filter as MultiRangeFilter);
+    }
+    
+    public override string parse ()
+    {   
+      int start_year, end_year;
+
+      MultiRangeFilter range_filter = filter as MultiRangeFilter;
+      FilterOption start = range_filter.get_first_active ();
+      FilterOption end = range_filter.get_last_active ();
+
+      start_year = int.parse (start.id);
+      end_year = int.parse (end.id);
+      
+      // bump the end_year up to the beginning of the next range
+      int end_index = range_filter.options.index (end);
+      // if we have already selected the last option
+      if (end_index == range_filter.options.length () - 1)
+        end_year += 10;
+      else
+        end_year = int.parse (range_filter.options.nth_data (end_index + 1).id);
+
+      return "(CoreTracks.Year >= %d AND CoreTracks.Year < %d) ".printf (start_year, end_year);
+    }
+  }
+}
\ No newline at end of file

=== added file 'src/banshee-filter-parser-genre.vala'
--- src/banshee-filter-parser-genre.vala	1970-01-01 00:00:00 +0000
+++ src/banshee-filter-parser-genre.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class BansheeGenreFilterParser : BansheeFilterParser, GenreFilterParser
+  {
+
+    public BansheeGenreFilterParser (GenreFilterParser parser)
+    {
+      base (parser.filter as CheckOptionFilter);
+    }
+    
+    public override string parse ()
+    { 
+      StringBuilder builder = new StringBuilder ();
+      List<FilterOption> genres = get_all_selected_genres ();
+
+      /* CoreTracks.Genre IS ___ OR CoreTracks.Genre IS ____ ... */
+      foreach (FilterOption genre in genres)
+      {
+        string id = genre.id;
+        if (genre.id == null)
+          continue;
+
+        foreach (string alt in map.get_genre_synonyms (id))
+        {
+          builder.append ("(CoreTracks.Genre LIKE '%");
+          builder.append (alt);
+          builder.append ("""%' ESCAPE '\' AND CoreTracks.Genre IS NOT NULL) OR """);
+        }
+      }
+      builder.truncate (builder.len - (" OR ".length));
+      builder.prepend ("(");
+      builder.append (")");
+     
+      return builder.str;
+    }
+  }
+}
\ No newline at end of file

=== renamed file 'src/filter-parser.vala' => 'src/banshee-filter-parser.vala'
--- src/filter-parser.vala	2011-09-02 16:46:11 +0000
+++ src/banshee-filter-parser.vala	2011-09-14 18:37:04 +0000
@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright (C) 2011 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,89 +21,8 @@
 
 namespace Unity.MusicLens {
   
-  public class FilterParser : Object
+  public interface BansheeFilterParser : FilterParser
   {
-    private Genre map;
-    private Filter _filter;
-    
-    public string Id { get { return _filter.id; } }
-
-    public FilterParser (Filter filter)
-    {
-      _filter = filter;
-      map = new Genre ();
-    }
-
-    public string? parse ()
-    {
-      if (Id == "genre")
-        return parse_genre_filter ();
-      else if (Id == "decade")
-        return parse_decade_filter ();
-      
-      return null;
-    }
-
-    /* returns a string like CoreTracks.Genre IS 'Rock' OR CoreTracks.Genre IS 'Metal'... */
-    public string? parse_genre_filter ()
-    {
-      StringBuilder builder = new StringBuilder ();
-      List<FilterOption> genres = get_all_selected_genre_options ((_filter as CheckOptionFilter).options);
-
-      /* CoreTracks.Genre IS ___ OR CoreTracks.Genre IS ____ ... */
-      foreach (FilterOption genre in genres)
-      {
-        string id = genre.id;
-        if (genre.id == null)
-          continue;
-
-        foreach (string alt in map.get_genre_synonyms (id))
-        {
-          builder.append ("(CoreTracks.Genre LIKE '%");
-          builder.append (alt);
-          builder.append ("""%' ESCAPE '\' AND CoreTracks.Genre IS NOT NULL) OR """);
-        }
-      }
-      builder.truncate (builder.len - (" OR ".length));
-      builder.prepend ("(");
-      builder.append (")");
-     
-      return builder.str;
-    }
-
-    /* returns a string like CoreTracks.Year >= LOWER_BOUND AND CoreTracks.Year < UPPER_BOUND */
-    public string? parse_decade_filter ()
-    {
-      int start_year, end_year;
-
-      MultiRangeFilter range_filter = _filter as MultiRangeFilter;
-      FilterOption start = range_filter.get_first_active ();
-      FilterOption end = range_filter.get_last_active ();
-
-      start_year = int.parse (start.id);
-      end_year = int.parse (end.id);
-      
-      // bump the end_year up to the beginning of the next range
-      int end_index = range_filter.options.index (end);
-      // if we have already selected the last option
-      if (end_index == range_filter.options.length () - 1)
-        end_year += 10;
-      else
-        end_year = int.parse (range_filter.options.nth_data (end_index + 1).id);
-
-      return "(CoreTracks.Year >= %d AND CoreTracks.Year < %d) ".printf (start_year, end_year);
-    }
-
-    private List<FilterOption> get_all_selected_genre_options (List<FilterOption> options)
-    {
-      var active = new List<FilterOption> ();
-      foreach (FilterOption option in options)
-      {
-        if (option.active)
-          active.append (option);
-      }
-
-      return active;
-    }
+
   }
 }

=== modified file 'src/banshee-scope.vala'
--- src/banshee-scope.vala	2011-09-08 17:22:43 +0000
+++ src/banshee-scope.vala	2011-09-14 18:37:04 +0000
@@ -29,11 +29,11 @@
     {
       base ();
 
-      Scope = new Unity.Scope ("/com/canonical/unity/scope/banshee");
-      Scope.search_in_global = true;
-      Scope.activate_uri.connect (activate);
+      scope = new Unity.Scope ("/com/canonical/unity/scope/banshee");
+      scope.search_in_global = true;
+      scope.activate_uri.connect (activate);
 
-      base.Initialize ();
+      base.initialize ();
 
       try {
 	collection = new BansheeCollection ();
@@ -63,8 +63,8 @@
             string title = split[3];
 	    
             Album album = new Album ();
-            album.Artist = artist;
-            album.Title = title;
+            album.artist = artist;
+            album.title = title;
             // FIXME there must be a better way..
             foreach (string track in collection.get_track_uris (album))
               exec += track;
@@ -91,14 +91,9 @@
     }
 
     public override void perform_search (LensSearch? search, Dee.Model results_model, 
-					 List<Filter> filters, int max_results = -1)
+					 List<FilterParser> filters, int max_results = -1)
     {
-      List<FilterParser> parsers = new List<FilterParser> ();
-      foreach (Filter f in filters) {
-	parsers.append (new FilterParser (f));
-      }
-
-      collection.search (search, results_model, parsers, max_results);
+      collection.search (search, results_model, filters, max_results);
     }
   }
 }

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-09-12 15:58:34 +0000
+++ src/daemon.vala	2011-09-14 18:37:04 +0000
@@ -41,7 +41,7 @@
       populate_categories ();
       populate_filters();
 
-      lens.add_local_scope (banshee.Scope);
+      lens.add_local_scope (banshee.scope);
 
       try {
         lens.export ();

=== added file 'src/filter-parser-decade.vala'
--- src/filter-parser-decade.vala	1970-01-01 00:00:00 +0000
+++ src/filter-parser-decade.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class DecadeFilterParser : FilterParser
+  {
+    public DecadeFilterParser (MultiRangeFilter filter)
+    {
+      base (filter);
+    }
+
+    public override string parse ()
+    {
+      return "";
+    }
+
+    protected override string id { get { return "decade"; } }
+  }
+}
\ No newline at end of file

=== added file 'src/filter-parser-genre.vala'
--- src/filter-parser-genre.vala	1970-01-01 00:00:00 +0000
+++ src/filter-parser-genre.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class GenreFilterParser : FilterParser
+  {
+    public GenreFilterParser (CheckOptionFilter filter)
+    {
+      base (filter);
+      map = new Genre ();
+    }
+
+    public override string parse ()
+    {
+      return "";
+    }
+
+    protected override string id { get { return "genre"; } }
+    protected Genre map { get; private set; }
+
+    protected List<FilterOption> get_all_selected_genres ()
+    {
+      unowned List<FilterOption> options = (filter as CheckOptionFilter).options;
+      var active = new List<FilterOption> ();
+
+      foreach (FilterOption option in options)
+	{
+        if (option.active)
+          active.append (option);
+      }
+      
+      return active;
+    }
+  }
+}
\ No newline at end of file

=== added file 'src/filter-parser.vala'
--- src/filter-parser.vala	1970-01-01 00:00:00 +0000
+++ src/filter-parser.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public abstract class FilterParser : Object
+  {
+    public FilterParser (Filter filter)
+    {
+      this.filter = filter;
+    }
+
+    public Filter filter { get; protected set; }
+    
+    public abstract string id { get;}
+    public abstract string parse ();
+  }
+}
\ No newline at end of file

=== added file 'src/musicstore-collection.vala'
--- src/musicstore-collection.vala	1970-01-01 00:00:00 +0000
+++ src/musicstore-collection.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+
+  public class MusicStoreCollection : Object
+  {
+
+    private const string MUSICSTORE_BASE_URI = "https://staging.one.ubuntu.com/api/music_search/v1/";
+
+    private Cancellable? cancellable;
+
+    public MusicStoreCollection ()
+    {
+    }
+
+    public void search (LensSearch? search, Dee.Model results_model,
+			List<FilterParser> filters, int max_results = -1) throws IOError
+    {
+      string? uri = build_search_uri (search.search_string, filters);
+      if (uri == null)
+	return;	  
+      
+      debug ("searching %s", uri);
+      File file = File.new_for_uri (uri);
+
+//    if (cancellable != null) {
+//    cancellable.cancel ();	  
+//    cancellable = null;
+//    }
+      
+      cancellable = new Cancellable ();
+      read_musicstore_search_result_async.begin (file, results_model);
+    }
+
+    private async void read_musicstore_search_result_async (File file, Dee.Model model)
+    {
+      try {
+	var dis = new DataInputStream (file.read (cancellable));
+	var parser = new Json.Parser ();
+	parser.load_from_stream (dis, cancellable);
+	var root_object = parser.get_root ().get_object ();
+	
+	foreach (var r in root_object.get_array_member ("results").get_elements ()) {
+	  var result_obj = r.get_object ();
+	  
+	  string type = result_obj.get_string_member ("type");
+	  if (type == "track") {
+	    Track track = new Track ();
+	    track.title = result_obj.get_string_member ("title");
+	    track.artist = result_obj.get_string_member ("artist");
+	    track.uri = result_obj.get_string_member ("details");
+	    track.artwork_path = result_obj.get_string_member ("image");
+	    track.mime_type = "audio-x-generic";
+
+	    // FIXME drag n drop uri needs to be the u1ms:// link
+	    model.append (track.uri, track.artwork_path, 2, track.mime_type, track.title, track.artist, null);
+	  
+	  } else if (type == "album") {
+	    Album album = new Album ();
+	    album.title = result_obj.get_string_member ("title");
+	    album.artist = result_obj.get_string_member ("artist");
+	    album.uri = result_obj.get_string_member ("details");
+	    album.artwork_path = result_obj.get_string_member ("image");
+	    
+	    model.append (album.uri, album.artwork_path, 2, "audio-x-generic", album.title, album.artist, null);
+	  }
+        }
+	cancellable = null;
+
+      } catch (Error e) {
+	stdout.printf (e.message);
+      }
+    }
+
+    private string build_search_uri (string query, List<FilterParser> filters)
+    {
+      MusicStoreFilterParser store_parser;
+
+      StringBuilder uri = new StringBuilder (MUSICSTORE_BASE_URI);
+      uri.append ("search?q=");
+      uri.append (Uri.escape_string (query, "", false));
+
+      foreach (FilterParser parser in filters) {
+	  if (parser is GenreFilterParser)
+	    store_parser = new MusicStoreGenreFilterParser (parser as GenreFilterParser);
+	  else if (parser is DecadeFilterParser)
+	    store_parser = new MusicStoreDecadeFilterParser (parser as DecadeFilterParser);
+	  else
+	    continue;
+
+	  uri.append (store_parser.parse ());
+      }
+      
+      uri.append ("&geo_store=US");
+
+      return uri.str;
+    }
+  }
+}
\ No newline at end of file

=== added file 'src/musicstore-daemon.vala'
--- src/musicstore-daemon.vala	1970-01-01 00:00:00 +0000
+++ src/musicstore-daemon.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+using Config;
+
+namespace Unity.MusicLens {
+
+  static Application? app = null;
+  static MusicStoreScopeProxy? daemon = null;
+
+  /* Check if a given well known DBus is owned.
+   * WARNING: This does sync IO!  */
+  public static bool dbus_name_has_owner (string name)
+  {
+    try {
+      bool has_owner;
+      DBusConnection bus = Bus.get_sync (BusType.SESSION);
+      Variant result = bus.call_sync ("org.freedesktop.DBus",
+                                      "/org/freedesktop/dbus",
+                                      "org.freedesktop.DBus",
+                                      "NameHasOwner",
+                                      new Variant ("(s)", name),
+                                      new VariantType ("(b)"),
+                                      DBusCallFlags.NO_AUTO_START,
+                                      -1);
+      result.get ("(b)", out has_owner);
+      return has_owner;
+    } catch (Error e) {
+      warning ("Unable to decide whether '%s' is running: %s", name, e.message);
+    }
+    
+    return false;
+  }
+
+  public static int main (string[] args)
+  {
+    /* Sort up locale to get translations but also sorting and
+     * punctuation right */
+    GLib.Intl.textdomain (Config.PACKAGE);
+    GLib.Intl.bindtextdomain (Config.PACKAGE, Config.LOCALEDIR);
+    GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
+    GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
+  
+    /* Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=640714 
+     * GApplication.register() call owns our DBus name in a sync manner
+     * making it race against GDBus' worker thread to export our
+     * objects on the bus before/after owning our name and receiving
+     * method calls on our objects (which may not yet be up!)*/
+    if (dbus_name_has_owner ("com.canonical.Unity.Scope.MusicStore"))
+      {
+        print ("Another instance of the UbuntuOne Music Daemon " +
+               "already appears to be running.\nBailing out.\n");
+        return 2;
+      }
+    
+    /* Now register our DBus objects *before* acquiring the name!
+     * See above for reasons */
+    daemon = new MusicStoreScopeProxy ();
+  
+    /* Use GApplication directly for single instance app functionality */
+    app = new Application ("com.canonical.Unity.Scope.MusicStore",
+                           ApplicationFlags.IS_SERVICE);
+    try {
+      app.register ();
+    } catch (Error e) {
+      /* FIXME: We get this error if another daemon is already running,
+       * but it uses a generic error so we can't detect this reliably... */
+      print ("Failed to start music daemon: %s\n", e.message);
+      return 1;
+    }
+    
+    if (app.get_is_remote ())
+      {
+        print ("Another instance of the Unity Music Daemon " +
+               "already appears to be running.\nBailing out.\n");
+        return 2;
+      }
+    
+    /* Hold()ing the app makes sure the GApplication doesn't exit */    
+    app.hold();
+    return app.run ();
+  }
+
+} /* namespace */
\ No newline at end of file

=== added file 'src/musicstore-filter-parser-decade.vala'
--- src/musicstore-filter-parser-decade.vala	1970-01-01 00:00:00 +0000
+++ src/musicstore-filter-parser-decade.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class MusicStoreDecadeFilterParser : DecadeFilterParser, MusicStoreFilterParser
+  {
+
+    public MusicStoreDecadeFilterParser (DecadeFilterParser parser)
+    {
+      base (parser.filter as MultiRangeFilter);
+    }
+    
+    public override string parse ()
+    {
+      StringBuilder builder = new StringBuilder ("&decade=");
+      MultiRangeFilter range_filter = filter as MultiRangeFilter;
+      string start = range_filter.get_first_active ().id;
+      string end = range_filter.get_first_active ().id;
+      
+      int start_year = int.parse (start);
+      int end_year = int.parse (end);
+      
+      for (; start_year <= end_year; start_year += 10)
+      {
+	builder.append_printf ("%d", start_year);
+      }
+      
+      // chop off the last ,
+      builder.truncate (builder.len - 1);
+
+      return builder.str;
+    }
+  }
+}
\ No newline at end of file

=== added file 'src/musicstore-filter-parser-genre.vala'
--- src/musicstore-filter-parser-genre.vala	1970-01-01 00:00:00 +0000
+++ src/musicstore-filter-parser-genre.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class MusicStoreGenreFilterParser : GenreFilterParser, MusicStoreFilterParser
+  {
+
+    public MusicStoreGenreFilterParser (GenreFilterParser parser)
+    {
+      base (parser.filter as CheckOptionFilter);
+    }
+    
+    /*
+    public override string parse ()
+    {
+    }
+    */
+  }
+}
\ No newline at end of file

=== added file 'src/musicstore-filter-parser.vala'
--- src/musicstore-filter-parser.vala	1970-01-01 00:00:00 +0000
+++ src/musicstore-filter-parser.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,28 @@
+ /*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public interface MusicStoreFilterParser : FilterParser
+  {
+
+  }
+}

=== added file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	1970-01-01 00:00:00 +0000
+++ src/musicstore-scope.vala	2011-09-14 18:37:04 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Alex Launi <[e-mail]>
+ *
+ */
+
+using GLib;
+
+namespace Unity.MusicLens {
+  
+  public class MusicStoreScopeProxy : SimpleScope
+  {
+    private MusicStoreCollection collection;
+
+    public MusicStoreScopeProxy ()
+    {
+      base ();
+
+      scope = new Unity.Scope ("/com/canonical/unity/scope/musicstore");
+      scope.search_in_global = true;
+      scope.activate_uri.connect (activate);
+
+      base.initialize ();
+
+      collection = new MusicStoreCollection ();
+
+      try {
+	scope.export ();
+      } catch (GLib.IOError e) {
+	stdout.printf (e.message);
+      }
+    }
+
+    protected override int num_results_without_search { get { return 100; } }
+    protected override int num_results_global_search { get { return 20; } }
+    protected override int num_results_lens_search { get { return 50; } }
+
+    public Unity.ActivationResponse activate (string uri)
+    {
+      /* launch the music store streaming client  or the webstore or whatevz */
+	File file = File.new_for_uri (uri);
+	get_and_open_purchase_url.begin (file);
+	return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);  
+    }
+
+    public override void perform_search (LensSearch? search, Dee.Model results_model,
+					 List<FilterParser> filters, int max_results = -1)
+    {
+      try {
+	collection.search (search, results_model, filters, max_results);	  
+      } catch (IOError e) {
+	stdout.printf (e.message);
+      }
+    }
+
+    private async void get_and_open_purchase_url (File file)
+    {
+      string url = "UNASSIGNED";
+
+      try {
+	var dis = new DataInputStream (file.read ());
+	var parser = new Json.Parser ();
+	parser.load_from_stream (dis, new Cancellable ());
+	var root_object = parser.get_root ().get_object ();
+
+	url = root_object.get_string_member ("web_purchase_url");
+	AppInfo.launch_default_for_uri (url, null);
+      } catch (GLib.Error e) {
+	warning ("Failed to open url %s. %s", url, e.message);
+      }
+    }
+  }
+}
\ No newline at end of file

=== modified file 'src/simple-scope.vala'
--- src/simple-scope.vala	2011-09-08 17:22:43 +0000
+++ src/simple-scope.vala	2011-09-14 18:37:04 +0000
@@ -23,13 +23,13 @@
 {
   public abstract class SimpleScope : Object
   {
-    public Unity.Scope Scope { get; protected set; }
+    public Unity.Scope scope { get; protected set; }
 
     protected abstract int num_results_without_search { get; }
     protected abstract int num_results_global_search { get; }
     protected abstract int num_results_lens_search { get; }
 
-    protected abstract void perform_search (LensSearch? search, Dee.Model results_model, List<Filter> filters, int max_results = -1);
+    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;
@@ -40,23 +40,23 @@
       previous_search = null;
     }
 
-    protected void Initialize ()
+    protected void initialize ()
     {
       /* Listen for filter changes */
-      Scope.filters_changed.connect(
+      scope.filters_changed.connect(
 				    () => { 
-				      if (Scope.active_search != null)
+				      if (scope.active_search != null)
 					{
 					  is_dirty = true;
-					  Scope.notify_property ("active-search");
+					  scope.notify_property ("active-search");
 					}
 				    }
 				    );
       
       /* Listen for changes to the lens search entry */
-      Scope.notify["active-search"].connect (
+      scope.notify["active-search"].connect (
 					     (obj, pspec) => { 
-					       var search = Scope.active_search;
+					       var search = scope.active_search;
 					       if (!(is_dirty || search_has_really_changed (previous_search, search)))
 						 return;
 					       is_dirty = false;
@@ -66,9 +66,9 @@
 					     );
       
       /* Listen for changes to the global search */
-      Scope.notify["active-global-search"].connect (
+      scope.notify["active-global-search"].connect (
 						    (obj, pspec) => { 
-						      var search = Scope.active_global_search;
+						      var search = scope.active_global_search;
 						      
 						      if (search_is_invalid (search))
 							return;
@@ -96,7 +96,7 @@
      */
     private async void update_global_search_async (LensSearch search)
     {
-      var results_model = Scope.global_results_model;
+      var results_model = scope.global_results_model;
       
       if (search_is_invalid (search))
 	{
@@ -121,21 +121,21 @@
 
     private async void perform_search_async (LensSearch search, int max_results)
     {
-      var results_model = Scope.results_model;
+      var results_model = scope.results_model;
             
       /* 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! */
-      List<Filter> filters = new List<Filter> ();
-      Filter filter = Scope.get_filter ("genre");
-      if (filter.filtering)
-	filters.append (filter);
-
-      filter = Scope.get_filter ("decade");
-      if (filter.filtering)
-	filters.append (filter);
-
-      Scope.freeze_notify ();
+      List<FilterParser> filters = new List<FilterParser> ();
+      Filter filter = scope.get_filter ("genre");
+      if (filter.filtering)
+	filters.append (new GenreFilterParser (filter as CheckOptionFilter));
+
+      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);
@@ -145,7 +145,7 @@
        * changing the model even before we had flushed out current changes
        */
       Idle.add (() => {
-	  Scope.thaw_notify ();
+	  scope.thaw_notify ();
 	  return false;
 	});
       

=== modified file 'src/track.vala'
--- src/track.vala	2011-09-02 16:46:11 +0000
+++ src/track.vala	2011-09-14 18:37:04 +0000
@@ -21,9 +21,10 @@
   
   public class Track : GLib.Object
   {
-    public string Title { get; set; }
-    public string Uri { get; set; }
-    public string Artist { get; set; }
-    public string MimeType { get; set; }
+    public string title { get; set; }
+    public string uri { get; set; }
+    public string artist { get; set; }
+    public string mime_type { get; set; }
+    public string artwork_path { get; set; }
   }
 }
\ No newline at end of file