Merge lp:~mhr3/unity-lens-video/fix-1226573 into lp:unity-lens-video

[Michal Hruby]

Simplify the scope, use the non-deprecated API, and pass a form-factor hint to the server.

Simplify the scope, use the non-deprecated API, and pass a form-factor hint to the server.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-video-ci/9/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good and works, but the whole business with RESULT_PREVIEW_ON_LMB seems useless now as Dash always shows previews... Can you remove it (unless you see a reason to fix it, in which case we should probably use x-unity-no-preview://)?

review: Needs Fixing

[Paweł Stołowski (stolowski)]

After discussing this on IRC, it's better to leave it for now as it can potentially break the behavior of current Unity8 shell.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-07-04 08:32:52 +0000
+++ debian/control	2013-09-17 12:19:35 +0000
@@ -35,7 +35,6 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         gvfs-bin,
 Enhances: unity-lens-video
 Description: Remote videos engine
  This scope adds a remote videos search engine to the Video lens.

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-06-20 16:13:59 +0000
+++ src/Makefile.am	2013-09-17 12:19:35 +0000
@@ -95,7 +95,6 @@
   remote-scope-globals.vala \
   remote-video-main.vala \
   remote-scope.vala \
-  remote-uri.vala \
   ubuntu-video-search.vala \
   utils.vala \
   video-file.vala \

=== modified file 'src/remote-scope.vala'
--- src/remote-scope.vala	2013-06-20 16:13:59 +0000
+++ src/remote-scope.vala	2013-09-17 12:19:35 +0000
@@ -22,14 +22,15 @@
 
 namespace Unity.VideoLens
 {
-  public class RemoteVideoScope : Unity.DeprecatedScope
+  public class RemoteVideoScope : Unity.SimpleScope
   {
-    private static int REFRESH_INTERVAL = 3600; // fetch sources & recommendations once an hour
-    private static int RETRY_INTERVAL = 60;     // retry sources/recommendations after a minute
-
-    private static string PREVIEW_ON_LMB = "lmb-preview";
+    private const int REFRESH_INTERVAL = 3600; // fetch sources & recommendations once an hour
+    private const int RETRY_INTERVAL = 60;     // retry sources/recommendations after a minute
+
+    private const string RESULT_PREVIEW_ON_LMB = "lmb-preview";
+    private const string RESULT_DETAILS_URI = "details-uri";
+
     private Soup.Session session;
-    private PreferencesManager preferences = PreferencesManager.get_default ();
     Gee.ArrayList<RemoteVideoFile?> recommendations;
     int64 recommendations_last_update = 0;
     Zeitgeist.DataSourceRegistry zg_sources;
@@ -37,14 +38,18 @@
 
     public RemoteVideoScope ()
     {
-        Object (dbus_path: "/net/launchpad/scope/remotevideos", id: "video-remote.scope");
+        Object (unique_name: "/net/launchpad/scope/remotevideos",
+                group_name: "net.launchpad.scope.RemoteVideos");
     }
 
     protected override void constructed ()
     {
       base.constructed ();
 
-      schema.add_field (PREVIEW_ON_LMB, "b", Unity.Schema.FieldType.OPTIONAL);
+      var schema = new Unity.Schema ();
+      schema.add_field (RESULT_PREVIEW_ON_LMB, "b", Unity.Schema.FieldType.OPTIONAL);
+      schema.add_field (RESULT_DETAILS_URI, "s", Unity.Schema.FieldType.OPTIONAL);
+      this.schema = schema;
 
       recommendations = new Gee.ArrayList<RemoteVideoFile?> ();
 
@@ -65,39 +70,18 @@
       session.user_agent = "Unity Video Lens Remote Scope v" + Config.VERSION;
       session.add_feature_by_type (typeof (SoupGNOME.ProxyResolverGNOME));
 
-      search_in_global = false;
-      search_changed.connect ((search, search_type, cancellable) =>
-      {
-        update_search_async.begin (search, search_type, cancellable);
-      });
-
-      generate_search_key.connect ((scope, search) =>
-      {
-        return search.search_string.strip ();
-      });
-
-      preferences.notify["remote-content-search"].connect ((obj, pspec) =>
-      {
-        queue_search_changed (SearchType.DEFAULT);
-      });
-
       populate_categories ();
-      query_list_of_sources ();
 
-      // refresh the at least once every 30 minutes
+      // refresh the search at least once every 30 minutes
       GLib.Timeout.add_seconds (REFRESH_INTERVAL/2, () =>
       {
-        queue_search_changed (SearchType.DEFAULT); return true;
+        results_invalidated (SearchType.DEFAULT);
+        return true;
       });
 
-      try
-      {
-        export ();
-      }
-      catch (Error e)
-      {
-        error ("Failed to export scope: %s", e.message);
-      }
+      set_search_async_func (dispatch_search);
+      set_preview_async_func (dispatch_preview);
+      set_activate_func (activate_result);
     }
 
     private void populate_categories ()
@@ -108,121 +92,89 @@
       categories.add(new Unity.Category ("online", _("Online"), new FileIcon (icon_dir.get_child ("group-internet.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
       categories.add(new Unity.Category ("more", _("More suggestions"), new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
 
-      this.categories = categories;
+      this.category_set = categories;
+    }
+
+    private void dispatch_search (ScopeSearchBase search,
+                                  ScopeSearchBaseCallback cb)
+    {
+      perform_search.begin (search, (obj, res) =>
+      {
+        try
+        {
+          perform_search.end (res);
+        }
+        catch (Error err)
+        {
+          warning ("Unable to perform search: %s", err.message);
+        }
+        cb (search);
+      });
+    }
+
+    private void dispatch_preview (ResultPreviewer previewer,
+                                   AbstractPreviewCallback cb)
+    {
+      preview_result.begin (previewer.result, (obj, res) =>
+      {
+        var preview = preview_result.end (res);
+        cb (previewer, preview);
+      });
+    }
+
+    public override string normalize_search_query (string search_query)
+    {
+      return search_query.strip ();
     }
 
     /* Query the server for a list of sources that will be used
      * to build sources filter options and search queries.
      */
-    private void query_list_of_sources ()
-    {
-      var msg = new Soup.Message ("GET", UbuntuVideoSearch.sources_uri ());
-      session.queue_message (msg, sources_cb);
-    }
-
-    private Gee.ArrayList<RemoteVideoFile?>? handle_search_response (Soup.Message msg, bool is_treat_yourself = false)
-    {
-      if (msg.status_code != 200)
-      {
-        warning ("Unable to get results from the server: %u, %s", msg.status_code, msg.reason_phrase);
-      }
-      else
-      {
-        try
-        {
-          return UbuntuVideoSearch.process_search_results ((string)msg.response_body.data, is_treat_yourself);
-        }
-        catch (Error e)
-        {
-          warning ("Error processing search results: %s", e.message);
-        }
-      }
-      return null;
-    }
-
-    private void sources_cb (Soup.Session session, Soup.Message msg)
-    {
-      uint interval = RETRY_INTERVAL;
-      if (msg.status_code != 200)
-      {
-        warning ("Unable to query the server for a list of sources, %u: %s", msg.status_code, msg.reason_phrase);
-      }
-      else
-      {
-        try
-        {
-          var sources_array = UbuntuVideoSearch.process_sources_results ((string) msg.response_body.data);
-
-          // remove all existing sources
-          var to_remove = new SList<string> ();
-          foreach (var opt in sources.options)
-            to_remove.append (opt.id);
-          foreach (var id in to_remove)
-            sources.remove_option (id);
-
-          // add sources
-          foreach (var src in sources_array)
-          {
-            sources.add_option (src, src, null);
-          }
-          interval = REFRESH_INTERVAL;
-        }
-        catch (Error e)
-        {
-          warning ("Got invalid json from the server");
-        }
-      }
-      GLib.Timeout.add_seconds (interval, () =>
-      {
-        query_list_of_sources (); return false;
+    private async void query_list_of_sources ()
+    {
+      try
+      {
+        var sources_msg = new Soup.Message ("GET", UbuntuVideoSearch.sources_uri ());
+        var msg = yield queue_soup_message (sources_msg);
+        var sources_array = UbuntuVideoSearch.process_sources_results ((string) msg.response_body.data);
+        // FIXME: do something with the sources once we support dynamic filters
+      }
+      catch (Error e)
+      {
+        warning ("Got invalid json from the server");
+      }
+
+      // refresh the sources after a while
+      GLib.Timeout.add_seconds (REFRESH_INTERVAL, () =>
+      {
+        query_list_of_sources.begin (); return false;
       });
     }
 
-    public override async Unity.ActivationResponse? activate_result (ScopeResult result)
+    public Unity.ActivationResponse? activate_result (ScopeResult result,
+                                                      SearchMetadata metadata,
+                                                      string? action_id)
     {
-      var realcat = result.metadata.lookup (PREVIEW_ON_LMB);
+      var realcat = result.metadata.lookup (RESULT_PREVIEW_ON_LMB);
       // activation of More Suggestions should display a preview.
-      if (realcat != null && realcat.get_boolean ())
+      if (action_id == null && realcat != null && realcat.get_boolean ())
       {
-        var preview = yield preview_result (result);
-        return new Unity.ActivationResponse.with_preview (preview);
+        return new Unity.ActivationResponse (Unity.HandledType.SHOW_PREVIEW);
       }
 
-      return on_activate_uri (result.uri);
+      return on_activate_uri (result);
     }
 
-    private Unity.ActivationResponse on_activate_uri (string rawuri)
+    private Unity.ActivationResponse on_activate_uri (Unity.ScopeResult result)
     {
-      var fakeuri = RemoteUri.from_rawuri (rawuri);
-      if (fakeuri != null)
-      {
-        if (use_zeitgeist)
-          zeitgeist_insert_event (fakeuri.uri, fakeuri.title, fakeuri.icon);
-        try
-        {
-          GLib.AppInfo.launch_default_for_uri (fakeuri.uri, null);
-          return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
-        }
-        catch (GLib.Error e)
-        {
-          warning ("Failed to launch default application for '%s': %s", fakeuri.uri, e.message);
-        }
-      }
-      else
-      {
-        warning ("Invalid raw uri: '%s'", rawuri);
-      }
+      zeitgeist_insert_event (result.uri, result.title, result.icon_hint);
+      // let unity open the uri for us
       return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
     }
 
-    private Unity.ActivationResponse on_play_video (string rawuri)
-    {
-      return on_activate_uri (rawuri);
-    }
-
-    private Unity.Preview? build_preview (RemoteUri uri, RemoteVideoDetails? details)
-    {
-      string title = uri.title;
+    private Unity.Preview? build_preview (ScopeResult result, RemoteVideoDetails? details)
+    {
+      string title = result.title;
       string subtitle = "";
       string description = "";
 
@@ -244,11 +196,24 @@
         }
       }
 
-      GLib.Icon thumbnail = new GLib.FileIcon (GLib.File.new_for_uri (details != null ? details.image : uri.icon));
+      GLib.Icon thumbnail;
+      if (details != null)
+      {
+        thumbnail = new GLib.FileIcon (GLib.File.new_for_uri (details.image));
+      }
+      else
+      {
+        try
+        {
+          thumbnail = GLib.Icon.new_for_string (result.icon_hint);
+        }
+        catch (Error err) { thumbnail = null; }
+      }
 
-      var real_preview = new Unity.MoviePreview (title, subtitle, description, thumbnail);
+      if (subtitle == "") subtitle = result.comment;
+      var real_preview = new Unity.MoviePreview (title, subtitle,
+                                                 description, thumbnail);
       var play_video = new Unity.PreviewAction ("play", _("Play"), null);
-      play_video.activated.connect (on_play_video);
       real_preview.add_action (play_video);
 
       // For now, rating == -1 and num_ratings == 0 hides the rating widget from the preview
@@ -277,159 +242,103 @@
       return real_preview;
     }
 
-    public override async Preview? preview_result (ScopeResult result)
+    public async Preview? preview_result (ScopeResult result)
     {
-      var fakeuri = RemoteUri.from_rawuri (result.uri);
-      if (fakeuri != null)
+      var uri_variant = result.metadata.lookup (RESULT_DETAILS_URI);
+      var details_uri = uri_variant.get_string ();
+      if (details_uri != null && details_uri != "")
       {
-        RemoteVideoDetails? details = null;
-
-        if (fakeuri.details_uri != null && fakeuri.details_uri != "")
-        {
-          try
-          {
-            details = yield get_details (fakeuri.details_uri);
-          }
-          catch (Error e)
-          {
-            warning ("Failed to fetch video details: %s", e.message);
-          }
-        }
-
-        return build_preview (fakeuri, details);
+        try
+        {
+          var details = yield get_details (details_uri);
+          return build_preview (result, details);
+        }
+        catch (Error e)
+        {
+          warning ("Failed to fetch video details: %s", e.message);
+        }
       }
       else
       {
-        warning ("Invalid raw uri: '%s'", result.uri);
+        warning ("Missing details uri for: '%s'", result.uri);
       }
-
-      return null;
+      return build_preview (result, null);
     }
 
     private async RemoteVideoDetails? get_details (string url) throws Error
     {
-      var msg = new Soup.Message ("GET", url);
-      session.queue_message (msg, (session_, msg_) =>
-      {
-        msg = msg_;
-        get_details.callback ();
-      });
-
-      yield;
-
-      if (msg.status_code != 200)
-      {
-        warning ("Unable to get details from the server: %u, %s", msg.status_code, msg.reason_phrase);
-        return null;
-      }
-      else
-      {
+      try
+      {
+        var msg = yield queue_soup_message (new Soup.Message ("GET", url));
         var details = UbuntuVideoSearch.process_details_results ((string) msg.response_body.data);
         return details;
       }
-    }
-
-    private async void update_search_async (DeprecatedScopeSearch search, SearchType search_type, GLib.Cancellable? cancellable)
-    {
-      var search_string = search.search_string.strip ();
-      debug ("Remote search string changed to: %s", search_string);
-
-      var model = search.results_model;
-      model.clear ();
-
-      // only perform the request if the user has not disabled
-      // online/commercial suggestions. That will hide the category as well.
-      if (preferences.remote_content_search != Unity.PreferencesManager.RemoteContent.ALL)
-      {
-        search.finished();
-        return;
-      }
-
-      // create a list of activated sources
-      var active_sources = new Gee.ArrayList<string> (null);
-      foreach (var opt in sources.options)
-      {
-        if (source_activated (opt.id))
-          active_sources.add (opt.id);
-      }
-
-      // If all the sources are activated, don't bother passing them as arguments
-      if (active_sources.size == sources.options.length ())
-      {
-        active_sources.clear ();
-      }
-
-      if (search_type == Unity.SearchType.DEFAULT)
-      {
-        if (at_least_one_source_is_on (active_sources))
-        {
-          try
-          {
-            yield perform_search (search_string, search, active_sources, cancellable);
-          }
-          catch (Error e)
-          {
-            warning ("Search interrupted: %s", e.message);
-          }
-        }
-      }
-
-      search.finished ();
-    }
-
-    private bool source_activated (string id)
-    {
-      bool active = sources.get_option (id).active;
-      bool filtering = sources.filtering;
-
-      if ((active && filtering) || (!active && !filtering))
-        return true;
-      return false;
-    }
-
-    /* Return a general activation state of all sources of this scope.
-     * This is needed, because we don't want to show recommends if an option
-     * from another scope is the only one activated
-     */
-    private bool at_least_one_source_is_on (Gee.ArrayList<string> active_sources)
-    {
-      return (sources.filtering && active_sources.size > 0 || !sources.filtering);
+      catch (Error err)
+      {
+        warning ("Unable to get details from the server: %s", err.message);
+      }
+      return null;
     }
 
     /* Query the server with the search string and the list of sources.
      */
-    private async void perform_search (string search_string, DeprecatedScopeSearch search, Gee.ArrayList<string> active_sources, GLib.Cancellable? cancellable) throws Error
+    private async void perform_search (ScopeSearchBase search) throws Error
     {
-      search.results_model.clear ();
+      if (search.search_context.search_type != Unity.SearchType.DEFAULT) return;
+      var search_string = search.search_context.search_query;
+      var result_set = search.search_context.result_set;
 
-      if ((search_string == null || search_string == "") && (active_sources.size == 0) && (recommendations.size > 0))
+      if ((search_string == null || search_string == "") && (recommendations.size > 0))
       {
         var time = new DateTime.now_utc ();
+        // do we have cached recommendations?
         if (time.to_unix () - recommendations_last_update < REFRESH_INTERVAL)
         {
           debug ("Updating search results with recommendations");
-          update_results_model (search.results_model, recommendations);
+          push_results (result_set, recommendations);
+          result_set.ttl = REFRESH_INTERVAL;
           return;
         }
       }
 
-      var url = UbuntuVideoSearch.build_search_uri (search_string, active_sources);
+      var cancellable = search.search_context.cancellable.get_gcancellable ();
+      var url = UbuntuVideoSearch.build_search_uri (search_string, null, search.search_context.search_metadata.form_factor);
       debug ("Querying the server: %s", url);
 
-      bool is_treat_yourself = (search_string == null || search_string == "" || active_sources.size == 0);
-      var msg = new Soup.Message ("GET", url);
-
+      bool is_treat_yourself = (search_string == null || search_string == "");
+
+      var msg = yield queue_soup_message (new Soup.Message ("GET", url), cancellable);
+
+      var results = UbuntuVideoSearch.process_search_results ((string)msg.response_body.data, is_treat_yourself);
+      if (results != null)
+      {
+        if (search_string == null || search_string.strip () == "")
+        {
+          debug ("Empty search, updating recommendations");
+          var time = new DateTime.now_utc ();
+          recommendations = results;
+          recommendations_last_update = time.to_unix ();
+        }
+        push_results (result_set, results);
+      }
+    }
+
+    private async Soup.Message? queue_soup_message (Soup.Message msg,
+                                                    GLib.Cancellable? cancellable = null)
+      throws Error
+    {
+      Soup.Message? result_msg = null;
       session.queue_message (msg, (session_, msg_) =>
       {
-        msg = msg_;
-        perform_search.callback ();
+        result_msg = msg_;
+        queue_soup_message.callback ();
       });
 
       var cancelled = false;
       ulong cancel_id = 0;
       if (cancellable != null)
       {
-        cancel_id = cancellable.connect (() =>
+        cancel_id = cancellable.cancelled.connect (() =>
         {
           cancelled = true;
           session.cancel_message (msg, Soup.KnownStatusCode.CANCELLED);
@@ -442,39 +351,36 @@
       {
         // we can't disconnect right away, as that would deadlock (cause
         // cancel_message doesn't return before invoking the callback)
-        Idle.add (perform_search.callback);
+        Idle.add (queue_soup_message.callback);
         yield;
         cancellable.disconnect (cancel_id);
         throw new IOError.CANCELLED ("Cancelled");
       }
 
       if (cancellable != null)
-      {
-        // clean up
         cancellable.disconnect (cancel_id);
-      }
-
-      var results = handle_search_response (msg, is_treat_yourself);
-      if (results != null)
-      {
-        if (search_string == null || search_string.strip () == "" && active_sources.size == 0)
-        {
-          debug ("Empty search, updating recommendations");
-          var time = new DateTime.now_utc ();
-          recommendations = results;
-          recommendations_last_update = time.to_unix ();
-        }
-        update_results_model (search.results_model, results);
-      }
+
+      if (result_msg.status_code < 100)
+      {
+        throw new IOError.FAILED ("Request failed with error %u",
+                                  result_msg.status_code);
+      }
+
+      if (result_msg.status_code != 200)
+      {
+        throw new IOError.FAILED ("Request returned status code %u",
+                                  result_msg.status_code);
+      }
+
+      return result_msg;
     }
 
-    private void update_results_model (Dee.Model model, Gee.ArrayList<RemoteVideoFile?> results)
+    private void push_results (Unity.ResultSet result_set, Gee.ArrayList<RemoteVideoFile?> results)
     {
       foreach (var video in results)
       {
         if (video.uri.has_prefix ("http"))
         {
-          var fake_uri = new RemoteUri (video.uri, video.title, video.icon, video.details_uri);
           var result_icon = video.icon;
 
           if (video.category == CAT_INDEX_MORE && video.price != null && video.price != "")
@@ -487,9 +393,19 @@
 
           // aggregator scope remaps categories, so we won't get real category back;
           // put real category into metadata
-          var realcat = new Variant.dict_entry (PREVIEW_ON_LMB, new Variant.variant (video.category == CAT_INDEX_MORE));
-          var metadata = new Variant.array (VariantType.VARDICT.element (), {realcat});
-          model.append (fake_uri.to_rawuri (), result_icon, video.category, ResultType.DEFAULT, "text/html", video.title, video.comment, video.uri, metadata);
+          var realcat = new Variant.dict_entry (RESULT_PREVIEW_ON_LMB,
+            new Variant.variant (video.category == CAT_INDEX_MORE));
+          var details_uri = new Variant.dict_entry (RESULT_DETAILS_URI,
+            new Variant.variant (video.details_uri));
+          var metadata = new Variant.array (VariantType.VARDICT.element (), {realcat, details_uri});
+
+          var result = new Variant ("(ssuussss@a{sv})", video.uri,
+                                    result_icon, video.category,
+                                    ResultType.DEFAULT, "text/html",
+                                    video.title, video.comment,
+                                    video.uri, metadata);
+
+          result_set.add_result_from_variant (result);
         }
       }
     }
@@ -501,18 +417,20 @@
       var ev = new Zeitgeist.Event.full (Zeitgeist.ZG_ACCESS_EVENT, Zeitgeist.ZG_USER_ACTIVITY, "lens://unity-lens-video");
       templates.add ((ev as GLib.Object).ref());
       var data_source = new Zeitgeist.DataSource.full ("98898", "Unity Video Lens", "", templates);
-      zg_sources.register_data_source (data_source, null);
+      zg_sources.register_data_source.begin (data_source, null);
     }
 
     private void zeitgeist_insert_event (string uri, string title, string icon)
     {
+      if (!use_zeitgeist) return;
+
       var subject = new Zeitgeist.Subject.full (uri, Zeitgeist.NFO_VIDEO, Zeitgeist.NFO_REMOTE_DATA_OBJECT, "", uri, title, icon);
       var event = new Zeitgeist.Event.full (Zeitgeist.ZG_ACCESS_EVENT, Zeitgeist.ZG_USER_ACTIVITY, "lens://unity-lens-video");
       event.add_subject (subject);
 
       var ev_array = new PtrArray.sized(1);
       ev_array.add ((event as GLib.Object).ref ());
-      Zeitgeist.Log.get_default ().insert_events_from_ptrarray (ev_array, null);
+      Zeitgeist.Log.get_default ().insert_events_from_ptrarray.begin (ev_array, null);
     }
   }
 }

=== removed file 'src/remote-uri.vala'
--- src/remote-uri.vala	2012-11-15 13:34:30 +0000
+++ src/remote-uri.vala	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * 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]>
- */
-
-namespace Unity.VideoLens
-{
-  public class RemoteUri
-  {
-    public string uri { get; set; }
-    public string title { get; set; }
-    public string icon { get; set; }
-    public string details_uri { get; set; }
-
-    public RemoteUri (string uri, string title, string icon, string details_uri)
-    {
-      this.uri = uri;
-      this.title = title;
-      this.icon = icon;
-      this.details_uri = details_uri;
-    }
-
-    public static RemoteUri? from_rawuri (string raw_uri)
-    {
-      RemoteUri uri = null;
-      string[] args = raw_uri.split ("lens-meta://", 4);
-      if (args.length == 4)
-      {
-        uri = new RemoteUri (args[0], args[1], args[2], args[3]);
-      }
-      return uri;
-    }
-
-    public string to_rawuri ()
-    {
-      return string.join ("lens-meta://", uri, title, icon, details_uri);
-    }
-  }
-}
\ No newline at end of file

=== modified file 'src/remote-video-main.vala'
--- src/remote-video-main.vala	2013-05-16 11:31:51 +0000
+++ src/remote-video-main.vala	2013-09-17 12:19:35 +0000
@@ -19,10 +19,6 @@
 
 namespace Unity.VideoLens {
 
-  static const string BUS_NAME = "net.launchpad.scope.RemoteVideos";
-  Unity.DeprecatedScope scope;
-  static Application? app = null;
-
   public static int main (string[] args)
   {
     GLib.Environment.set_prgname ("unity-remote-video-scope");
@@ -34,28 +30,19 @@
     GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
     GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
 
+    var scope = new RemoteVideoScope ();
+    var exporter = new Unity.ScopeDBusConnector (scope);
     try
     {
-      app = Extras.dbus_own_name (BUS_NAME, () =>
-      {
-        scope = new RemoteVideoScope ();
-        scope.export ();
-      });
-    }
-    catch (Error e)
-    {
-      warning ("Failed to start video lens daemon: %s\n", e.message);
-      return 1;
-    }
-
-    if (app == null)
-    {
-      warning ("Another instance of the Unity Videos Lens " +
-             "already appears to be running.\nBailing out.\n");
-      return 2;
-    }
-
-    return app.run ();
+      exporter.export ();
+    }
+    catch (GLib.Error e)
+    {
+      error ("Cannot export scope to DBus: %s", e.message);
+    }
+    Unity.ScopeDBusConnector.run ();
+
+    return 0;
   }
 
 } /* namespace */

=== modified file 'src/ubuntu-video-search.vala'
--- src/ubuntu-video-search.vala	2012-11-27 12:07:22 +0000
+++ src/ubuntu-video-search.vala	2013-09-17 12:19:35 +0000
@@ -28,10 +28,10 @@
 
   public static string recommendations_uri ()
   {
-    return SERVER + "/search?q=&sources=Amazon";
+    return SERVER + "/search?q=";
   }
 
-  public static string build_search_uri (string query, Gee.ArrayList<string>? sources)
+  public static string build_search_uri (string query, Gee.ArrayList<string>? sources, string? form_factor = null)
   {
     var uri = new StringBuilder ();
     uri.append (SERVER);
@@ -48,6 +48,11 @@
         uri.append (sources[i]);
       }
     }
+    if (form_factor != null)
+    {
+      uri.append ("&form_factor=");
+      uri.append (form_factor);
+    }
     return uri.str;
   }
 
@@ -226,4 +231,4 @@
     });
     return videos;
   }
-}
\ No newline at end of file
+}

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2013-06-20 18:12:31 +0000
+++ tests/unit/Makefile.am	2013-09-17 12:19:35 +0000
@@ -65,7 +65,6 @@
 	$(top_srcdir)/src/ubuntu-video-search.vala \
 	$(top_srcdir)/src/video-file.vala \
 	$(top_srcdir)/src/remote-scope.vala \
-	$(top_srcdir)/src/remote-uri.vala \
 	$(top_srcdir)/src/utils.vala \
 	$(NULL)