Merge lp:~stolowski/unity-lens-video/merge-smartscopes into lp:unity-lens-video

[Paweł Stołowski]

Merge new scope API changes (100 scopes feature).

Merge new scope API changes (100 scopes feature).
Note: needs libunity 7.0.0 to land (should happen very soon).

[lp:~stolowski/unity-lens-video/merge-smartscopes]

117. By Paweł Stołowski on 2013-05-16

Fixed required version of libunity-dev.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-i386-ci/2/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-i386-ci/3/console

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

review: Needs Fixing (continuous-integration)

[lp:~stolowski/unity-lens-video/merge-smartscopes]

118. By Paweł Stołowski on 2013-05-16

Bumped changelog.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-amd64-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-armhf-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-i386-ci/4

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-raring-i386-ci/5

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

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks good, but it's late, soo... Anyway, approved!

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-05-16 21:30:36 +0000
@@ -0,0 +1,44 @@
+Makefile
+Makefile.in
+config.guess
+config.sub
+config.h
+config.h.in
+config.log
+configure
+config.status
+libtool
+ltmain.sh
+aclocal.m4
+autom4te.cache
+compile
+depcomp
+install-sh
+missing
+stamp-h*
+.libs
+.deps
+*.stamp
+data/*.scope
+data/*.scope.in
+data/*.service
+m4/intltool.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
+po/unity-lens-video.pot
+src/*.c
+src/config.vala
+tests/unit/*.c
+src/unity-scope-video-remote
+src/unity-video-lens-daemon
+tests/unit/config-tests.vala
+tests/unit/test-locate
+tests/unit/test-ubuntu-video-search
+tests/unit/test-utils

=== modified file 'configure.ac'
--- configure.ac	2013-02-19 11:58:41 +0000
+++ configure.ac	2013-05-16 21:30:36 +0000
@@ -1,4 +1,4 @@
-AC_INIT(unity-lens-video, 6.8.0, https://launchpad.net/unity-lens-video)
+AC_INIT(unity-lens-video, 6.9.0, https://launchpad.net/unity-lens-video)
 AC_COPYRIGHT([Copyright 2012 Canonical])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -46,10 +46,10 @@
 AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory])
 
 ######################################################
-# intltool rule for generating translated .lens file
+# intltool rule for generating translated .scope file
 ######################################################
-INTLTOOL_LENS_RULE='%.lens: %.lens.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_LENS_RULE)
+INTLTOOL_SCOPE_RULE='%.scope: %.scope.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST(INTLTOOL_SCOPE_RULE)
 
 ###########################
 # gcov coverage reporting
@@ -66,7 +66,7 @@
 # Check for module and library dependancies
 #####################################################
 GLIB_REQUIRED=2.27
-PKG_CHECK_MODULES(LENS_DAEMON,
+PKG_CHECK_MODULES(SCOPE_DAEMON,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
                   gio-2.0 >= $GLIB_REQUIRED
@@ -76,12 +76,12 @@
                   libsoup-gnome-2.4
                   json-glib-1.0
                   zeitgeist-1.0 >= 0.3.8
-                  unity >= 6.90.2
-                  unity-extras >= 6.90.2
+                  unity >= 7.0.0
+                  unity-extras >= 6.91.11
                   )
 
-AC_SUBST(LENS_DAEMON_CFLAGS)
-AC_SUBST(LENS_DAEMON_LIBS)
+AC_SUBST(SCOPE_DAEMON_CFLAGS)
+AC_SUBST(SCOPE_DAEMON_LIBS)
 
 ####################################################################
 # C compiler warnings
@@ -153,14 +153,14 @@
 AC_SUBST(DBUSSERVICEDIR)
 
 #####################################################
-# Look for correct Lenses dir
+# Look for correct Scopes dir
 #####################################################
 if test "x$with_localinstall" = "xyes"; then
-	LENSESDIR="${datadir}/unity/lenses"
+	SCOPESDIR="${datadir}/unity/scopes"
 else
-	LENSESDIR=`$PKG_CONFIG --variable=lensesdir unity`
+	SCOPESDIR=`$PKG_CONFIG --variable=scopesdir unity`
 fi
-AC_SUBST(LENSESDIR)
+AC_SUBST(SCOPESDIR)
 
 #############################################
 # GSettings macros
@@ -174,7 +174,8 @@
 AC_CONFIG_FILES([
   Makefile
   data/Makefile
-  data/video.lens.in
+  data/local.scope.in
+  data/remote.scope.in
   src/Makefile
   po/Makefile.in
   src/config.vala
@@ -199,7 +200,7 @@
   Extra CFlags    : ${CPPFLAGS} $MAINTAINER_CFLAGS
   Extra ValaFlags : ${CPPFLAGS} $MAINTAINER_VALAFLAGS
 
-  Lenses Directory: ${LENSESDIR}
+  Scopes Directory: ${SCOPESDIR}
 
   Testing
     Headless tests     : ${enable_headless_tests}

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-02-18 11:14:01 +0000
+++ data/Makefile.am	2013-05-16 21:30:36 +0000
@@ -1,7 +1,7 @@
 dbus_servicesdir = $(DBUSSERVICEDIR)
 service_in_files =  \
   unity-scope-video-remote.service.in \
-  unity-lens-video.service.in \
+  unity-scope-video-local.service.in \
   $(NULL)
 
 dbus_services_DATA = $(service_in_files:.service.in=.service)
@@ -9,19 +9,20 @@
 %.service: %.service.in
 	$(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
-lens_in_files = video.lens.in video-remote.scope
-lensdir = $(LENSESDIR)/video
-lens_DATA = $(lens_in_files:.lens.in=.lens)
+scope_in_files = local.scope.in remote.scope.in
+scopedir = $(SCOPESDIR)/video
+scope_DATA = $(scope_in_files:.scope.in=.scope)
 
-@INTLTOOL_LENS_RULE@
+@INTLTOOL_SCOPE_RULE@
 
 EXTRA_DIST = \
   $(service_in_files) \
-  $(lens_in_files) \
+  $(scope_in_files) \
   $(NULL)
 
 CLEANFILES = \
   unity-scope-video-remote.service \
   unity-lens-video.service \
-  video.lens \
+  local.scope \
+  remote.scope \
   $(NULL)

=== renamed file 'data/video.lens.in.in' => 'data/local.scope.in.in'
--- data/video.lens.in.in	2012-11-22 12:23:14 +0000
+++ data/local.scope.in.in	2013-05-16 21:30:36 +0000
@@ -1,9 +1,10 @@
-[Lens]
-DBusName=net.launchpad.lens.video
-DBusPath=/net/launchpad/lens/video
+[Scope]
+DBusName=net.launchpad.scope.LocalVideos
+DBusPath=/net/launchpad/scope/localvideos
 _Name=Videos
-Icon=/usr/share/unity/6/lens-nav-video.svg
-_Description=Search local videos
+Type=video
+Icon=@prefix@/share/unity/icons/lens-nav-video.svg
+_Description=This is an Ubuntu search plugin that enables local videos to be searched and displayed in the Dash underneath the Video header. If you do not wish to search this content source, you can disable this search plugin.
 Shortcut=v
 
 [Desktop Entry]

=== renamed file 'data/video-remote.scope' => 'data/remote.scope.in.in'
--- data/video-remote.scope	2012-11-22 12:23:14 +0000
+++ data/remote.scope.in.in	2013-05-16 21:30:36 +0000
@@ -1,3 +1,12 @@
 [Scope]
 DBusName=net.launchpad.scope.RemoteVideos
 DBusPath=/net/launchpad/scope/remotevideos
+_Name=Remote Videos
+Type=video
+Icon=@prefix@/share/unity/icons/lens-nav-video.svg
+_Description=This is an Ubuntu search plugin that enables information from various video providers to be searched and displayed in the Dash underneath the Video header. If you do not wish to search these content sources, you can disable this search plugin.
+GlobalSearches=false
+RemoteContent=true
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=unity-lens-video

=== renamed file 'data/unity-lens-video.service.in' => 'data/unity-scope-video-local.service.in'
--- data/unity-lens-video.service.in	2013-02-18 11:14:01 +0000
+++ data/unity-scope-video-local.service.in	2013-05-16 21:30:36 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=net.launchpad.lens.video
+Name=net.launchpad.scope.LocalVideos
 Exec=@pkglibexecdir@/unity-video-lens-daemon

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 21:58:03 +0000
+++ debian/changelog	2013-05-16 21:30:36 +0000
@@ -1,3 +1,9 @@
+unity-lens-video (0.3.15-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Pawel Stolowski <[e-mail]>  Thu, 16 May 2013 23:27:08 +0200
+
 unity-lens-video (0.3.14daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   [ Sebastien Bacher ]

=== modified file 'debian/control'
--- debian/control	2013-04-11 08:31:17 +0000
+++ debian/control	2013-05-16 21:30:36 +0000
@@ -11,7 +11,7 @@
                libglib2.0-dev (>= 2.27),
                libjson-glib-dev,
                libsoup-gnome2.4-dev,
-               libunity-dev (>= 6.90.2),
+               libunity-dev (>= 7.0.0),
                libzeitgeist-dev (>= 0.3.8),
                valac-0.18,
                xvfb,

=== modified file 'debian/unity-lens-video.install'
--- debian/unity-lens-video.install	2013-02-18 11:14:01 +0000
+++ debian/unity-lens-video.install	2013-05-16 21:30:36 +0000
@@ -1,3 +1,3 @@
 /usr/lib/*/unity-lens-video/unity-video-lens-daemon
-/usr/share/dbus-1/services/unity-lens-video.service
-/usr/share/unity/lenses/video/video.lens
+/usr/share/dbus-1/services/unity-scope-video-local.service
+/usr/share/unity/scopes/video/local.scope

=== modified file 'debian/unity-scope-video-remote.install'
--- debian/unity-scope-video-remote.install	2013-02-18 11:14:01 +0000
+++ debian/unity-scope-video-remote.install	2013-05-16 21:30:36 +0000
@@ -1,3 +1,3 @@
 /usr/lib/*/unity-lens-video/unity-scope-video-remote
 /usr/share/dbus-1/services/unity-scope-video-remote.service
-/usr/share/unity/lenses/video/video-remote.scope
+/usr/share/unity/scopes/video/remote.scope

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-04-22 13:09:18 +0000
+++ po/POTFILES.in	2013-05-16 21:30:36 +0000
@@ -6,4 +6,5 @@
 src/scope.vala
 src/ubuntu-video-search.vala
 tests/unit/test-ubuntu-video-search.vala
-[type: gettext/ini]data/video.lens.in.in
+[type: gettext/ini]data/local.scope.in.in
+[type: gettext/ini]data/remote.scope.in.in

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-02-19 11:58:41 +0000
+++ src/Makefile.am	2013-05-16 21:30:36 +0000
@@ -5,6 +5,7 @@
 
 DATADIR = $(datadir)
 
+AM_CFLAGS = -w
 AM_CPPFLAGS = $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(COVERAGE_LDFLAGS)
 
@@ -18,7 +19,7 @@
   -DPKGDATADIR=\"$(PKGDATADIR)\" \
   -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
   -DG_LOG_DOMAIN=\"unity-video-lens-daemon\" \
-  $(LENS_DAEMON_CFLAGS) \
+  $(SCOPE_DAEMON_CFLAGS) \
   $(MAINTAINER_CFLAGS) \
   -I$(srcdir) \
   $(NULL)
@@ -28,7 +29,7 @@
   -DPKGDATADIR=\"$(PKGDATADIR)\" \
   -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
   -DG_LOG_DOMAIN=\"unity-scope-video-remote\" \
-  $(LENS_DAEMON_CFLAGS) \
+  $(SCOPE_DAEMON_CFLAGS) \
   $(MAINTAINER_CFLAGS) \
   -I$(srcdir) \
   $(NULL)
@@ -68,11 +69,11 @@
 
 
 unity_video_lens_daemon_LDADD = \
-  $(LENS_DAEMON_LIBS) \
+  $(SCOPE_DAEMON_LIBS) \
   $(NULL)
 
 unity_scope_video_remote_LDADD = \
-  $(LENS_DAEMON_LIBS) \
+  $(SCOPE_DAEMON_LIBS) \
   $(NULL)
 
 unity_video_lens_daemon_VALASOURCES = \

=== modified file 'src/config.vala.in'
--- src/config.vala.in	2012-11-09 15:11:21 +0000
+++ src/config.vala.in	2013-05-16 21:30:36 +0000
@@ -13,4 +13,6 @@
   const string PACKAGE = "@PACKAGE@";
 
   const string VERSION = "@VERSION@";
+
+  const string ICON_PATH = "@DATADIR@/icons/unity-icon-theme/places/svg";
 }

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-04-11 08:33:35 +0000
+++ src/daemon.vala	2013-05-16 21:30:36 +0000
@@ -16,64 +16,22 @@
  * Authored by Pawel Stolowski <[e-mail]>
  * based on python code by David Calle <[e-mail]>
  */
-using Config;
 
 namespace Unity.VideoLens {
 
-  const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
-
   public class Daemon : GLib.Object
   {
-    private Unity.Lens lens;
+    private Unity.DeprecatedScope scope;
 
     construct
     {
-      lens = new Unity.Lens("/net/launchpad/lens/video", "video");
-      lens.search_in_global = true;
-      lens.search_hint = _("Search Videos");
-      lens.sources_display_name = _("Sources");
-      lens.visible = true;
-
-      populate_categories ();
-      populate_filters ();
-
-      var video_scope = new VideoScope ();
-      lens.add_local_scope (video_scope);
+      scope = new VideoScope ();
 
       try {
-        lens.export ();
+        scope.export ();
       } catch (GLib.IOError e) {
         stdout.printf ("error %s\n", e.message);
       }
     }
-
-    private void populate_filters ()
-    {
-      var filters = new GLib.List<Unity.Filter> ();
-
-      /* TODO */
-
-      /* A filter */
-      {
-      }
-
-      /* Another filter */
-      {
-      }
-
-      lens.filters = filters;
-    }
-
-    private void populate_categories ()
-    {
-      var categories = new GLib.List<Unity.Category> ();
-      var icon_dir = File.new_for_path (ICON_PATH);
-
-      categories.append(new Unity.Category (_("My Videos"), new FileIcon (icon_dir.get_child ("group-videos.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
-      categories.append(new Unity.Category (_("Online"), new FileIcon (icon_dir.get_child ("group-internet.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
-      categories.append(new Unity.Category (_("More suggestions"), new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
-
-      lens.categories = categories;
-    }
   }
 }

=== modified file 'src/main.vala'
--- src/main.vala	2012-11-27 16:34:26 +0000
+++ src/main.vala	2013-05-16 21:30:36 +0000
@@ -35,7 +35,7 @@
 
     try
     {
-      app = Extras.dbus_own_name ("net.launchpad.lens.video", () =>
+      app = Extras.dbus_own_name ("net.launchpad.scope.LocalVideos", () =>
       {
         daemon = new Daemon ();
       });

=== modified file 'src/remote-scope-globals.vala'
--- src/remote-scope-globals.vala	2012-11-15 16:51:50 +0000
+++ src/remote-scope-globals.vala	2013-05-16 21:30:36 +0000
@@ -20,6 +20,6 @@
 
 namespace Unity.VideoLens
 {
-  static int CAT_INDEX_ONLINE = 1;
-  static int CAT_INDEX_MORE = 2;
-}
\ No newline at end of file
+  static int CAT_INDEX_ONLINE = 0;
+  static int CAT_INDEX_MORE = 1;
+}

=== modified file 'src/remote-scope.vala'
--- src/remote-scope.vala	2013-03-01 11:30:20 +0000
+++ src/remote-scope.vala	2013-05-16 21:30:36 +0000
@@ -18,13 +18,16 @@
  *
  */
 
+using Config;
+
 namespace Unity.VideoLens
 {
-  public class RemoteVideoScope : Unity.Scope
+  public class RemoteVideoScope : Unity.DeprecatedScope
   {
     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 Soup.Session session;
     private PreferencesManager preferences = PreferencesManager.get_default ();
     Gee.ArrayList<RemoteVideoFile?> recommendations;
@@ -34,11 +37,15 @@
 
     public RemoteVideoScope ()
     {
-      Object (dbus_path: "/net/launchpad/scope/remotevideos");
+        Object (dbus_path: "/net/launchpad/scope/remotevideos", id: "video-remote.scope");
     }
 
     protected override void constructed ()
     {
+      base.constructed ();
+
+      schema.add_field (PREVIEW_ON_LMB, "b", Unity.Schema.FieldType.OPTIONAL);
+
       recommendations = new Gee.ArrayList<RemoteVideoFile?> ();
 
       use_zeitgeist = false;
@@ -63,8 +70,6 @@
       {
         update_search_async.begin (search, search_type, cancellable);
       });
-      filters_changed.connect (on_filters_changed);
-      sources.notify["filtering"].connect (on_filters_changed);
 
       generate_search_key.connect ((scope, search) =>
       {
@@ -76,9 +81,7 @@
         queue_search_changed (SearchType.DEFAULT);
       });
 
-      activate_uri.connect (on_activate_uri);
-      preview_uri.connect (on_preview_uri);
-
+      populate_categories ();
       query_list_of_sources ();
 
       // refresh the at least once every 30 minutes
@@ -97,6 +100,17 @@
       }
     }
 
+    private void populate_categories ()
+    {
+      var categories = new Unity.CategorySet ();
+      var icon_dir = File.new_for_path (Config.ICON_PATH);
+
+      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;
+    }
+
     /* Query the server for a list of sources that will be used
      * to build sources filter options and search queries.
      */
@@ -164,6 +178,19 @@
       });
     }
 
+    public override async Unity.ActivationResponse? activate_result (ScopeResult result)
+    {
+      var realcat = result.metadata.lookup (PREVIEW_ON_LMB);
+      // activation of More Suggestions should display a preview.
+      if (realcat != null && realcat.get_boolean ())
+      {
+        var preview = yield preview_result (result);
+        return new Unity.ActivationResponse.with_preview (preview);
+      }
+
+      return on_activate_uri (result.uri);
+    }
+
     private Unity.ActivationResponse on_activate_uri (string rawuri)
     {
       var fakeuri = RemoteUri.from_rawuri (rawuri);
@@ -250,37 +277,30 @@
       return real_preview;
     }
 
-    private Unity.Preview? on_preview_uri (string rawuri)
+    public override async Preview? preview_result (ScopeResult result)
     {
-      var fakeuri = RemoteUri.from_rawuri (rawuri);
+      var fakeuri = RemoteUri.from_rawuri (result.uri);
       if (fakeuri != null)
       {
+        RemoteVideoDetails? details = null;
+
         if (fakeuri.details_uri != null && fakeuri.details_uri != "")
         {
-          var preview = new AsyncPreview ();
-          get_details.begin (fakeuri.details_uri, (obj, res) =>
-          {
-            try
-            {
-              var details = get_details.end (res);
-              preview.preview_ready (build_preview (fakeuri, details));
-            }
-            catch (Error e)
-            {
-              warning ("Failed to fetch video details: %s", e.message);
-              preview.preview_ready (build_preview (fakeuri, null));
-            }
-          });
-          return preview;
-        }
-        else
-        {
-          return build_preview (fakeuri, null);
-        }
+          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);
       }
       else
       {
-        warning ("Invalid raw uri: '%s'", rawuri);
+        warning ("Invalid raw uri: '%s'", result.uri);
       }
 
       return null;
@@ -309,7 +329,7 @@
       }
     }
 
-    private async void update_search_async (LensSearch search, SearchType search_type, Cancellable? cancellable)
+    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);
@@ -343,7 +363,14 @@
       {
         if (at_least_one_source_is_on (active_sources))
         {
-          yield perform_search (search_string, search, active_sources, cancellable);
+          try
+          {
+            yield perform_search (search_string, search, active_sources, cancellable);
+          }
+          catch (Error e)
+          {
+            warning ("Search interrupted: %s", e.message);
+          }
         }
       }
 
@@ -369,14 +396,9 @@
       return (sources.filtering && active_sources.size > 0 || !sources.filtering);
     }
 
-    private void on_filters_changed ()
-    {
-      queue_search_changed (SearchType.DEFAULT);
-    }
-
     /* Query the server with the search string and the list of sources.
      */
-    private async void perform_search (string search_string, LensSearch search, Gee.ArrayList<string> active_sources, Cancellable? cancellable)
+    private async void perform_search (string search_string, DeprecatedScopeSearch search, Gee.ArrayList<string> active_sources, GLib.Cancellable? cancellable) throws Error
     {
       search.results_model.clear ();
 
@@ -463,7 +485,11 @@
             result_icon = anno_icon.to_string ();
           }
 
-          model.append (fake_uri.to_rawuri (), result_icon, video.category, "text/html", video.title, video.comment, video.uri);
+          // 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);
         }
       }
     }

=== modified file 'src/remote-video-main.vala'
--- src/remote-video-main.vala	2012-11-27 16:34:26 +0000
+++ src/remote-video-main.vala	2013-05-16 21:30:36 +0000
@@ -20,7 +20,7 @@
 namespace Unity.VideoLens {
 
   static const string BUS_NAME = "net.launchpad.scope.RemoteVideos";
-  Unity.Scope scope;
+  Unity.DeprecatedScope scope;
   static Application? app = null;
 
   public static int main (string[] args)
@@ -39,6 +39,7 @@
       app = Extras.dbus_own_name (BUS_NAME, () =>
       {
         scope = new RemoteVideoScope ();
+        scope.export ();
       });
     }
     catch (Error e)

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-11-28 11:54:14 +0000
+++ src/scope.vala	2013-05-16 21:30:36 +0000
@@ -18,14 +18,15 @@
  *
  */
 
+using Config;
+
 namespace Unity.VideoLens
 {
-  public class VideoScope : Unity.Scope
+  public class VideoScope : Unity.DeprecatedScope
   {
     private static const int MAX_ZG_EVENTS = 24;
     private static const int CAT_INDEX_MY_VIDEOS = 0;
     private static const int CAT_INDEX_ONLINE = 1;
-    private static const int CAT_INDEX_MORE = 2;
     private static const int REFRESH_TIMEOUT = 30;
 
     private static string cache_directory;
@@ -36,9 +37,12 @@
     private Locate locate;
     private BlacklistTracker blacklist_tracker;
 
+    private Variant empty_asv;
+
     public VideoScope ()
     {
-      Object (dbus_path: "/net/launchpad/lens/video/main");
+      Object (dbus_path: "/net/launchpad/scope/localvideos", id: "video-local.scope");
+      empty_asv = new Variant.array (VariantType.VARDICT.element (), {});
 
       videos_folder = GLib.Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
       cache_directory = GLib.Environment.get_user_cache_dir () + "/unity-lens-video";
@@ -60,8 +64,10 @@
       locate = new Locate (cache_directory, videos_folder);
 
       search_in_global = true;
+      search_hint = _("Search Videos");
+      visible = true;
       sources.add_option ("local", _("My Videos"), null);
-      provides_personal_content = true;
+      populate_categories ();
 
       GLib.Timeout.add_seconds (REFRESH_TIMEOUT, refresh_results);
 
@@ -69,13 +75,17 @@
       {
         dispatch_search (search, search_type, cancellable);
       });
-
-      filters_changed.connect (on_filters_changed);
-      sources.notify["filtering"].connect (on_filters_changed);
-      preview_uri.connect ((uri) =>
-      {
-        return generate_preview_for_uri (uri);
-      });
+    }
+
+    private void populate_categories ()
+    {
+      var categories = new Unity.CategorySet ();
+      var icon_dir = File.new_for_path (Config.ICON_PATH);
+
+      categories.add(new Unity.Category ("local", _("My Videos"), new FileIcon (icon_dir.get_child ("group-videos.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
+      categories.add(new Unity.Category ("online", _("Online"), new FileIcon (icon_dir.get_child ("group-internet.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
+
+      this.categories = categories;
     }
 
     private bool refresh_results ()
@@ -85,12 +95,7 @@
       return true;
     }
 
-    private void on_filters_changed ()
-    {
-      queue_search_changed (Unity.SearchType.DEFAULT);
-    }
-
-    private async void dispatch_search (LensSearch search, SearchType search_type, Cancellable cancellable)
+    private async void dispatch_search (DeprecatedScopeSearch search, SearchType search_type, GLib.Cancellable cancellable)
     {
       var search_string = search.search_string.strip ();
       var search_status = search;
@@ -134,7 +139,7 @@
       }
     }
 
-    private void update_results_model (string search_string, Dee.Model model, string cat, Cancellable? cancellable, LensSearch search, bool clear_model = true)
+    private void update_results_model (string search_string, Dee.Model model, string cat, GLib.Cancellable? cancellable, DeprecatedScopeSearch search, bool clear_model = true)
     {
       var home_folder = GLib.Environment.get_home_dir ();
 
@@ -155,16 +160,17 @@
       }
     }
 
-    internal void add_results (LensSearch search_status, Dee.Model model, string cat, Cancellable? cancellable, Gee.ArrayList<VideoFile?> result_list, string search, bool clear_model)
+    internal void add_results (DeprecatedScopeSearch search_status, Dee.Model model, string cat, GLib.Cancellable? cancellable, Gee.ArrayList<VideoFile?> result_list, string search, bool clear_model)
     {
       if (cancellable != null && !cancellable.is_cancelled ())
       {
+        var results_model = search_status.results_model;
         if (clear_model)
-          search_status.results_model.clear ();
+          results_model.clear ();
 
         foreach (var video in result_list)
         {
-          results_model.append (video.uri, video.icon, video.category, "text/html", video.title, video.comment, video.uri);
+          results_model.append (video.uri, video.icon, video.category, ResultType.PERSONAL, "text/html", video.title, video.comment, video.uri, empty_asv);
         }
 
         if (search_status != null)
@@ -180,7 +186,7 @@
       return a.lc_title.collate (b.lc_title);
     }
 
-    private async void zg_call (Cancellable? cancellable, LensSearch search_status) throws Error
+    private async void zg_call (GLib.Cancellable? cancellable, DeprecatedScopeSearch search_status) throws Error
     {
       bool active = sources.get_option ("local").active;
       bool filtering = sources.filtering;
@@ -215,7 +221,7 @@
       return false;
     }
 
-    internal void process_zg_events (Zeitgeist.ResultSet events, Cancellable cancellable, LensSearch search_status)
+    internal void process_zg_events (Zeitgeist.ResultSet events, GLib.Cancellable cancellable, DeprecatedScopeSearch search_status)
     {
       var result_list = new Gee.ArrayList<VideoFile?> ();
 
@@ -270,10 +276,11 @@
         }
       }
 
-      search_status.results_model.clear ();
+      var results_model = search_status.results_model;
+      results_model.clear ();
       foreach (var video in result_list)
       {
-        results_model.append (video.uri, video.icon, video.category, "text/html", video.title, video.comment, video.uri);
+        results_model.append (video.uri, video.icon, video.category, ResultType.PERSONAL, "text/html", video.title, video.comment, video.uri, empty_asv);
       }
 
       update_results_model ("", search_status.results_model, "lens", cancellable, search_status, false);
@@ -293,99 +300,86 @@
       return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
     }
 
-    private Preview? generate_preview_for_uri (string uri)
+    public override async Preview? preview_result (ScopeResult result)
     {
-      debug ("Preview uri: %s", uri);
-
-      Unity.Preview preview = null;
-      var model = results_model;
-      var iter = model.get_first_iter ();
-      while (!model.is_last (iter))
-      {
-        if (model.get_string (iter, 0) == uri)
-        {
-          var title = model.get_string (iter, 4);
-          string subtitle = "";
-          int64 file_size = 0;
-          bool local_video = uri.has_prefix ("file://");
-
-          if (local_video)
-          {
-            var file = GLib.File.new_for_uri (uri);
-            try
-            {
-              var finfo = file.query_info (GLib.FileAttribute.TIME_MODIFIED + "," + GLib.FileAttribute.STANDARD_SIZE, GLib.FileQueryInfoFlags.NONE, null);
-              file_size = finfo.get_size ();
-              var tval = finfo.get_modification_time ();
-              var dt = new DateTime.from_timeval_local (tval);
-              subtitle = dt.format ("%x, %X");
-            }
-            catch (Error e)
-            {
-              // empty subtitle
-            }
-          }
-          var desc = model.get_string (iter, 5);
-
-          preview = new Unity.MoviePreview (title, subtitle, desc, null);
-          preview.closed.connect (on_preview_closed);
-          var play_video = new Unity.PreviewAction ("play", _("Play"), null);
-          preview.add_action (play_video);
-          preview.image_source_uri = model.get_string (iter, 1);
-
-          if (local_video)
-          {
-            var show_folder = new Unity.PreviewAction ("show-in-folder", _("Show in Folder"), null);
-            show_folder.activated.connect (show_in_folder);
-            preview.add_action (show_folder);
-          }
-
-          // we may get remote uris from zeitgeist - fetch details for local files only
-          if (local_video)
-          {
-            var async_preview = new Unity.AsyncPreview ();
-            preview.image_source_uri = uri;
-
-            if (preview_player == null)
-              preview_player = new Unity.Extras.PreviewPlayer ();
-
-            preview_player.video_properties.begin (uri, (obj, res) =>
-            {
-              try
-              {
-                var props = preview_player.video_properties.end (res);
-                if ("width" in props && "height" in props && "codec" in props)
-                {
-                  var width = props["width"].get_uint32 ();
-                  var height = props["height"].get_uint32 ();
-                  var codec = props["codec"].get_string ();
-                  string dimensions = "%u*%u".printf (width, height);
-                  if (width > 0 && height > 0)
-                  {
-                    var gcd = Utils.gcd (width, height);
-                    dimensions += ", %u:%u".printf (width / gcd, height / gcd);
-                  }
-
-                  preview.add_info (new Unity.InfoHint ("format", _("Format"), null, codec));
-                  preview.add_info (new Unity.InfoHint ("dimensions", _("Dimensions"), null, dimensions));
-                  preview.add_info (new Unity.InfoHint ("size", _("Size"), null, GLib.format_size (file_size)));
-                }
-              }
-              catch (Error e)
-              {
-                warning ("Couldn't get video details: %s", e.message);
-              }
-              async_preview.preview_ready (preview);
-            });
-            return async_preview;
-          }
-          break;
-        }
-        iter = model.next (iter);
-      }
-
-      if (preview == null)
-        warning ("Couldn't find model row for requested preview uri: %s", uri);
+      debug ("Preview uri: %s", result.uri);
+
+      Unity.MoviePreview preview = null;
+      string subtitle = "";
+      int64 file_size = 0;
+      bool local_video = result.uri.has_prefix ("file://");
+
+      if (local_video)
+      {
+        var file = GLib.File.new_for_uri (result.uri);
+        try
+        {
+          var finfo = file.query_info (GLib.FileAttribute.TIME_MODIFIED + "," + GLib.FileAttribute.STANDARD_SIZE, GLib.FileQueryInfoFlags.NONE, null);
+          file_size = finfo.get_size ();
+          var tval = finfo.get_modification_time ();
+          var dt = new DateTime.from_timeval_local (tval);
+          subtitle = dt.format ("%x, %X");
+        }
+        catch (Error e)
+        {
+          // empty subtitle
+        }
+      }
+
+      preview = new Unity.MoviePreview (result.title, subtitle, result.comment, null);
+      preview.set_rating (-1.0f, 0);
+      var play_video = new Unity.PreviewAction ("play", _("Play"), null);
+      preview.add_action (play_video);
+      preview.image_source_uri = result.icon_hint;
+
+      if (local_video)
+      {
+        var show_folder = new Unity.PreviewAction ("show-in-folder", _("Show in Folder"), null);
+        show_folder.activated.connect (show_in_folder);
+        preview.add_action (show_folder);
+      }
+
+      // we may get remote uris from zeitgeist - fetch details for local files only
+      if (local_video)
+      {
+        preview.image_source_uri = result.uri;
+
+        if (preview_player == null)
+          preview_player = new Unity.Extras.PreviewPlayer ();
+
+        try
+        {
+          var props = yield preview_player.video_properties (result.uri);
+          if ("width" in props && "height" in props && "codec" in props)
+          {
+            var width = props["width"].get_uint32 ();
+            var height = props["height"].get_uint32 ();
+            var codec = props["codec"].get_string ();
+            string dimensions = "%u*%u".printf (width, height);
+            if (width > 0 && height > 0)
+            {
+              var gcd = Utils.gcd (width, height);
+              dimensions += ", %u:%u".printf (width / gcd, height / gcd);
+            }
+
+            preview.add_info (new Unity.InfoHint ("format", _("Format"), null, codec));
+            preview.add_info (new Unity.InfoHint ("dimensions", _("Dimensions"), null, dimensions));
+            preview.add_info (new Unity.InfoHint ("size", _("Size"), null, GLib.format_size (file_size)));
+          }
+        }
+        catch (Error e)
+        {
+          warning ("Couldn't get video details: %s", e.message);
+        }
+        try
+        {
+          yield preview_player.close();
+        }
+        catch (Error e)
+        {
+          warning ("Failed to close preview player: %s", e.message);
+        }
+      }
 
       return preview;
     }
@@ -400,21 +394,6 @@
       return false;
     }
 
-    private void on_preview_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 bool source_activated (string source)
     {
       // Return the state of a sources filter option

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2013-02-19 12:20:44 +0000
+++ tests/unit/Makefile.am	2013-05-16 21:30:36 +0000
@@ -25,11 +25,11 @@
 	  $(MAINTAINER_VALAFLAGS) \
 	  $(NULL)
 
-LDADD = $(LENS_DAEMON_LIBS) \
+LDADD = $(SCOPE_DAEMON_LIBS) \
 	$(test_libs)
 
 AM_CPPFLAGS = \
-  $(LENS_DAEMON_CFLAGS) \
+  $(SCOPE_DAEMON_CFLAGS) \
   -I$(srcdir) \
   -I$(top_srcdir)/src \
   -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \

=== modified file 'tests/unit/config-tests.vala.in'
--- tests/unit/config-tests.vala.in	2013-02-19 12:20:44 +0000
+++ tests/unit/config-tests.vala.in	2013-05-16 21:30:36 +0000
@@ -3,4 +3,5 @@
   const string LOCALEDIR = "@DATADIR@/locale";
   const string PACKAGE = "@PACKAGE@";
   const string VERSION = "@VERSION@";
+  const string ICON_PATH = "@DATADIR@/icons/unity-icon-theme/places/svg";
 }