Merge lp:~stolowski/unity-lens-shopping/u1ms-preview into lp:unity-lens-shopping

[Paweł Stołowski]

Reuse u1ms preview code from musicstore scope for u1ms results. The code has been refactored and copied over to have it isolated as much as possible in new classes/files. After Q we need to move it to a library and clean both shopping lens and musicstore scope.

Reuse u1ms preview code from musicstore scope for u1ms results. The code has been refactored and copied over to have it isolated as much as possible in new classes/files. After Q we need to move it to a library and clean both shopping lens and musicstore scope.

[Michal Hruby (mhr3)]

Can you please add huge WARNING / FIXME comment on the top saying that the file is a copy, and should be kept in sync with the original / moved in a common lib.

Otherwise looks and works fine.

[Michal Hruby (mhr3)]

+1

review: Approve

[Michal Hruby (mhr3)]

Oh actually POTFILES need update, make check fails.

review: Needs Fixing

[Paweł Stołowski (stolowski)]

Fixed.

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Unmerged revisions

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-07-25 13:07:48 +0000
+++ po/POTFILES.in	2012-09-26 09:58:22 +0000
@@ -1,5 +1,7 @@
 [encoding: UTF-8]
 src/daemon.vala
 src/main.vala
+src/u1ms-preview.vala
+src/scope.vala
 [type: gettext/ini]shopping.lens.in.in
 
 
=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2012-09-17 21:39:10 +0000
+++ po/POTFILES.skip	2012-09-26 09:58:22 +0000
@@ -5,3 +5,5 @@
 src/banshee-scope.c
 src/rhythmbox-scope.c
 src/scope.c
+src/preview-player-client.c
+src/u1ms-preview.c
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-09-17 18:04:15 +0000
+++ src/Makefile.am	2012-09-26 09:58:22 +0000
@@ -44,6 +44,8 @@
   main.vala \
   scope.vala \
   markup-cleaner.vala \
+  preview-player-client.vala \
+  u1ms-preview.vala \
   $(NULL)
 
 unity_shopping_daemon_SOURCES = \
 
=== added file 'src/preview-player-client.vala'
--- src/preview-player-client.vala	1970-01-01 00:00:00 +0000
+++ src/preview-player-client.vala	2012-09-26 09:58:22 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2012 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 Pawel Stolowski <[e-mail]>
+ */
+
+
+/*
+ * FIXME: this code was copied from music-lens; it needs to be kept in sync and eventually moved to a library !!!
+ */
+namespace Unity.ShoppingLens {
+  
+  static const string PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer";
+  static const string PREVIEW_PLAYER_DBUS_PATH = "/com/canonical/Unity/Lens/Music/PreviewPlayer";
+
+  [DBus (name = "com.canonical.Unity.Lens.Music.PreviewPlayer")]
+  public interface PreviewPlayerService: GLib.Object
+  {
+    public signal void progress(string uri, uint32 state, double progress);
+
+    public abstract async void play (string uri) throws Error;
+    public abstract async void pause () throws Error;
+    public abstract async void pause_resume () throws Error;
+    public abstract async void resume () throws Error;
+    public abstract async void stop () throws Error;
+    public abstract async void close () throws Error;
+  }
+  
+  public class PreviewPlayer: GLib.Object
+  {
+    public signal void progress(string uri, Unity.MusicPreview.TrackState state, double progress);
+
+    public async void connect_to () throws Error
+    {
+      _preview_player_service = Bus.get_proxy_sync (BusType.SESSION, PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH);
+      _preview_player_service.progress.connect (on_progress_signal);
+    }
+
+    public async void play (string uri) throws Error
+    {
+      if (_preview_player_service == null)
+      {
+        yield connect_to ();
+      }
+      yield _preview_player_service.play (uri);
+    }
+
+    public async void pause () throws Error
+    {
+      if (_preview_player_service == null)
+      {
+        yield connect_to ();
+      }
+      yield _preview_player_service.pause ();
+    }
+
+    public async void pause_resume () throws Error
+    {
+      if (_preview_player_service == null)
+      {
+        yield connect_to ();
+      }
+      yield _preview_player_service.pause_resume ();
+    }
+
+    public async void resume () throws Error
+    {
+      if (_preview_player_service == null)
+      {
+        yield connect_to ();
+      }
+      yield _preview_player_service.resume ();
+    }
+
+    public async void stop () throws Error
+    {
+      if (_preview_player_service == null)
+      {
+        yield connect_to ();
+      }
+      yield _preview_player_service.stop ();
+    }
+
+    public async void close () throws Error
+    {
+      if (_preview_player_service == null)
+      {
+        yield connect_to ();
+      }
+      yield _preview_player_service.close ();
+    }
+
+    internal void on_progress_signal (string uri, uint32 state, double progress_value)
+    {
+      progress(uri, (Unity.MusicPreview.TrackState)state, progress_value);
+    }
+
+    private PreviewPlayerService _preview_player_service;
+  }
+}
 \ No newline at end of file
 
=== modified file 'src/scope.vala'
--- src/scope.vala	2012-09-20 11:00:09 +0000
+++ src/scope.vala	2012-09-26 09:58:22 +0000
@@ -27,6 +27,7 @@
 
     private HashTable<string, string> results_details_map;
     private HashTable<string, string> global_results_details_map;
+    private PreviewPlayerHandler player;
 
     public ShoppingScope ()
     {
@@ -136,30 +137,43 @@
       {
         var parser = get_json_reply (details_uri, null);
 
-        var root = parser.get_root ().get_object ();
-        unowned string title = root.get_string_member ("title");
-        unowned string description = root.get_string_member ("description_html");
-        unowned string price = root.get_string_member ("formatted_price");
-        if (price == null) price = root.get_string_member ("price");
-
-        var img_obj = root.get_object_member ("images");
-        string image_uri = extract_image_uri (img_obj, int.MAX);
-
-        Icon? image = null;
-        if (image_uri != "")
-        {
-          image = new FileIcon (File.new_for_uri (image_uri));
-        }
-
-        var preview = new GenericPreview (title, MarkupCleaner.html_to_pango_markup (description), image);
-        var icon_dir = File.new_for_path (ICON_PATH);
-        var icon = new FileIcon (icon_dir.get_child ("service-amazon.svg"));
-        var buy_action = new PreviewAction ("buy", _("Buy"), icon);
-        if (price != null) buy_action.extra_text = price;
-        /* Leaving the activation on unity for now */
-        // buy_action.activated.connect ((uri) => { });
-        preview.add_action (buy_action);
-        return preview;
+        if (U1MSPreviewFactory.is_u1ms_details (parser))
+        {
+          var u1mspf = new U1MSPreviewFactory ();
+          var preview = u1mspf.create_preview (parser);
+          u1mspf.add_download_action (preview); // download will be handled by normal activation
+          if (player == null)
+              player = new PreviewPlayerHandler ();
+          player.music_preview = preview;
+          return preview;
+        }
+        else
+        {
+          var root = parser.get_root ().get_object ();
+          unowned string title = root.get_string_member ("title");
+          unowned string description = root.get_string_member ("description_html");
+          unowned string price = root.get_string_member ("formatted_price");
+          if (price == null) price = root.get_string_member ("price");
+
+          var img_obj = root.get_object_member ("images");
+          string image_uri = extract_image_uri (img_obj, int.MAX);
+
+          Icon? image = null;
+          if (image_uri != "")
+          {
+            image = new FileIcon (File.new_for_uri (image_uri));
+          }
+
+          var preview = new GenericPreview (title, MarkupCleaner.html_to_pango_markup (description), image);
+          var icon_dir = File.new_for_path (ICON_PATH);
+          var icon = new FileIcon (icon_dir.get_child ("service-amazon.svg"));
+          var buy_action = new PreviewAction ("buy", _("Buy"), icon);
+          if (price != null) buy_action.extra_text = price;
+          /* Leaving the activation on unity for now */
+          // buy_action.activated.connect ((uri) => { });
+          preview.add_action (buy_action);
+          return preview;
+        }
       }
       catch (Error err)
       {
 
=== added file 'src/u1ms-preview.vala'
--- src/u1ms-preview.vala	1970-01-01 00:00:00 +0000
+++ src/u1ms-preview.vala	2012-09-26 09:58:22 +0000
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Pawel Stolowski <[e-mail]>
+ *
+ */
+
+/*
+ * FIXME: this code is based on musicstore-scope preview handling code; it needs to be kept in sync and eventually moved to a library !!!
+ */
+namespace Unity.ShoppingLens
+{
+
+  public class PreviewPlayerHandler
+  {
+    private PreviewPlayer preview_player;
+    private Unity.MusicPreview music_preview_;
+
+    public Unity.MusicPreview music_preview
+    {
+      get
+      {
+        return music_preview_;
+      }
+      set
+      {
+        music_preview_ = value;
+        if (value != null)
+        {
+          music_preview.play.connect (play);
+          music_preview.pause.connect (pause);
+          music_preview.closed.connect (closed);
+        }
+      }
+    }     
+
+    public PreviewPlayerHandler (Unity.MusicPreview? preview = null)
+    {
+      music_preview = preview;
+    }
+
+    private void on_progress_changed (string uri, Unity.MusicPreview.TrackState state, double progress)
+    {
+      if (music_preview != null)
+      {
+          music_preview.current_track_uri = uri;
+          music_preview.current_track_state = state;
+          music_preview.current_progress = (float)progress;
+        }
+      }
+
+    private void closed (Unity.Preview preview)
+    {
+      if (preview_player != null)
+      {
+        try
+        {
+          preview_player.close ();
+        }
+        catch (Error e)
+        {
+          warning ("Failed to close preview player: %s", e.message);
+        }
+      }
+    }
+
+    private void play (Unity.Preview preview, string uri)
+    {
+      debug ("play request: '%s'", uri);
+      
+      try
+      {
+        if (preview_player == null)
+        {
+          preview_player = new PreviewPlayer ();
+          preview_player.progress.connect (on_progress_changed);
+          preview_player.connect_to ();
+        }
+
+        // we will receive state back in on_progress_changed, but set it now so that it's immediately reflected in the dash
+        music_preview.current_track_uri = uri;
+        music_preview.current_progress = 0.0f;
+        music_preview.current_track_state = Unity.MusicPreview.TrackState.PLAYING;
+        
+        preview_player.play (uri);
+      }
+      catch (Error e)
+      {
+        warning ("Failed to play '%s': %s", uri, e.message);
+      }
+    }
+
+    public void pause (Unity.Preview preview, string uri)
+    {
+      debug ("pause request: '%s'", uri);
+      
+      try
+      {
+        if (preview_player != null)
+        {
+          // we will receive state back in on_progress_changed, but set it now so that it's immediately reflected in the dash
+          music_preview.current_track_uri = uri;
+          music_preview.current_track_state = Unity.MusicPreview.TrackState.PAUSED;
+          
+          preview_player.pause ();
+        }
+      }
+      catch (Error e)
+      {
+        warning ("Failed to pause '%s': %s", uri, e.message);
+      }
+    }
+  }
+
+
+  public class U1MSPreviewFactory
+  {
+    public string formatted_price { get; internal set; }
+
+    public static bool is_u1ms_details (Json.Parser parser)
+    {
+      var root_obj = parser.get_root ().get_object ();
+      return root_obj.has_member ("source") && root_obj.get_string_member ("source") == "Ubuntu One Music Store" && root_obj.has_member ("tracks");
+    }
+
+    public Unity.MusicPreview? create_preview (Json.Parser parser)
+    {
+      var root_obj = parser.get_root ().get_object ();
+
+      var title = root_obj.get_string_member ("title");
+      var artwork_path = root_obj.get_string_member ("image");
+      File cover_file = File.new_for_uri (artwork_path); //artwork path is a remote uri
+      var cover = new FileIcon (cover_file);
+
+      var artist = root_obj.get_string_member ("artist");
+    
+      var preview = new Unity.MusicPreview (title, artist, cover);
+
+      if (root_obj.has_member ("formatted_price"))
+        formatted_price = root_obj.get_string_member ("formatted_price");
+      else
+        formatted_price = "";
+    
+      if (root_obj.has_member ("tracks"))
+      {
+        var tracks_node = root_obj.get_array_member ("tracks");
+        int i = 1;
+        foreach (var track_node in tracks_node.get_elements ())
+        {
+          var track_obj = track_node.get_object ();
+          TrackMetadata tm = new TrackMetadata ();
+          tm.uri = track_obj.get_string_member ("preview");
+          tm.track_no = i++; //FIXME: u1ms search doesn't provide track numbers *yet*
+          tm.title = track_obj.get_string_member ("title");
+          tm.length = (int)track_obj.get_member ("duration").get_int ();
+          preview.add_track (tm);
+        }
+      }
+      else // details for single track
+      {
+        TrackMetadata tm = new TrackMetadata ();
+        tm.uri = root_obj.get_string_member ("preview");
+        tm.title = root_obj.get_string_member ("title");
+        tm.length = (int)root_obj.get_member ("duration").get_int ();
+        preview.add_track (tm);
+      }
+      return preview;
+    }
+
+    public Unity.PreviewAction? add_download_action (Unity.MusicPreview preview)
+    {
+      GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
+      var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
+      if (formatted_price != null)
+        download_action.extra_text = formatted_price;
+      preview.add_action (download_action);
+      return download_action;
+    }
+  }
+
+}