Merge lp:~stolowski/unity-lens-video/vala-rewrite into lp:unity-lens-video

[Paweł Stołowski]

This is video lens & remote video scope, rewritten in vala. Majority of the logic in the code is based on the original logic of python code and it shares the same shortcomings (e.g. it's based on "locate"), but this is a starting point for further improvements. This branch also introduces unit tests.

This is video lens & remote video scope, rewritten in vala. Majority of the logic in the code is based on the original logic of python code and it shares the same shortcomings (e.g. it's based on "locate"), but this is a starting point for further improvements. This branch also introduces unity tests.

[Michal Hruby (mhr3)]

How was the rule? Diffs above 1k lines must be needs fixing? :)

889 + public string locate_bin { get; set; default = "/usr/bin/locate"; }

Why the absolute paths?

906 + GLib.Process.spawn_command_line_sync (@"$locate_bin -id $cache_db $query", out stdout);

A limit should be added here, no need for thousands of results. (-l)

939 + int video_count = 0;

Unused.

1128 + recommendations = new Gee.ArrayList<RemoteVideoFile?> (null);

Please get rid of the null, it's default param, and kinda confusing when specified.

1133 + zeitgeist_init ();

Not really sure the lens should be inserting events to zeitgeist, it has browser extensions that would log these kind of events (although they're not installed by default).

1144 + session.user_agent = "Unity Video Lens Remote Scope v0.4";

Let's use the version from configure.ac

1148 + search_changed.connect ((search, search_type, cancellable) => {
1149 + update_search_async.begin (search, search_type, cancellable);
1150 + });

Parse error, the brackets don't match indentation :P (present in multiple lambda instances)

1158 + preferences.notify["remote-content-search"].connect ((obj, pspec) => {
1159 + queue_search_changed (SearchType.GLOBAL);
1160 + });

This scope doesn't participate in global searches, should be DEFAULT.

1205 + recommendations = results;

if (results != null) ...

1678 + if (Utils.dbus_name_has_owner (BUS_NAME))
1679 + {

There should probably be a wrapper for this in Extras.

2194 + If nothing has been found, it tries to generate a thumbnail with Totem,
2195 + stores and uses it.

Really not liking that, unity should do this for us, we're slowing down the result model populating because of thumbnails.

3227 +check_PROGRAMS = \

For future - let's try to minimize the number of test vala binaries, it's overcomplicating the build process, plus GTest supports -p to pick prefix of tests that you want to run.

3332 +# Create dummy video files, needed by tests

Can you just make these part of the bzr tree (inside tests/data)

3340 +# Copy over test input files, needed by tests when built & run our-of-src directory

Why do these have to be copied over? Just load them from the srcdir? The fewer non-standard make rules, the better. (plus no need for these to be .in if they don't depend on any configure variable)

review: Needs Fixing

[Paweł Stołowski (stolowski)]

Implemented all (hopefully) suggested corrections. As discussed on IRC, zeitgeist and thumbnail handling should stay as is for now.

[Michal Hruby (mhr3)]

Approving from my side, the behavior didn't change, but mem usage went down from 19mb to 6mb. Please approve globally once the packaging is updated.

review: Approve

[Michal Hruby (mhr3)]

Setting to Needs fixing again, as we need to ensure that the recent SRU changes for remote-video-scope that went to trunk are backported here as well.

review: Needs Fixing

[Michal Hruby (mhr3)]

About time! :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-video-mbs-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/4/console

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

You should be able to fix the build by merging from trunk (at least, debian/changelog, which conflicts)

[lp:~stolowski/unity-lens-video/vala-rewrite]

157. By Paweł Stołowski on 2013-02-19

Merged trunk.

158. By Paweł Stołowski on 2013-02-19

Fixed changelog entries for merging with trunk.

=== added file 'AUTHORS'
=== added file 'ChangeLog'
=== added file 'Makefile.am'
--- Makefile.am	1970-01-01 00:00:00 +0000
+++ Makefile.am	2013-02-19 17:19:01 +0000
@@ -0,0 +1,5 @@
+SUBDIRS = src po tests/unit vapi data
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+
+include $(top_srcdir)/Makefile.am.coverage
 
=== added file 'Makefile.am.coverage'
--- Makefile.am.coverage	1970-01-01 00:00:00 +0000
+++ Makefile.am.coverage	2013-02-19 17:19:01 +0000
@@ -0,0 +1,48 @@
+
+# Coverage targets
+
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
+
+if HAVE_GCOV
+
+clean-gcno:
+	@echo Removing old coverage instrumentation
+	-find -name '*.gcno' -print | xargs -r rm
+
+clean-gcda:
+	@echo Removing old coverage results
+	-find -name '*.gcda' -print | xargs -r rm
+  
+coverage-html: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+  
+generate-coverage-html:
+	@echo Collecting coverage data
+	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+  
+clean-coverage-html: clean-gcda
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf coverage.info coveragereport
+
+if HAVE_GCOVR
+
+coverage-gcovr: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
+	
+generate-coverage-gcovr:
+	@echo Generating coverage GCOVR report
+	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+	
+clean-coverage-gcovr: clean-gcda
+	-rm -rf $(top_builddir)/coverage.xml
+
+endif # HAVE_GCOVR
+
+endif # HAVE_GCOV
 
=== added file 'Makefile.decl'
--- Makefile.decl	1970-01-01 00:00:00 +0000
+++ Makefile.decl	2013-02-19 17:19:01 +0000
@@ -0,0 +1,75 @@
+# GLIB - Library of useful C routines
+#
+# This file is copied almost verbatim from the GLib-2.0 distribution
+#
+
+GTESTER = gtester
+GTESTER_REPORT = gtester-report
+
+# initialize variables for unconditional += appending
+EXTRA_DIST =
+TEST_PROGS =
+
+### testing rules
+
+# test: run all tests in cwd and subdirs
+test: test-nonrecursive
+	@ for subdir in $(SUBDIRS) . ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	  done
+
+# test-nonrecursive: run tests only in cwd
+test-nonrecursive: ${TEST_PROGS}
+	@test -z "${TEST_PROGS}" || G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
+
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+test-report perf-report full-report:	${TEST_PROGS}
+	@test -z "${TEST_PROGS}" || { \
+	  case $@ in \
+	  test-report) test_options="-k";; \
+	  perf-report) test_options="-k -m=perf";; \
+	  full-report) test_options="-k -m=perf -m=slow";; \
+	  esac ; \
+	  if test -z "$$GTESTER_LOGDIR" ; then	\
+	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+	  elif test -n "${TEST_PROGS}" ; then \
+	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+	  fi ; \
+	}
+	@ ignore_logdir=true ; \
+	  if test -z "$$GTESTER_LOGDIR" ; then \
+	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+	    ignore_logdir=false ; \
+	  fi ; \
+	  REVISION=$(VERSION) ; \
+	  for subdir in $(SUBDIRS) . ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	  done ; \
+	  $$ignore_logdir || { \
+	    echo '<?xml version="1.0"?>'              > $@.xml ; \
+	    echo '<report-collection>'               >> $@.xml ; \
+	    echo '<info>'                            >> $@.xml ; \
+	    echo '  <package>$(PACKAGE)</package>'   >> $@.xml ; \
+	    echo '  <version>$(VERSION)</version>'   >> $@.xml ; \
+	    echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
+	    echo '</info>'                           >> $@.xml ; \
+	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+	    done ; \
+	    echo >> $@.xml ; \
+	    echo '</report-collection>' >> $@.xml ; \
+	    rm -rf "$$GTESTER_LOGDIR"/ ; \
+	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
+	  }
+.PHONY: test test-report perf-report full-report test-nonrecursive
+
+# run tests in cwd as part of make check
+if ENABLE_HEADLESS_TESTS
+check-local: test-headless
+else
+check-local: test-nonrecursive
+endif
 
=== added file 'NEWS'
=== added file 'acinclude.m4'
--- acinclude.m4	1970-01-01 00:00:00 +0000
+++ acinclude.m4	2013-02-19 17:19:01 +0000
@@ -0,0 +1,40 @@
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix=$ac_default_prefix
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var"="x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
 
=== added file 'autogen.sh'
--- autogen.sh	1970-01-01 00:00:00 +0000
+++ autogen.sh	2013-02-19 17:19:01 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+srcdir=`dirname $0`
+
+PKG_NAME="unity-lens-video"
+
+which gnome-autogen.sh || {
+	echo "You need gnome-common from GNOME SVN"
+	exit 1
+}
+
+USE_GNOME2_MACROS=1 \
+. gnome-autogen.sh "$@"
 
=== added file 'configure.ac'
--- configure.ac	1970-01-01 00:00:00 +0000
+++ configure.ac	2013-02-19 17:19:01 +0000
@@ -0,0 +1,208 @@
+AC_INIT(unity-lens-video, 6.8.0, https://launchpad.net/unity-lens-video)
+AC_COPYRIGHT([Copyright 2012 Canonical])
+
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+
+#####################################################
+# Silent build rules
+#####################################################
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AC_PREREQ(2.59)
+
+AC_CONFIG_HEADERS([config.h])
+
+#####################################################
+# Init the other things we depend on
+#####################################################
+AM_MAINTAINER_MODE
+AM_PROG_VALAC([0.16.0])
+AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_HEADER_STDC
+
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
+
+#############################################
+# Gettext
+#############################################
+GETTEXT_PACKAGE="$PACKAGE"
+AC_SUBST(GETTEXT_PACKAGE)
+#AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext domain])
+AM_GLIB_GNU_GETTEXT
+
+# AM_GNOME_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)
+
+IT_PROG_INTLTOOL([0.40.0])
+
+AC_DEFINE_UNQUOTED(LOCALE_DIR, "${PREFIX}/${DATADIRNAME}/locale",[Locale directory])
+AC_DEFINE_UNQUOTED(DATADIR, "${PREFIX}/${DATADIRNAME}",[Data directory])
+AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory])
+
+######################################################
+# intltool rule for generating translated .lens 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)
+
+###########################
+# gcov coverage reporting
+###########################
+m4_include([m4/gcov.m4])
+AC_TDD_GCOV
+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
+
+#####################################################
+# Check for module and library dependancies
+#####################################################
+GLIB_REQUIRED=2.27
+PKG_CHECK_MODULES(LENS_DAEMON,
+                  glib-2.0 >= $GLIB_REQUIRED
+                  gobject-2.0 >= $GLIB_REQUIRED
+                  gio-2.0 >= $GLIB_REQUIRED
+                  gio-unix-2.0 >= $GLIB_REQUIRED
+                  dee-1.0 >= 1.0.7
+                  gee-1.0
+                  libsoup-gnome-2.4
+                  json-glib-1.0
+                  zeitgeist-1.0 >= 0.3.8
+                  unity >= 6.90.2
+                  unity-extras >= 6.90.2
+                  )
+
+AC_SUBST(LENS_DAEMON_CFLAGS)
+AC_SUBST(LENS_DAEMON_LIBS)
+
+####################################################################
+# C compiler warnings
+####################################################################
+AC_ARG_ENABLE([c-warnings],
+              AC_HELP_STRING([--enable-c-warnings=@<:@no/yes@:>@], [show warnings from the C compiler @<:@default=no@:>@]),,
+              [enable_c_warnings=no])
+
+if test "x$enable_c_warnings" = "xyes"; then
+	AC_DEFINE(ENABLE_C_WARNINGS, 1, [show warnings from the C compiler])
+fi
+
+AM_CONDITIONAL(ENABLE_C_WARNINGS, test "$enable_c_warnings" = "yes")
+
+#####################################################
+# local install for distcheck and stand-alone running
+#####################################################
+with_localinstall="no"
+AC_ARG_ENABLE(localinstall,
+              AS_HELP_STRING([--enable-localinstall],
+                             [Install all of the files locally instead of in system directories (for distcheck)]),
+              with_localinstall=$enableval,
+              with_localinstall=no)
+
+AM_CONDITIONAL([HAVE_LOCALINSTALL], [test "x$with_localinstall" = "xyes"])
+
+####################################################################
+# Headless tests
+####################################################################
+AC_ARG_ENABLE([headless-tests],
+              AS_HELP_STRING([--enable-headless-tests=@<:@no/yes@:>@],[enable headless test suite (requires Xvfb) @<:@default=no@:>@]),,
+              [enable_headless_tests=no])
+
+AM_CONDITIONAL([ENABLE_HEADLESS_TESTS],[test "x$enable_headless_tests" != "xno"])
+
+if test "x$enable_headless_tests" = "xyes"; then
+  AC_PATH_PROG([XVFB],[xvfb-run])
+fi
+
+#####################################################
+# local install for distcheck and stand-alone running
+#####################################################
+with_localinstall="no"
+AC_ARG_ENABLE(localinstall,
+              AS_HELP_STRING([--enable-localinstall],
+                             [Install all of the files locally instead of in system directories (for distcheck)]),
+              with_localinstall=$enableval,
+              with_localinstall=no)
+
+AM_CONDITIONAL([HAVE_LOCALINSTALL], [test "x$with_localinstall" = "xyes"])
+
+#####################################################
+# Expand variables needed for config.vala
+#####################################################
+AS_AC_EXPAND(PREFIX, $prefix)
+AC_SUBST(PREFIX)
+
+AS_AC_EXPAND(DATADIR, $datarootdir)
+AC_SUBST(DATADIR)
+
+#####################################################
+# Look for dbus service dir
+#####################################################
+if test "x$with_localinstall" = "xyes"; then
+	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
+else
+	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+fi
+AC_SUBST(DBUSSERVICEDIR)
+
+#####################################################
+# Look for correct Lenses dir
+#####################################################
+if test "x$with_localinstall" = "xyes"; then
+	LENSESDIR="${datadir}/unity/lenses"
+else
+	LENSESDIR=`$PKG_CONFIG --variable=lensesdir unity`
+fi
+AC_SUBST(LENSESDIR)
+
+#############################################
+# GSettings macros
+#############################################
+
+GLIB_GSETTINGS
+
+#####################################################
+# Create the Makefiles
+#####################################################
+AC_CONFIG_FILES([
+  Makefile
+  data/Makefile
+  data/video.lens.in
+  src/Makefile
+  po/Makefile.in
+  src/config.vala
+  tests/unit/config-tests.vala
+  tests/unit/Makefile
+  vapi/Makefile
+])
+AC_OUTPUT
+
+#####################################################
+# Output the results
+#####################################################
+AC_MSG_NOTICE([
+
+  Unity Video Lens Daemon $VERSION
+  ----------------------------------
+
+  Prefix          : ${prefix}
+
+  Local install   : ${with_localinstall}
+
+  Extra CFlags    : ${CPPFLAGS} $MAINTAINER_CFLAGS
+  Extra ValaFlags : ${CPPFLAGS} $MAINTAINER_VALAFLAGS
+
+  Lenses Directory: ${LENSESDIR}
+
+  Testing
+    Headless tests     : ${enable_headless_tests}
+    Coverage reporting : ${use_gcov}
+
+])
 
=== added directory 'data'
=== added file 'data/Makefile.am'
--- data/Makefile.am	1970-01-01 00:00:00 +0000
+++ data/Makefile.am	2013-02-19 17:19:01 +0000
@@ -0,0 +1,27 @@
+dbus_servicesdir = $(DBUSSERVICEDIR)
+service_in_files =  \
+  unity-scope-video-remote.service.in \
+  unity-lens-video.service.in \
+  $(NULL)
+
+dbus_services_DATA = $(service_in_files:.service.in=.service)
+
+%.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)
+
+@INTLTOOL_LENS_RULE@
+
+EXTRA_DIST = \
+  $(service_in_files) \
+  $(lens_in_files) \
+  $(NULL)
+
+CLEANFILES = \
+  unity-scope-video-remote.service \
+  unity-lens-video.service \
+  video.lens \
+  $(NULL)
 
=== renamed file 'unity-lens-video.desktop' => 'data/unity-lens-video.desktop'
=== renamed file 'unity-lens-video.png' => 'data/unity-lens-video.png'
=== renamed file 'unity-lens-video.service' => 'data/unity-lens-video.service.in'
--- unity-lens-video.service	2012-02-02 19:43:07 +0000
+++ data/unity-lens-video.service.in	2013-02-19 17:19:01 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=net.launchpad.lens.video
-Exec=/usr/lib/unity-lens-video/unity-lens-video
+Exec=@pkglibexecdir@/unity-video-lens-daemon
 
=== added file 'data/unity-scope-video-remote.service.in'
--- data/unity-scope-video-remote.service.in	1970-01-01 00:00:00 +0000
+++ data/unity-scope-video-remote.service.in	2013-02-19 17:19:01 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=net.launchpad.scope.RemoteVideos
+Exec=@pkglibexecdir@/unity-scope-video-remote
 
=== added file 'data/video-remote.scope'
--- data/video-remote.scope	1970-01-01 00:00:00 +0000
+++ data/video-remote.scope	2013-02-19 17:19:01 +0000
@@ -0,0 +1,3 @@
+[Scope]
+DBusName=net.launchpad.scope.RemoteVideos
+DBusPath=/net/launchpad/scope/remotevideos
 
=== renamed file 'video.lens.in' => 'data/video.lens.in.in'
=== modified file 'debian/changelog'
--- debian/changelog	2012-12-05 09:29:20 +0000
+++ debian/changelog	2013-02-19 17:19:01 +0000
@@ -1,3 +1,14 @@
+unity-lens-video (0.3.14daily12.12.05-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Update Build-Depends for Vala rewrite
+    - Add unity-scope-video-remote to this source package
+  * debian/rules:
+    - Use dh-autoreconf
+    - Enable xvfb tests
+
+ -- Michael Terry <[e-mail]>  Tue, 19 Feb 2013 17:10:20 +0000
+
 unity-lens-video (0.3.14daily12.12.05-0ubuntu1) raring; urgency=low
 
   [ Michael Terry ]
 
=== modified file 'debian/control'
--- debian/control	2012-11-08 04:06:55 +0000
+++ debian/control	2013-02-19 17:19:01 +0000
@@ -2,28 +2,41 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: David Calle <[e-mail]>
-Build-Depends: debhelper (>= 9), 
-               python, 
-               python-distutils-extra,
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                dh-translations,
-Standards-Version: 3.9.3
-Homepage: https://launchpad.net/unity-lens-videos
+               gnome-common,
+               libdee-dev (>= 1.0.7),
+               libgee-dev,
+               libglib2.0-dev (>= 2.27),
+               libjson-glib-dev,
+               libsoup-gnome2.4-dev,
+               libunity-dev (>= 6.90.2),
+               libzeitgeist-dev (>= 0.3.8),
+               valac-0.18,
+               xvfb,
+Standards-Version: 3.9.4
+Homepage: https://launchpad.net/unity-lens-video
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-videos/trunk
+Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-video/trunk
 
 Package: unity-lens-video
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends},
-         ${python:Depends},
-         gir1.2-unity-5.0,
-         gir1.2-dee-1.0,
-         gir1.2-glib-2.0,
-         python-zeitgeist,
+         ${shlibs:Depends},
          unity-lens-music (>= 6.6.0),
 Recommends: unity-scope-video-remote
 Breaks: unity (<< 6.0.0),
 Description: Unity Video lens
  A plugin to search videos in the Dash.
 
+Package: unity-scope-video-remote
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         gvfs-bin,
+         unity-lens-video,
+Enhances: unity-lens-video
+Description: Remote videos engine
+ This scope adds a remote videos search engine to the Video lens.
 
=== modified file 'debian/copyright'
--- debian/copyright	2012-02-14 14:21:28 +0000
+++ debian/copyright	2013-02-19 17:19:01 +0000
@@ -1,15 +1,13 @@
-Format: http://dep.debian.net/deps/dep5
-Source: https://launchpad.net/unity-lens-videos
-Upstream-Name: unity-lens-video
-Upstream-Contact: David Calle <[e-mail]>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://launchpad.net/unity-lens-video
+Upstream-Name: Unity Video Lens
 
 Files: *
-Copyright: 2011 David Calle <[e-mail]>
-License: GPL-3.0+
+Copyright: 2011-2013 Canonical Ltd
+License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ the Free Software Foundation, version 3 of the License.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-08 04:06:55 +0000
+++ debian/rules	2013-02-19 17:19:01 +0000
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-
 %:
-	dh $@ --with python2,translations
+	dh $@ --with autoreconf,translations
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-headless-tests
 
 override_dh_install:
 	dh_install --fail-missing
 
=== added file 'debian/unity-lens-video.install'
--- debian/unity-lens-video.install	1970-01-01 00:00:00 +0000
+++ debian/unity-lens-video.install	2013-02-19 17:19:01 +0000
@@ -0,0 +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
 
=== added file 'debian/unity-scope-video-remote.install'
--- debian/unity-scope-video-remote.install	1970-01-01 00:00:00 +0000
+++ debian/unity-scope-video-remote.install	2013-02-19 17:19:01 +0000
@@ -0,0 +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
 
=== modified file 'debian/watch'
--- debian/watch	2012-03-21 21:41:31 +0000
+++ debian/watch	2013-02-19 17:19:01 +0000
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/unity-lens-videos/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
+http://launchpad.net/unity-lens-video/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
 
=== added directory 'm4'
=== added file 'm4/gcov.m4'
--- m4/gcov.m4	1970-01-01 00:00:00 +0000
+++ m4/gcov.m4	2013-02-19 17:19:01 +0000
@@ -0,0 +1,86 @@
+# Checks for existence of coverage tools:
+#  * gcov
+#  * lcov
+#  * genhtml
+#  * gcovr
+# 
+# Sets ac_cv_check_gcov to yes if tooling is present
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
+AC_DEFUN([AC_TDD_GCOV],
+[
+  AC_ARG_ENABLE(gcov,
+  AS_HELP_STRING([--enable-gcov],
+		 [enable coverage testing with gcov]),
+  [use_gcov=$enableval], [use_gcov=no])
+
+  if test "x$use_gcov" = "xyes"; then
+  # we need gcc:
+  if test "$GCC" != "yes"; then
+    AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+
+  # Check if ccache is being used
+  AC_CHECK_PROG(SHTOOL, shtool, shtool)
+  case `$SHTOOL path $CC` in
+    *ccache*[)] gcc_ccache=yes;;
+    *[)] gcc_ccache=no;;
+  esac
+
+  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
+    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
+  fi
+
+  lcov_version_list="1.6 1.7 1.8 1.9"
+  AC_CHECK_PROG(LCOV, lcov, lcov)
+  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
+
+  if test "$LCOV"; then
+    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
+      glib_cv_lcov_version=invalid
+      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+      for lcov_check_version in $lcov_version_list; do
+        if test "$lcov_version" = "$lcov_check_version"; then
+          glib_cv_lcov_version="$lcov_check_version (ok)"
+        fi
+      done
+    ])
+  else
+    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+    AC_MSG_ERROR([$lcov_msg])
+  fi
+
+  case $glib_cv_lcov_version in
+    ""|invalid[)]
+      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+      AC_MSG_ERROR([$lcov_msg])
+      LCOV="exit 0;"
+      ;;
+  esac
+
+  if test -z "$GENHTML"; then
+    AC_MSG_ERROR([Could not find genhtml from the lcov package])
+  fi
+
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
+
+  # Remove all optimization flags from CFLAGS
+  changequote({,})
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+  changequote([,])
+
+  # Add the special gcc flags
+  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
+  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
+  COVERAGE_LDFLAGS="-lgcov"
+
+  # Check availability of gcovr
+  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
+
+fi
+]) # AC_TDD_GCOV
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-02-22 10:47:03 +0000
+++ po/POTFILES.in	2013-02-19 17:19:01 +0000
@@ -1,3 +1,6 @@
 [encoding: UTF-8]
-src/unity-lens-video
-[type: gettext/ini]video.lens.in
+src/main.vala
+src/remote-video-main.vala
+src/ubuntu-video-search.vala
+tests/unit/test-ubuntu-video-search.vala
+[type: gettext/ini]data/video.lens.in
 
=== added file 'po/POTFILES.skip'
--- po/POTFILES.skip	1970-01-01 00:00:00 +0000
+++ po/POTFILES.skip	2013-02-19 17:19:01 +0000
@@ -0,0 +1,7 @@
+src/daemon.c
+src/scope.c
+src/remote-scope.c
+src/ubuntu-video-search.c
+tests/unit/test-ubuntu-video-search.c
+tests/unit/ubuntu-video-search.c
+tests/unit/remote-scope.c
 
=== removed file 'po/unity-lens-video.pot'
--- po/unity-lens-video.pot	2012-09-14 09:12:09 +0000
+++ po/unity-lens-video.pot	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-14 10:03+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/unity-lens-video:49 ../src/unity-lens-video:56
-msgid "My Videos"
-msgstr ""
-
-#: ../src/unity-lens-video:50
-msgid "Online"
-msgstr ""
-
-#: ../src/unity-lens-video:51 ../video.lens.in.h:1
-msgid "Videos"
-msgstr ""
-
-#: ../src/unity-lens-video:52
-msgid "Recently Viewed"
-msgstr ""
-
-#: ../src/unity-lens-video:53
-msgid "More suggestions"
-msgstr ""
-
-#: ../src/unity-lens-video:54
-msgid "Search Videos"
-msgstr ""
-
-#: ../src/unity-lens-video:55
-msgid "Sources"
-msgstr ""
-
-#: ../src/unity-lens-video:173
-msgid "Format"
-msgstr ""
-
-#: ../src/unity-lens-video:174
-msgid "Dimensions"
-msgstr ""
-
-#: ../src/unity-lens-video:175
-msgid "Size"
-msgstr ""
-
-#: ../src/unity-lens-video:178
-msgid "Show in Folder"
-msgstr ""
-
-#: ../src/unity-lens-video:181
-msgid "Play"
-msgstr ""
-
-#: ../video.lens.in.h:2
-msgid "Search local videos"
-msgstr ""
 
=== removed file 'setup.cfg'
--- setup.cfg	2012-02-22 10:48:53 +0000
+++ setup.cfg	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[build]
-i18n=True
-
-[build_i18n]
-domain=unity-lens-video
-desktop_files=[	("share/unity/lenses/video", 
-		  ("video.lens.in",)
-		)
-		]
-
 
=== removed file 'setup.py'
--- setup.py	2012-10-16 12:12:46 +0000
+++ setup.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-#
-from distutils.core import setup
-from DistUtilsExtra.command import *
-
-setup(name="unity-lens-video",
-      version="0.3.14",
-      author="David Calle",
-      author_email="[e-mail]",
-      url="http://launchpad.net/~davidc3",
-      license="GNU General Public License (GPL)",
-      data_files=[
-    ('lib/unity-lens-video', ['src/unity-lens-video']),
-    ('share/dbus-1/services', ['unity-lens-video.service']),
-    ('share/applications', ['unity-lens-video.desktop']),
-    ('share/pixmaps', ['unity-lens-video.png']),
-    ], cmdclass={"build":  build_extra.build_extra,
-                 "build_i18n": build_i18n.build_i18n,})
 
=== added file 'src/Makefile.am'
--- src/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/Makefile.am	2013-02-19 17:19:01 +0000
@@ -0,0 +1,133 @@
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST =
+
+DATADIR = $(datadir)
+
+AM_CPPFLAGS = $(COVERAGE_CFLAGS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+
+pkglibexec_PROGRAMS = \
+	unity-video-lens-daemon \
+	unity-scope-video-remote \
+	$(NULL)
+
+unity_video_lens_daemon_CPPFLAGS = \
+  -DDATADIR=\"$(DATADIR)\" \
+  -DPKGDATADIR=\"$(PKGDATADIR)\" \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+  -DG_LOG_DOMAIN=\"unity-video-lens-daemon\" \
+  $(LENS_DAEMON_CFLAGS) \
+  $(MAINTAINER_CFLAGS) \
+  -I$(srcdir) \
+  $(NULL)
+
+unity_scope_video_remote_CPPFLAGS = \
+  -DDATADIR=\"$(DATADIR)\" \
+  -DPKGDATADIR=\"$(PKGDATADIR)\" \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+  -DG_LOG_DOMAIN=\"unity-scope-video-remote\" \
+  $(LENS_DAEMON_CFLAGS) \
+  $(MAINTAINER_CFLAGS) \
+  -I$(srcdir) \
+  $(NULL)
+
+unity_video_lens_daemon_VALAFLAGS = \
+  -C \
+  --pkg dee-1.0 \
+  --pkg unity \
+  --pkg unity-extras \
+  --pkg gio-2.0 \
+  --pkg gio-unix-2.0 \
+  --pkg glib-2.0 \
+  --pkg zeitgeist-1.0 \
+  --vapidir $(srcdir) \
+  --vapidir $(top_srcdir)/vapi \
+  --target-glib=2.26 \
+  $(MAINTAINER_VALAFLAGS) \
+  $(NULL)
+
+unity_scope_video_remote_VALAFLAGS = \
+  -C \
+  --pkg dee-1.0 \
+  --pkg unity \
+  --pkg unity-extras \
+  --pkg gio-2.0 \
+  --pkg gio-unix-2.0 \
+  --pkg glib-2.0 \
+  --pkg zeitgeist-1.0 \
+  --pkg libsoup-gnome-2.4 \
+  --pkg libsoup-2.4 \
+  --pkg json-glib-1.0 \
+  --vapidir $(srcdir) \
+  --vapidir $(top_srcdir)/vapi \
+  --target-glib=2.26 \
+  $(MAINTAINER_VALAFLAGS) \
+  $(NULL)
+
+
+unity_video_lens_daemon_LDADD = \
+  $(LENS_DAEMON_LIBS) \
+  $(NULL)
+
+unity_scope_video_remote_LDADD = \
+  $(LENS_DAEMON_LIBS) \
+  $(NULL)
+
+unity_video_lens_daemon_VALASOURCES = \
+  blacklist-tracker.vala \
+  daemon.vala \
+  main.vala \
+  locate.vala \
+  scope.vala \
+  config.vala \
+  thumbnailer.vala \
+  utils.vala \
+  video-file.vala \
+  $(NULL)
+
+unity_scope_video_remote_VALASOURCES = \
+  config.vala \
+  remote-scope-globals.vala \
+  remote-video-main.vala \
+  remote-scope.vala \
+  remote-uri.vala \
+  ubuntu-video-search.vala \
+  utils.vala \
+  video-file.vala \
+  $(NULL)
+
+unity_video_lens_daemon_SOURCES = \
+  $(unity_video_lens_daemon_VALASOURCES:.vala=.c) \
+  $(NULL)
+
+unity_scope_video_remote_SOURCES = \
+  $(unity_scope_video_remote_VALASOURCES:.vala=.c) \
+  $(NULL)
+
+BUILT_SOURCES += \
+  unity_video_lens_daemon.vala.stamp \
+  unity_scope_video_remote.vala.stamp \
+  $(NULL)
+
+EXTRA_DIST += \
+  unity_video_lens_daemon.vala.stamp \
+  unity_scope_video_remote.vala.stamp \
+  $(unity_video_lens_daemon_VALASOURCES) \
+  $(unity_scope_video_remote_VALASOURCES) \
+  $(NULL)
+
+unity_video_lens_daemon.vala.stamp: $(unity_video_lens_daemon_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(unity_video_lens_daemon_VALAFLAGS) $^
+	@touch $@
+
+unity_scope_video_remote.vala.stamp: $(unity_scope_video_remote_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(unity_scope_video_remote_VALAFLAGS) $^
+	@touch $@
+
+CLEANFILES += \
+  *.stamp \
+  $(unity_video_lens_daemon_VALASOURCES:.vala=.c) \
+  $(unity_scope_video_remote_VALASOURCES:.vala=.c) \
+  $(NULL)
 
=== added file 'src/blacklist-tracker.vala'
--- src/blacklist-tracker.vala	1970-01-01 00:00:00 +0000
+++ src/blacklist-tracker.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,128 @@
+/*
+ * 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 Michal Hruby <[e-mail]>
+ *
+ */
+using Zeitgeist;
+using Config;
+using Gee;
+
+namespace Unity.VideoLens
+{
+  /* Libzeitgeist currently doesn't expose any blacklist API, so we need to
+   * use direct dbus calls */
+  [DBus (name = "org.gnome.zeitgeist.Blacklist")]
+  public interface Blacklist : Object
+  {
+    [DBus (signature = "a{s(asaasay)}")]
+    public abstract async Variant get_templates () throws Error;
+    public signal void template_added (string template_id,
+        [DBus (signature = "(asassay)")] Variant template);
+    public signal void template_removed (string template_id,
+        [DBus (signature = "(asassay)")] Variant template);
+  }
+
+  public class BlacklistTracker : Object
+  {
+    private HashTable<string, Event> event_templates;
+    private Blacklist blacklist_proxy;
+
+    private Set<string> blacklisted_uris;
+    private bool cached_uris_dirty;
+
+    construct
+    {
+      event_templates = new HashTable<string, Event> (str_hash, str_equal);
+      blacklisted_uris = new HashSet<string> ();
+
+      Bus.get_proxy<Blacklist> (BusType.SESSION, "org.gnome.zeitgeist.Engine",
+                     "/org/gnome/zeitgeist/blacklist", 0, null, (src, res) =>
+      {
+        try
+        {
+          blacklist_proxy = (src as DBusConnection).get_proxy<Blacklist>.end (res);
+          fetch_blacklists ();
+        }
+        catch (GLib.Error err)
+        {
+          warning ("%s", err.message);
+        }
+      });
+    }
+
+    private async void fetch_blacklists ()
+    {
+      blacklist_proxy.template_added.connect (this.template_added);
+      blacklist_proxy.template_removed.connect (this.template_removed);
+      Variant all_templates = yield blacklist_proxy.get_templates ();
+
+      VariantIter iter = new VariantIter (all_templates);
+      string template_id;
+      Variant event_variant;
+      while (iter.next ("{s@(asaasay)}", out template_id, out event_variant))
+      {
+        Event e = new Event.from_variant (event_variant);
+        event_templates[template_id] = e;
+      }
+      cached_uris_dirty = true;
+    }
+
+    private void template_added (string id, Variant template)
+    {
+      Event e = new Event.from_variant (template);
+      event_templates[id] = e;
+      cached_uris_dirty = true;
+    }
+
+    private void template_removed (string id, Variant template)
+    {
+      event_templates.remove (id);
+      cached_uris_dirty = true;
+    }
+
+    private void update_uris ()
+    {
+      var iter = HashTableIter<string, Event> (event_templates);
+      unowned Event e;
+      while (iter.next (null, out e))
+      {
+        if (e.num_subjects () > 0)
+        {
+          unowned Subject s = e.get_subject (0);
+          unowned string uri = s.get_uri ();
+          if (uri == null || uri == "") continue;
+
+          if (uri.has_suffix ("*"))
+          {
+            blacklisted_uris.add (uri.substring (0, uri.length - 1));
+          }
+        }
+      }
+    }
+
+    public unowned Set<string> get_blacklisted_uris ()
+    {
+      if (cached_uris_dirty)
+      {
+        blacklisted_uris.clear ();
+        update_uris ();
+        cached_uris_dirty = false;
+      }
+      return blacklisted_uris;
+    }
+  }
+
+} /* namespace */
 
=== added file 'src/config.vala.in'
--- src/config.vala.in	1970-01-01 00:00:00 +0000
+++ src/config.vala.in	2013-02-19 17:19:01 +0000
@@ -0,0 +1,16 @@
+namespace Config {
+
+  const string PREFIX = "@prefix@";
+
+  const string DATADIR = "@DATADIR@";
+
+  const string PKGDATADIR = "@DATADIR@/unity";
+
+  const string BINDIR = "@prefix@/bin";
+
+  const string LOCALEDIR = "@DATADIR@/locale";
+
+  const string PACKAGE = "@PACKAGE@";
+
+  const string VERSION = "@VERSION@";
+}
 
=== added file 'src/daemon.vala'
--- src/daemon.vala	1970-01-01 00:00:00 +0000
+++ src/daemon.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,79 @@
+/*
+ * 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]>
+ * 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;
+
+    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);
+
+      try {
+        lens.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;
+    }
+  }
+}
 
=== added file 'src/locate.vala'
--- src/locate.vala	1970-01-01 00:00:00 +0000
+++ src/locate.vala	2013-02-19 17:19:01 +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]>
+ *
+ */
+
+namespace Unity.VideoLens
+{
+  public class Locate
+  {
+    /* Filter used by locate handling loop; return value of false means file will be ignored */
+    public delegate bool LocateFilter (string path);
+
+    private static const int MAX_RESULTS = 100;
+    private static const int MAX_LOCATE_RESULTS = 200;
+
+    private string cache_db;
+    private string videos_folder;
+    public string locate_bin { get; set; default = "locate"; }
+    public string updatedb_bin { get; set; default = "updatedb"; }
+
+    public Locate (string cache_dir, string videos_dir)
+    {
+      cache_db = cache_dir + "/videos.db";
+      videos_folder = videos_dir;
+    }
+
+    public Gee.ArrayList<VideoFile?>? run_locate (string search_string, Thumbnailer thumbnailer, LocateFilter? filter = null)
+    {
+      if (Utils.is_regular_file (cache_db))
+      {
+        string stdout;
+        try
+        {
+          string query = locate_query_string (search_string);
+          GLib.Process.spawn_command_line_sync (@"$locate_bin -l $MAX_LOCATE_RESULTS -id $cache_db $query", out stdout);
+          var result_list = parse_locate_results (stdout, 100, thumbnailer, filter);
+          return result_list;
+        }
+        catch (GLib.Error e)
+        {
+          warning ("Failed to run locate: %s", e.message);
+        }
+      }
+      return null;
+    }
+
+    internal string locate_query_string (string search_string)
+    {
+      return videos_folder + "*" + search_string.replace (" ", "*") + "*";
+    }
+
+    public void updatedb ()
+    {
+      try
+      {
+        GLib.Process.spawn_command_line_async (@"$updatedb_bin -o $cache_db -l 0 -U $videos_folder");
+      }
+      catch (GLib.Error e)
+      {
+        warning ("Can't create database, will retry: %s", e.message);
+      }
+    }
+
+    public Gee.ArrayList<VideoFile?> parse_locate_results (string locate_output, int max, Thumbnailer thumbnailer, LocateFilter? filter)
+    {
+      var results_list = locate_output.split ("\n");
+      var res = new Gee.ArrayList<VideoFile?> ();
+      int video_count = 0;
+      foreach (var video in results_list)
+      {
+        if (video_count >= MAX_RESULTS)
+          break;
+
+        try
+        {
+          if (Utils.is_video (video) && (filter == null || filter (video)))
+          {
+            video_count++;
+            var name = Utils.get_name (video);
+            VideoFile video_file = VideoFile ()
+            {
+              title = name,
+              lc_title = name.down (),
+              uri = "file://" + video,
+              icon = thumbnailer.get_icon (video)
+            };
+            res.add (video_file);
+          }
+        }
+        catch (Error e)
+        {
+          // silently ignore
+        }
+      }
+      return res;
+    }
+  }
+}
 \ No newline at end of file
 
=== added file 'src/main.vala'
--- src/main.vala	1970-01-01 00:00:00 +0000
+++ src/main.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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/>.
+ */
+
+using GLib;
+using Config;
+
+namespace Unity.VideoLens {
+
+  static Application? app = null;
+  static Daemon? daemon = null;
+
+  public static int main (string[] args)
+  {
+    GLib.Environment.set_prgname ("unity-video-lens");
+
+    /* 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, "");
+
+    try
+    {
+      app = Extras.dbus_own_name ("net.launchpad.lens.video", () =>
+      {
+        daemon = new Daemon ();
+      });
+    }
+    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 ();
+  }
+
+} /* namespace */
 
=== added file 'src/remote-scope-globals.vala'
--- src/remote-scope-globals.vala	1970-01-01 00:00:00 +0000
+++ src/remote-scope-globals.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,25 @@
+
+/*
+ * 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
+{
+  static int CAT_INDEX_ONLINE = 1;
+  static int CAT_INDEX_MORE = 2;
+}
 \ No newline at end of file
 
=== added file 'src/remote-scope.vala'
--- src/remote-scope.vala	1970-01-01 00:00:00 +0000
+++ src/remote-scope.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,491 @@
+/*
+ * 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]>
+ * based on python code by David Calle <[e-mail]>
+ *
+ */
+
+namespace Unity.VideoLens
+{
+  public class RemoteVideoScope : Unity.Scope
+  {
+    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 Soup.Session session;
+    private PreferencesManager preferences = PreferencesManager.get_default ();
+    Gee.ArrayList<RemoteVideoFile?> recommendations;
+    int64 recommendations_last_update = 0;
+    Zeitgeist.DataSourceRegistry zg_sources;
+    bool use_zeitgeist;
+
+    public RemoteVideoScope ()
+    {
+      Object (dbus_path: "/net/launchpad/scope/remotevideos");
+    }
+
+    protected override void constructed ()
+    {
+      recommendations = new Gee.ArrayList<RemoteVideoFile?> ();
+
+      use_zeitgeist = false;
+      try
+      {
+        zeitgeist_init ();
+        use_zeitgeist = true;
+      }
+      catch (Error e)
+      {
+        warning ("Failed to initialize Zeitgeist, won't store events");
+      }
+
+      session = new Soup.SessionAsync ();
+      session.ssl_use_system_ca_file = true;
+      session.ssl_strict = true;
+      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);
+      });
+      filters_changed.connect (on_filters_changed);
+      sources.notify["filtering"].connect (on_filters_changed);
+
+      generate_search_key.connect ((scope, search) =>
+      {
+        return search.search_string.strip ();
+      });
+
+      preferences.notify["remote-content-search"].connect ((obj, pspec) =>
+      {
+        queue_search_changed (SearchType.DEFAULT);
+      });
+
+      activate_uri.connect (on_activate_uri);
+      preview_uri.connect (on_preview_uri);
+
+      query_list_of_sources ();
+
+      // refresh the at least once every 30 minutes
+      GLib.Timeout.add_seconds (REFRESH_INTERVAL/2, () =>
+      {
+        queue_search_changed (SearchType.DEFAULT); return true;
+      });
+
+      try
+      {
+        export ();
+      }
+      catch (Error e)
+      {
+        error ("Failed to export scope: %s", e.message);
+      }
+    }
+
+    /* 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
+          foreach (var opt in sources.options)
+          {
+            sources.remove_option (opt.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 Unity.ActivationResponse on_activate_uri (string rawuri)
+    {
+      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);
+      }
+      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;
+      string subtitle = "";
+      string description = "";
+
+      if (details != null)
+      {
+        title = details.title;
+        description = details.description;
+
+        if (details.release_date != null && details.release_date != "")
+          subtitle = details.release_date;
+
+        if (details.duration > 0)
+        {
+          string duration = ngettext ("%d min", "%d mins", details.duration).printf (details.duration);
+          if (subtitle != "")
+            subtitle += ", " + duration;
+          else
+            subtitle = duration;
+        }
+      }
+
+      GLib.Icon thumbnail = new GLib.FileIcon (GLib.File.new_for_uri (details != null ? details.image : uri.icon));
+
+      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
+      real_preview.set_rating (-1, 0);
+
+      if (details != null)
+      {
+        //TODO: For details of future source types, factor out common detail key/value pairs
+        if (details.directors.length > 0)
+          real_preview.add_info (new Unity.InfoHint ("directors", ngettext ("Director", "Directors", details.directors.length), null, string.joinv (", ", details.directors)));
+
+        if (details.starring != null && details.starring != "")
+          real_preview.add_info (new Unity.InfoHint ("cast", _("Cast"), null, details.starring));
+
+        if (details.genres != null && details.genres.length > 0)
+          real_preview.add_info (new Unity.InfoHint ("genres", ngettext("Genre", "Genres", details.genres.length), null, string.joinv (", ", details.genres)));
+
+        // TODO: Add Vimeo & YouTube details for v1 of JSON API
+        if (details.uploaded_by != null && details.uploaded_by != "")
+          real_preview.add_info (new Unity.InfoHint ("uploaded-by", _("Uploaded by"), null, details.uploaded_by));
+
+        if (details.date_uploaded != null && details.date_uploaded != "")
+          real_preview.add_info (new Unity.InfoHint ("uploaded-on", _("Uploaded on"), null, details.date_uploaded));
+      }
+
+      return real_preview;
+    }
+
+    private Unity.Preview? on_preview_uri (string rawuri)
+    {
+      var fakeuri = RemoteUri.from_rawuri (rawuri);
+      if (fakeuri != 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);
+        }
+      }
+      else
+      {
+        warning ("Invalid raw uri: '%s'", rawuri);
+      }
+
+      return 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
+      {
+        var details = UbuntuVideoSearch.process_details_results ((string) msg.response_body.data);
+        return details;
+      }
+    }
+
+    private async void update_search_async (LensSearch search, SearchType search_type, 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))
+        {
+          yield perform_search (search_string, search, active_sources, cancellable);
+        }
+      }
+
+      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);
+    }
+
+    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)
+    {
+      search.results_model.clear ();
+
+      if ((search_string == null || search_string == "") && (active_sources.size == 0) && (recommendations.size > 0))
+      {
+        var time = new DateTime.now_utc ();
+        if (time.to_unix () - recommendations_last_update < REFRESH_INTERVAL)
+        {
+          debug ("Updating search results with recommendations");
+          update_results_model (search.results_model, recommendations);
+          return;
+        }
+      }
+
+      var url = UbuntuVideoSearch.build_search_uri (search_string, active_sources);
+      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);
+
+      session.queue_message (msg, (session_, msg_) =>
+      {
+        msg = msg_;
+        perform_search.callback ();
+      });
+
+      var cancelled = false;
+      ulong cancel_id = 0;
+      if (cancellable != null)
+      {
+        cancel_id = cancellable.connect (() =>
+        {
+          cancelled = true;
+          session.cancel_message (msg, Soup.KnownStatusCode.CANCELLED);
+        });
+      }
+
+      yield;
+
+      if (cancelled)
+      {
+        // 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);
+        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);
+      }
+    }
+
+    private void update_results_model (Dee.Model model, 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 != "")
+          {
+            var anno_icon = new Unity.AnnotatedIcon (new FileIcon (File.new_for_uri (result_icon)));
+            anno_icon.category = Unity.CategoryType.MOVIE;
+            anno_icon.ribbon = video.price;
+            result_icon = anno_icon.to_string ();
+          }
+
+          model.append (fake_uri.to_rawuri (), result_icon, video.category, "text/html", video.title, video.comment, video.uri);
+        }
+      }
+    }
+
+    private void zeitgeist_init () throws Error
+    {
+      zg_sources = new Zeitgeist.DataSourceRegistry ();
+      var templates = new PtrArray.sized(1);
+      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);
+    }
+
+    private void zeitgeist_insert_event (string uri, string title, string icon)
+    {
+      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);
+    }
+  }
+}
 
=== added file 'src/remote-uri.vala'
--- src/remote-uri.vala	1970-01-01 00:00:00 +0000
+++ src/remote-uri.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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
 
=== added file 'src/remote-video-main.vala'
--- src/remote-video-main.vala	1970-01-01 00:00:00 +0000
+++ src/remote-video-main.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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/>.
+ */
+
+using GLib;
+using Config;
+
+namespace Unity.VideoLens {
+
+  static const string BUS_NAME = "net.launchpad.scope.RemoteVideos";
+  Unity.Scope scope;
+  static Application? app = null;
+
+  public static int main (string[] args)
+  {
+    GLib.Environment.set_prgname ("unity-remote-video-scope");
+
+    /* 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, "");
+
+    try
+    {
+      app = Extras.dbus_own_name (BUS_NAME, () =>
+      {
+        scope = new RemoteVideoScope ();
+      });
+    }
+    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 ();
+  }
+
+} /* namespace */
 
=== added file 'src/scope.vala'
--- src/scope.vala	1970-01-01 00:00:00 +0000
+++ src/scope.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,427 @@
+/*
+ * 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]>
+ * based on python code by David Calle <[e-mail]>
+ *
+ */
+
+namespace Unity.VideoLens
+{
+  public class VideoScope : Unity.Scope
+  {
+    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;
+
+    private string videos_folder;
+    private Unity.Extras.PreviewPlayer preview_player;
+    private Thumbnailer thumbnailer;
+    private Locate locate;
+    private BlacklistTracker blacklist_tracker;
+
+    public VideoScope ()
+    {
+      Object (dbus_path: "/net/launchpad/lens/video/main");
+
+      videos_folder = GLib.Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
+      cache_directory = GLib.Environment.get_user_cache_dir () + "/unity-lens-video";
+
+      // create cache directory
+      try
+      {
+        var cache_dir = GLib.File.new_for_path (cache_directory);
+        if (! cache_dir.query_exists (null))
+          cache_dir.make_directory (null);
+      }
+      catch (Error e)
+      {
+        error ("Failed to create cache directory: %s", e.message);
+      }
+
+      blacklist_tracker = new BlacklistTracker ();
+      thumbnailer = new Thumbnailer (cache_directory);
+      locate = new Locate (cache_directory, videos_folder);
+
+      search_in_global = true;
+      sources.add_option ("local", _("My Videos"), null);
+      provides_personal_content = true;
+
+      GLib.Timeout.add_seconds (REFRESH_TIMEOUT, refresh_results);
+
+      search_changed.connect ((search, search_type, cancellable) =>
+      {
+        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 bool refresh_results ()
+    {
+      debug ("Queuing new search because of timeout");
+      queue_search_changed (Unity.SearchType.DEFAULT);
+      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)
+    {
+      var search_string = search.search_string.strip ();
+      var search_status = search;
+      var model = search.results_model;
+      debug ("Search changed to '%s'", search_string);
+
+      if (source_activated ("local"))
+      {
+        if (search_type == Unity.SearchType.GLOBAL)
+        {
+          if (search_string == "")
+          {
+            model.clear ();
+            if (search != null)
+              search_status.finished ();
+            debug ("Global view without search string : hide");
+          }
+          else
+          {
+            update_results_model (search_string, model, "global", cancellable, search_status);
+          }
+        }
+        else
+        {
+          if (search_string == null || search_string == "")
+          {
+            try
+            {
+              zg_call (cancellable, search_status);
+            }
+            catch (GLib.Error e)
+            {
+              warning ("Failed to call zeitgeist: %s", e.message);
+            }
+          }
+          else
+          {
+            update_results_model (search_string, model, "lens", cancellable, search_status);
+          }
+        }
+      }
+    }
+
+    private void update_results_model (string search_string, Dee.Model model, string cat, Cancellable? cancellable, LensSearch search, bool clear_model = true)
+    {
+      var home_folder = GLib.Environment.get_home_dir ();
+
+      if (videos_folder != home_folder)
+      {
+        locate.updatedb ();
+      }
+
+      var result_list = locate.run_locate (search_string, thumbnailer, video_filter);
+      if (result_list != null)
+      {
+        GLib.Idle.add (() =>
+        {
+          result_list.sort ((GLib.CompareFunc?)sort_alpha);
+          add_results (search, model, cat, cancellable, result_list, search_string, clear_model);
+          return false;
+        });
+      }
+    }
+
+    internal void add_results (LensSearch search_status, Dee.Model model, string cat, Cancellable? cancellable, Gee.ArrayList<VideoFile?> result_list, string search, bool clear_model)
+    {
+      if (cancellable != null && !cancellable.is_cancelled ())
+      {
+        if (clear_model)
+          search_status.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);
+        }
+
+        if (search_status != null)
+        {
+          debug ("Search finished");
+          search_status.finished ();
+        }
+      }
+    }
+
+    internal static int sort_alpha (VideoFile a, VideoFile b)
+    {
+      return a.lc_title.collate (b.lc_title);
+    }
+
+    private async void zg_call (Cancellable? cancellable, LensSearch search_status) throws Error
+    {
+      bool active = sources.get_option ("local").active;
+      bool filtering = sources.filtering;
+      string uri = active && filtering ? "file:*" : "*";
+
+      var time_range = new Zeitgeist.TimeRange.to_now ();
+      var event_template = new Zeitgeist.Event ();
+      var subject = new Zeitgeist.Subject.full (uri, Zeitgeist.NFO_VIDEO, "", "", "", "", "");
+      event_template.add_subject (subject);
+
+      var templates = new PtrArray.sized (1);
+      templates.add ((event_template as GLib.Object).ref());
+      var results = yield Zeitgeist.Log.get_default ().find_events (time_range, templates, Zeitgeist.StorageState.ANY, MAX_ZG_EVENTS, Zeitgeist.ResultType.MOST_RECENT_SUBJECTS, cancellable);
+      process_zg_events (results, cancellable, search_status);
+    }
+
+    internal bool video_filter (string path)
+    {
+      try
+      {
+        if (Utils.is_video (path) && !Utils.is_hidden (path))
+        {
+          var file = File.new_for_path (path);
+          if (!is_blacklisted(file.get_uri ()))
+            return true;
+        }
+      }
+      catch (Error e)
+      {
+        warning ("Failed to get properties of '%s': %s", path, e.message);
+      }
+      return false;
+    }
+
+    internal void process_zg_events (Zeitgeist.ResultSet events, Cancellable cancellable, LensSearch search_status)
+    {
+      var result_list = new Gee.ArrayList<VideoFile?> ();
+
+      foreach (var event in events)
+      {
+        if (cancellable.is_cancelled ())
+          return;
+
+        var event_uri = event.get_subject (0).get_uri ();
+        if (event_uri.has_prefix ("file://"))
+        {
+          try
+          {
+            // If the file is local, we use the same methods
+            // as other result items.
+            var file = GLib.File.new_for_uri (event_uri);
+            var path = file.get_path ();
+            if (video_filter (path))
+            {
+              var finfo = file.query_info (GLib.FileAttribute.STANDARD_DISPLAY_NAME, GLib.FileQueryInfoFlags.NONE, null);
+              VideoFile video = VideoFile ()
+              {
+                title = finfo.get_display_name (),
+                lc_title = finfo.get_display_name ().down (),
+                comment = "",
+                uri = event_uri,
+                icon = thumbnailer.get_icon (path),
+                category = CAT_INDEX_MY_VIDEOS
+              };
+              result_list.add (video);
+            }
+          }
+          catch (GLib.Error e)
+          {
+            warning ("Failed to access file '%s': %s", event_uri, e.message);
+          }
+        }
+        else if (event_uri.has_prefix ("http"))
+        {
+          // If the file is distant, we take
+          // all we need from Zeitgeist
+          // this one can be any unicode string:
+          VideoFile video = VideoFile ()
+          {
+            title = event.get_subject (0).get_text (),
+            comment = "",
+            uri = event_uri,
+            icon = event.get_subject (0).get_storage (),
+            category = CAT_INDEX_ONLINE
+          };
+          result_list.add (video);
+        }
+      }
+
+      search_status.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);
+      }
+
+      update_results_model ("", search_status.results_model, "lens", cancellable, search_status, false);
+    }
+
+    private Unity.ActivationResponse show_in_folder (string uri)
+    {
+      try
+      {
+        Unity.Extras.show_in_folder (uri);
+        return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
+      }
+      catch (GLib.Error e)
+      {
+        warning ("Failed to show in folder '%s': %s", uri, e.message);
+      }
+      return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
+    }
+
+    private Preview? generate_preview_for_uri (string uri)
+    {
+      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);
+
+      return preview;
+    }
+
+    private bool is_blacklisted (string uri)
+    {
+      foreach (var blacklisted_uri in blacklist_tracker.get_blacklisted_uris ())
+      {
+        if (uri.has_prefix (blacklisted_uri))
+          return true;
+      }
+      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
+      var active = sources.get_option (source).active;
+      var filtering = sources.filtering;
+      return (active && filtering) || (!active && !filtering);
+    }
+
+  }
+}
 
=== added file 'src/thumbnailer.vala'
--- src/thumbnailer.vala	1970-01-01 00:00:00 +0000
+++ src/thumbnailer.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,115 @@
+/*
+ * 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]>
+ * based on python code by David Calle <[e-mail]>
+ *
+ */
+
+namespace Unity.VideoLens
+{
+  public class Thumbnailer
+  {
+    private static const int MAX_THUMBNAILERS = 3;
+
+    private string videos_folder;
+    private string cache_directory;
+    private Gee.LinkedList<GLib.Pid?> thumbnailer_pids;
+
+    public Thumbnailer (string cache_dir)
+    {
+      cache_directory = cache_dir;
+      videos_folder = GLib.Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
+      thumbnailer_pids = new Gee.LinkedList<GLib.Pid?> ();
+    }
+
+    public string get_icon (string video_file)
+    {
+      /* This method checks several locations for a video thumbnail.
+
+        1) <filename>.jpg file in the same folder (not activated for now)
+        2) Nautilus thumbnails
+        3) Cached thumbnails generated by the scope
+
+        If nothing has been found, it tries to generate a thumbnail with Totem,
+        stores and uses it.
+        If the generation fails or is slow, it fallbacks to the standard video
+        icon.
+      */
+      var file = GLib.File.new_for_path (video_file);
+      var video_path = file.get_path ();
+
+      string? icon_path = null;
+
+      // check if nautilus thumbnail is available
+      try
+      {
+        var finfo = file.query_info (GLib.FileAttribute.THUMBNAIL_PATH + "," + GLib.FileAttribute.THUMBNAILING_FAILED, GLib.FileQueryInfoFlags.NONE);
+        if (finfo.get_attribute_boolean (GLib.FileAttribute.THUMBNAILING_FAILED))
+          return "video";
+        else
+          icon_path = finfo.get_attribute_as_string (GLib.FileAttribute.THUMBNAIL_PATH);
+      }
+      catch (GLib.Error e)
+      {
+        // silently ignore
+      }
+
+      if (icon_path == null || icon_path == "")
+      {
+        string check_path = cache_directory + "/" + video_path.replace (videos_folder, "").replace ("/", "_");
+
+        // check for thumbnail generated by this scope
+        if (Utils.is_regular_file (check_path))
+          return check_path;
+
+        create_thumbnail (video_path, check_path);
+
+        // FIXME: this is not reliable, since we spawn thumbnailer async
+        if (Utils.is_regular_file (check_path))
+          return check_path;
+      }
+
+      if (icon_path == null || icon_path == "")
+        icon_path = "video";
+
+      return icon_path;
+    }
+
+    private void thumbnailer_process_watch (Pid pid, int status)
+    {
+      thumbnailer_pids.remove (pid);
+    }
+
+    public void create_thumbnail (string video_path, string thumbnail_path)
+    {
+      if (thumbnailer_pids.size < MAX_THUMBNAILERS)
+      {
+        GLib.Pid pid;
+        string[] args = {"/usr/bin/totem-video-thumbnailer", video_path, thumbnail_path};
+        try
+        {
+          GLib.Process.spawn_async (null, args, null, GLib.SpawnFlags.DO_NOT_REAP_CHILD, null, out pid);
+          GLib.ChildWatch.add (pid, thumbnailer_process_watch);
+          thumbnailer_pids.add (pid);
+        }
+        catch (Error e)
+        {
+          warning ("Failed to spawn thumbailer: %s", e.message);
+        }
+      }
+    }
+  }
+}
 \ No newline at end of file
 
=== added file 'src/ubuntu-video-search.vala'
--- src/ubuntu-video-search.vala	1970-01-01 00:00:00 +0000
+++ src/ubuntu-video-search.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,229 @@
+/*
+ * 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.UbuntuVideoSearch
+{
+  private static const string SERVER = "http://videosearch.ubuntu.com/v0";
+
+  public static string sources_uri ()
+  {
+    return SERVER + "/sources";
+  }
+
+  public static string recommendations_uri ()
+  {
+    return SERVER + "/search?q=&sources=Amazon";
+  }
+
+  public static string build_search_uri (string query, Gee.ArrayList<string>? sources)
+  {
+    var uri = new StringBuilder ();
+    uri.append (SERVER);
+    uri.append ("/search?q=");
+    uri.append (Uri.escape_string (query, "", false));
+    uri.append ("&split=true");
+    if (sources != null && sources.size>0)
+    {
+      uri.append ("&sources=");
+      uri.append (sources[0]);
+      for (int i=1; i<sources.size; i++)
+      {
+        uri.append (",");
+        uri.append (sources[i]);
+      }
+    }
+    return uri.str;
+  }
+
+  /**
+   * Parses JSON data returned by search requests, returns list of videos.
+   */
+  public Gee.ArrayList<RemoteVideoFile?>? process_search_results (string json_data, bool is_treat_yourself) throws Error
+  {
+    var parser = new Json.Parser ();
+
+    parser.load_from_data (json_data);
+    var root = parser.get_root ();
+
+    if (root.get_node_type () == Json.NodeType.OBJECT)
+    {
+      var records = root.get_object ().get_array_member ("other");
+      var results = process_results_array (records, CAT_INDEX_ONLINE);
+      records = root.get_object ().get_array_member ("treats");
+      results.add_all (process_results_array (records, CAT_INDEX_MORE));
+      return results;
+    }
+    else
+    {
+      var records = root.get_array ();
+      var results = process_results_array (records, is_treat_yourself ? CAT_INDEX_MORE : CAT_INDEX_ONLINE);
+      return results;
+    }
+  }
+
+  /**
+   * Joins elements of JSON array of strings.
+   */
+  internal string join_array (Json.Array array, string separator)
+  {
+    var res = new StringBuilder ();
+    var len = array.get_length ();
+    array.foreach_element ((a, index, node) =>
+    {
+      res.append (node.get_string ());
+      if (index < len - 1)
+        res.append (separator);
+    });
+    return res.str;
+  }
+
+  public string[] json_array_to_str_array (Json.Array array)
+  {
+    string [] res = {};
+    array.foreach_element ((a, index, node) =>
+    {
+      res += node.get_string ();
+    });
+    return res;
+  }
+
+  public RemoteVideoDetails process_details_results (string json_data) throws Error
+  {
+    var parser = new Json.Parser ();
+    parser.load_from_data (json_data);
+    var details = parser.get_root ().get_object ();
+
+    var video = RemoteVideoDetails ();
+    video.title = details.get_string_member ("title");
+    video.image = details.get_string_member ("image");
+    video.description = details.get_string_member ("description");
+    video.source = details.get_string_member ("source");
+
+    if (details.has_member ("release_date"))
+    {
+      // v1 spec states release_date will be YYYY-MM-DD
+      var release_date = GLib.Time ();
+      if (release_date.strptime (details.get_string_member ("release_date"), "%Y-%m-%d") != null)
+      {
+        video.release_date = release_date.format ("%Y");
+      }
+      else
+      {
+        warning ("Failed to parse release_date: '%s'", details.get_string_member ("release_date"));
+      }
+    }
+
+    video.price = details.has_member ("formatted_price") ? details.get_string_member ("formatted_price") : "";
+
+    video.duration = 0;
+    if (details.has_member ("duration"))
+      video.duration = int.parse (details.get_string_member ("duration")) / 60;
+
+    video.directors = {};
+    if (details.has_member ("directors"))
+    {
+      var directors = details.get_array_member ("directors");
+      video.directors = json_array_to_str_array (directors);
+    }
+
+    if (details.has_member ("starring"))
+    {
+      var starring = details.get_array_member ("starring");
+      video.starring = join_array (starring, ", ");
+    }
+
+    video.genres = {};
+    if (details.has_member ("genres"))
+    {
+      var genres = details.get_array_member ("genres");
+      video.genres = json_array_to_str_array (genres);
+    }
+
+    if (details.has_member ("uploaded_by"))
+      video.uploaded_by = details.get_string_member ("uploaded_by");
+
+    if (details.has_member ("date_uploaded"))
+      video.date_uploaded = details.get_string_member ("date_uploaded");
+
+    return video;
+  }
+
+  /**
+   * Parses JSON data returned by 'sources' query, returns list of sources (e.g. "Amazon", "Youtube" etc.)
+   */
+  public Gee.ArrayList<string>? process_sources_results (string json_data) throws Error
+  {
+    var parser = new Json.Parser ();
+
+    parser.load_from_data (json_data);
+    var sources_array = parser.get_root ().get_array ();
+    var results = new Gee.ArrayList<string> (null);
+
+    sources_array.foreach_element ((array, index, node) =>
+    {
+      results.add (node.get_string ());
+    });
+
+    return results;
+  }
+
+  /**
+   * Converts JSON results array to list of RemoteVideoFile records.
+   */
+  internal Gee.ArrayList<RemoteVideoFile?> process_results_array (Json.Array results, int category)
+  {
+    var videos = new Gee.ArrayList<RemoteVideoFile?> ();
+
+    results.foreach_element ((array, index, node) =>
+    {
+      try
+      {
+        var video = RemoteVideoFile ();
+        var rec = node.get_object ();
+        video.uri = rec.get_string_member ("url");
+        video.title = rec.get_string_member ("title");
+        video.icon = rec.get_string_member ("img");
+        video.comment = rec.get_string_member ("source");
+        video.details_uri = (rec.has_member ("details") ? rec.get_string_member ("details") : "");
+        video.category = category;
+        video.price = null;
+
+        if (category == CAT_INDEX_MORE)
+        {
+          string price = null;
+          if (rec.has_member ("formatted_price"))
+          {
+            price = rec.get_string_member ("formatted_price");
+          }
+          if (price == null || price == "free")
+          {
+            price = _("Free");
+          }
+          video.price = price;
+        }
+        videos.add (video);
+      }
+      catch (Error e)
+      {
+        warning ("Malformed result, skipping: %s", e.message);
+      }
+    });
+    return videos;
+  }
+}
 \ No newline at end of file
 
=== removed file 'src/unity-lens-video'
--- src/unity-lens-video	2012-10-18 15:05:16 +0000
+++ src/unity-lens-video	1970-01-01 00:00:00 +0000
@@ -1,543 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-#    Copyright (c) 2011 David Calle <[e-mail]>
-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-#    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/>.
-
-"""The unity video lens. Indexing videos in ~/Videos and generating thumbnails if needed."""
-
-import gettext
-import locale
-import os
-import sys
-from zeitgeist.client import ZeitgeistClient
-from zeitgeist import client, datamodel
-import time
-import fractions
-import dbus
-
-#pylint: disable=E0611
-from gi.repository import (
-    GLib,
-    GObject,
-    Gio,
-    Unity,
-    Dee
-)
-#pylint: enable=E0611
-
-APP_NAME = "unity-lens-video"
-LOCAL_PATH = "/usr/share/locale/"
-
-gettext.bindtextdomain(APP_NAME, LOCAL_PATH)
-gettext.textdomain(APP_NAME)
-_ = gettext.gettext
-
-# Translatable strings
-CAT_ONCOMPUTER = _("My Videos")
-CAT_ONLINE = _("Online")
-CAT_GLOBAL = _("Videos")
-CAT_RECENT = _("Recently Viewed")
-CAT_MORE_SUGGESTIONS = _("More suggestions")
-HINT = _("Search Videos")
-SOURCES = _("Sources")
-LOCAL_VIDEOS = _("My Videos")
-
-CAT_INDEX_MY_VIDEOS = 0
-CAT_INDEX_ONLINE = 1
-CAT_INDEX_MORE = 2
-
-BUS_NAME = "net.launchpad.lens.video"
-FOLDER = GLib.get_user_special_dir(GLib.USER_DIRECTORY_VIDEOS)
-HOME_FOLDER = GLib.get_home_dir()
-CACHE = "%s/unity-lens-video" % GLib.get_user_cache_dir()
-DB = "videos.db"
-Q = []
-Q_MAX = 3
-try:
-    ZG = ZeitgeistClient()
-except:
-    raise SystemExit(1)
-
-REFRESH_TIMEOUT = 300
-PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer"
-PREVIEW_PLAYER_DBUS_PATH = "/com/canonical/Unity/Lens/Music/PreviewPlayer"
-PREVIEW_PLAYER_DBUS_IFACE = PREVIEW_PLAYER_DBUS_NAME
-
-# pylint: disable=R0903
-class Daemon:
-    
-    """Creation of a lens with a local scope."""
-
-    def __init__(self):
-        #Create the lens
-        self._lens = Unity.Lens.new("/net/launchpad/lens/video", "video")
-        self._lens.props.search_hint = HINT
-        self._lens.props.visible = True
-        self._lens.props.search_in_global = True
-        self._lens.props.sources_display_name = SOURCES
-
-        svg_dir = "/usr/share/icons/unity-icon-theme/places/svg/"
-        cats = []
-        cats.append(Unity.Category.new(CAT_ONCOMPUTER,
-            Gio.ThemedIcon.new(svg_dir + "group-videos.svg"),
-            Unity.CategoryRenderer.VERTICAL_TILE))
-        cats.append(Unity.Category.new(CAT_ONLINE,
-            Gio.ThemedIcon.new(svg_dir + "group-internet.svg"),
-            Unity.CategoryRenderer.VERTICAL_TILE))
-        cats.append(Unity.Category.new(CAT_MORE_SUGGESTIONS,
-            Gio.ThemedIcon.new(svg_dir + "group-treat-yourself.svg"),
-            Unity.CategoryRenderer.VERTICAL_TILE))
-        self._lens.props.categories = cats
-
-        filters = []
-        self._lens.props.filters = filters
-        
-        self.bus = dbus.SessionBus()
-        
-        # Create the scope
-        self._scope = Unity.Scope.new("/net/launchpad/lens/video/main")
-        self._scope.search_in_global = True
-        self._scope.props.sources.add_option('local', LOCAL_VIDEOS, None)
-        self._scope.props.provides_personal_content=True
-        self._scope.connect("search-changed", self.on_search_changed)
-        self._scope.connect("filters-changed",self.on_filtering_changed)
-        self._scope.props.sources.connect("notify::filtering",
-            self.on_filtering_changed)
-        self._scope.connect('preview-uri', self.on_preview_uri)
-        self._lens.add_local_scope(self._scope)
-        self._lens.export()
-
-        GLib.timeout_add_seconds(REFRESH_TIMEOUT, self.refresh_results)
-        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-
-    def refresh_results(self, *_):
-        """Update the results on a timeout."""
-        print "Queuing new search because of timeout"
-        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-        return True
-
-    def on_filtering_changed(self, *_):
-        """Run another search when a filter change is notified."""
-        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-
-    def source_activated(self, source):
-        """Return the state of a sources filter option."""
-        active = self._scope.props.sources.get_option(source).props.active
-        filtering = self._scope.props.sources.props.filtering
-        if (active and filtering) or (not active and not filtering):
-            return True
-        else:
-            return False
-    
-    def on_preview_closed(self, preview):
-        try:                        
-            player = self.bus.get_object (PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH)
-            dbus.Interface (player, PREVIEW_PLAYER_DBUS_IFACE).Close()
-        except Exception as e:
-            print "Failed to send close signal to preview player:", e
-
-    def on_preview_uri(self, scope, uri):
-        """Preview request handler"""
-        preview = None
-        model = self._scope.props.results_model
-        iter = model.get_first_iter()
-        while not model.is_last(iter):
-            if model.get_string(iter, 0) == uri:
-                title = model.get_string(iter, 4);
-                try:
-                    subtitle = time.strftime("%x, %X", time.localtime(os.path.getmtime(GLib.filename_from_uri(uri, None))))
-                except:
-                    # Instead of empty, maybe the date/time of the zg event?
-                    subtitle = ''
-                desc = model.get_string(iter, 5);
-                preview = Unity.MoviePreview.new(title, subtitle, desc, None)
-                preview.connect('closed', self.on_preview_closed)
-
-                # we may get remote uris from zeitgeist - fetch details for local files only
-                if uri.startswith("file://"):
-                    local_video = True
-                    preview.props.image_source_uri = uri
-                    try:                        
-                        player = self.bus.get_object (PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH)
-                        props = dbus.Interface (player, PREVIEW_PLAYER_DBUS_IFACE).VideoProperties(uri)
-                        width = props['width']
-                        height = props['height']
-                        codec = props['codec']
-                        dimensions = str(width) + "*" + str(height)
-                        if width > 0 and height > 0:
-                            gcd = fractions.gcd(width, height)
-                            dimensions += ", " + str(width / gcd) + ":" + str(height / gcd)
-                        preview.add_info(Unity.InfoHint.new("format", _("Format"), None, codec))
-                        preview.add_info(Unity.InfoHint.new("dimensions", _("Dimensions"), None, dimensions))
-                        preview.add_info(Unity.InfoHint.new("size", _("Size"), None, GLib.format_size(os.path.getsize(GLib.filename_from_uri(uri, None)))))
-                    except Exception as e:
-                        print "Couldn't get video details", e
-                else:
-                    local_video = False
-                    preview.props.image_source_uri = model.get_string(iter, 1)
-                play_video = Unity.PreviewAction.new("play", _("Play"), None)
-                preview.add_action(play_video)
-                if local_video:
-                    show_folder = Unity.PreviewAction.new("show-in-folder", _("Show in Folder"), None)
-                    show_folder.connect('activated', self.show_in_folder)
-                    preview.add_action(show_folder)
-                break
-            iter = model.next(iter)
-        if preview == None:
-            print "Couldn't find model row for requested preview uri:", uri
-        return preview
-
-    def show_in_folder(self, scope, uri):
-        """ Open folder that contains given video """
-        file = Gio.file_new_for_uri (uri)
-        parent = file.get_parent()
-        if parent == None:
-            parent = Gio.file_new_for_path("/")
-        try:
-            Gio.app_info_launch_default_for_uri(parent.get_uri(), None)
-        except Exception as e:
-            print "Couldn't launch default app for uri", parent.get_uri(), e
-            return Unity.ActivationResponse(handled=Unity.HandledType.NOT_HANDLED)
-        return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH)
-
-    def on_search_changed(self, scope, search, search_type, cancellable):
-        """On a new search, differentiate between lens view 
-        and global search before updating the model"""
-        search_status = search
-        search_string = search.props.search_string.strip()
-        print "Search changed to \"%s\"" % search_string
-        model = search.props.results_model
-        if self.source_activated('local'):
-            if search_type is Unity.SearchType.GLOBAL:
-                if search_string == '':
-                    model.clear ()
-                    if search_status:
-                        search_status.finished ()
-                    print "Global view without search string : hide"
-                    
-                else:
-                    self.update_results_model(search_string, model, 'global', cancellable, search_status)
-            else:
-                if not search_string:
-                    # this will call update_results_model as well
-                    self.zg_call(cancellable, search_status)
-                else:
-                    self.update_results_model(search_string, model, 'lens', cancellable, search_status)
-        else:
-            model.clear()
-            if search_status:
-                search_status.finished ()
-
-    def update_results_model(self, search, model, cat, cancellable, search_status, clear_model=True):
-        """Check for the existence of the cache folder, create it if needed,
-        and run the search method."""
-        if not Gio.file_new_for_path(CACHE).query_exists(None):
-            Gio.file_new_for_path(CACHE).make_directory(None)
-        if FOLDER != HOME_FOLDER:
-            try:
-                GLib.spawn_async(['/usr/bin/updatedb', '-o', CACHE+'/'+DB,
-                                  '-l', '0', '-U', FOLDER])
-            except GLib.GError:
-                print "Can't create the database, will retry."
-
-        if self.is_file(CACHE+'/'+DB):
-            try:
-                results = GLib.spawn_sync(None,
-                                          ['/usr/bin/locate',
-                                           '-id', CACHE+'/'+DB,
-                                           FOLDER+'*'+search.replace (" ","*")+'*' ],
-                                          None, 0, None, None)
-            except GLib.GError:
-                results = None
-            else:
-                # spawn_sync returns bool, stdout, stderr, exit_status
-                if results[3] == 0:
-                    results = results[1]
-                else:
-                    results = None
-        else:
-            results = None
-        result_list = []
-        blacklist = self.get_blacklist ()
-        if results:
-                video_counter = 0
-                print len(results.split('\n'))
-                for video in results.split('\n'):
-                    if video_counter < 100:
-                        if self.is_video(video) and not self.is_hidden(video, blacklist):
-                            video_counter+= 1
-                            title = self.get_name(video)
-                            comment = ''
-                            uri = 'file://%s' % video
-                            icon = self.get_icon(video)
-                            if title:
-                                item = []
-                                item.append(title)
-                                item.append(comment)
-                                item.append(uri)
-                                item.append(icon)
-                                result_list.append(item)
-                result_list = self.sort_alpha(result_list)
-        
-        GLib.idle_add(self.add_results, search_status, model, cat, cancellable, result_list, search, clear_model)
-        
-
-    def add_results (self, search_status=None, model=None, 
-                    cat=None, cancellable=None, result_list=[], search=None,
-                    clear_model=None):
-        result_sets = []
-        
-        if cancellable and not cancellable.is_cancelled():
-            if cat == 'global':
-                # Create only one result set for the Global search
-                result_sets.append({'category':CAT_INDEX_MY_VIDEOS, 'results':result_list})
-            else:
-                result_sets.append({'category':CAT_INDEX_MY_VIDEOS, 'results':result_list})
-            if clear_model: model.clear()
-            for result_set in result_sets:
-                cat = result_set['category']
-                for i in result_set['results']:
-                    title = str(i[0])
-                    comment = str(i[1])
-                    uri = str(i[2])
-                    dnd_uri = str(i[2])
-                    icon_hint = str(i[3])
-                    model.append(uri, icon_hint, cat, "text/html",
-                        title, comment, dnd_uri)
-            if search_status:
-                print "Search finished"
-                search_status.finished()
-        else:
-            print "Search cancelled"
-        return False
-
-    def is_file(self, uri):
-        """Check if the file is an actual file"""
-        g_file = Gio.file_new_for_path(uri)
-        if g_file.query_exists(None):
-            file_type = g_file.query_file_type(Gio.FileQueryInfoFlags.NONE,
-                None)
-            if file_type is Gio.FileType.REGULAR:
-                return True
-
-    def get_blacklist(self):
-        """Get zeitgeist blacklist"""
-        bt_list = []
-        try:
-            iface = client.ZeitgeistDBusInterface()
-        except:
-            print "Unable to connect to Zeitgeist, won't handle blacklists."
-            iface = None
-        if iface:
-            blacklist = iface.get_extension("Blacklist", "blacklist")
-            bt_list = blacklist.GetTemplates ()
-        return bt_list
-
-    def is_hidden(self, uri, blacklist):
-        """Check if the file is hidden"""
-        g_file = Gio.file_new_for_path(uri)
-        hidden = g_file.query_info(
-            Gio.FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
-            Gio.FileQueryInfoFlags.NONE,
-            None).get_attribute_boolean('standard::is-hidden')
-        blacklisted = False
-        for bt in blacklist:
-            bt = bt.replace('dir-/', '/').encode("utf-8")
-            if uri.startswith(bt):
-                blacklisted = True
-        if hidden or uri.find('/.') > -1 or blacklisted:
-            return True
-
-    def sort_alpha(self, results):
-        """Sort results in several ways, depending on the category"""
-        results.sort(key=lambda x: x[0].lower(), reverse=False)
-        return results
-
-    def is_video(self, uri):
-        """Check if the file is a video"""
-        if self.is_file(uri):
-            g_file = Gio.file_new_for_path(uri)
-            content_type = g_file.query_info('standard::content-type',
-                Gio.FileQueryInfoFlags.NONE,
-                None).get_content_type()
-            if 'video' in content_type:
-                return True
-
-    def get_name(self, uri):
-        """Get the display name of the file"""
-        g_file = Gio.file_new_for_path(uri)
-        name = g_file.query_info(
-            Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-            Gio.FileQueryInfoFlags.NONE,
-            None)
-        display_name = name.get_attribute_as_string(
-            Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME)
-        return display_name
-
-    def get_icon(self, uri):
-        """This method checks several locations for a video thumbnail.
-
-        1) <filename>.jpg file in the same folder (not activated for now)
-        1) Nautilus thumbnails
-        2) Cached thumbnails generated by the scope
-
-        If nothing has been found, it tries to generate a thumbnail with Totem,
-        stores and uses it.
-        If the generation fails or is slow, it fallbacks to the standard video
-        icon.
-        """
-        icon_path = None
-        g_file = Gio.file_new_for_path(uri)
-        video_path = g_file.get_path()
-        thumb_name = video_path.replace(FOLDER, '').replace('/', '_')
-        icon_check = '%s/thumb_%s.png' % (CACHE, thumb_name)
-    #       if not icon_path:
-    #           print 'Check for local cover'
-    #           local_cover = uri.replace('.%s' % uri.split('.')[-1], '.jpg')
-    #           if self.is_file(local_cover):
-    #               icon_path = local_cover
-        if not icon_path:
-            icon = g_file.query_info(
-                ','.join((Gio.FILE_ATTRIBUTE_THUMBNAIL_PATH,
-                          Gio.FILE_ATTRIBUTE_THUMBNAILING_FAILED)),
-                Gio.FileQueryInfoFlags.NONE,
-                None)
-            if icon.get_attribute_boolean(Gio.FILE_ATTRIBUTE_THUMBNAILING_FAILED):
-                icon_path = 'video'
-            else:
-                icon_path = icon.get_attribute_as_string(
-                    Gio.FILE_ATTRIBUTE_THUMBNAIL_PATH)
-        if not icon_path:
-            if self.is_file(icon_check):
-                icon_path = icon_check
-        if not icon_path:
-            # Check if processes can be removed from the thumbnailing queue
-            for process in Q:
-                if not Gio.file_new_for_path(
-                    "/proc/"+str(process)).query_exists(None):
-                    Q.remove(process)
-            if len(Q) < Q_MAX:
-                try:
-                    p = GLib.spawn_async(['/usr/bin/totem-video-thumbnailer', 
-                                          video_path, icon_check])
-                    Q.append(p[0])
-                    if self.is_file(icon_check):
-                        icon_path = icon_check
-                except:
-                    print "Warning : the file may have been removed."
-        if not icon_path:
-            icon_path = 'video'
-        return icon_path
-
-    def zg_call (self, cancellable, search_status):
-        active = self._scope.props.sources.get_option("local").props.active
-        filtering = self._scope.props.sources.props.filtering
-        if active and filtering:
-            uri = "file:*"
-        else:
-            uri = "*"
-        time_range = datamodel.TimeRange.until_now ()
-        max_amount_results = 24
-        event_template = datamodel.Event()
-        interpretation = datamodel.Interpretation.VIDEO
-        event_template.append_subject(
-            datamodel.Subject.new_for_values(uri=uri,interpretation=interpretation))
-        def wrap(callback):
-            def wrapped(events):
-                callback(events, cancellable, search_status)
-
-            return wrapped
-
-        ZG.find_events_for_templates(
-            [event_template, ],
-            wrap(self.progress_zg_events),
-            timerange = time_range,
-            storage_state = datamodel.StorageState.Any,
-            num_events = max_amount_results,
-            result_type = datamodel.ResultType.MostRecentSubjects
-        )
-
-    def progress_zg_events(self, events, cancellable, search_status):
-        if cancellable.is_cancelled(): return
-        blacklist = self.get_blacklist ()
-        result_list = []
-        for event in events:
-            item = []
-            uri = event.get_subjects()[0].uri
-            if uri.startswith('file://'):
-                # If the file is local, we use the same methods 
-                # as other result items.
-                g_file = Gio.file_new_for_uri(uri)
-                path = g_file.get_path()
-                if self.is_video(path) and not self.is_hidden(path, blacklist):
-                    item.append(self.get_name(path))
-                    item.append('')
-                    item.append(uri.encode("utf-8"))
-                    item.append(self.get_icon(path))
-                    item.append(CAT_INDEX_MY_VIDEOS)
-                    result_list.append(item)
-            elif uri.startswith('http'):
-                # If the file is distant, we take 
-                # all we need from Zeitgeist
-                #  this one can be any unicode string:
-                item.append(event.get_subjects()[0].text.encode("utf-8"))
-                item.append('')
-                #  these two *should* be ascii, but it can't hurt to be safe
-                item.append(event.get_subjects()[0].uri.encode("utf-8"))
-                item.append(event.get_subjects()[0].storage.encode("utf-8"))
-                item.append(CAT_INDEX_ONLINE)
-                result_list.append(item)
-        search_status.props.results_model.clear ()
-        for i in result_list:
-            title = str(i[0])
-            comment = str(i[1])
-            uri = str(i[2])
-            dnd_uri = str(i[2])
-            icon_hint = str(i[3])
-            category = i[4]
-            self._scope.props.results_model.append(uri, icon_hint,
-                category, "text/html", title, comment, dnd_uri)
-
-        self.update_results_model("", search_status.props.results_model, 'lens', cancellable, search_status, False)
-        
-# pylint: enable=R0903
-
-def main():
-    """Connect to the session bus, exit if there is a running instance."""
-    try:
-        session_bus_connection = Gio.bus_get_sync(Gio.BusType.SESSION, None)
-        session_bus = Gio.DBusProxy.new_sync(session_bus_connection, 0, None,
-                                                'org.freedesktop.DBus',
-                                                '/org/freedesktop/DBus',
-                                                'org.freedesktop.DBus', None)
-        result = session_bus.call_sync('RequestName',
-                                        GLib.Variant("(su)", (BUS_NAME, 0x4)),
-                                        0, -1, None)
-
-        # Unpack variant response with signature "(u)". 1 means we got it.
-        result = result.unpack()[0]
-
-        if result != 1:
-            print >> sys.stderr, "Failed to own name %s. Bailing out." % BUS_NAME
-            raise SystemExit(1)
-    except:
-        raise SystemExit(1)
-
-    daemon = Daemon()
-    GObject.MainLoop().run()
-
-if __name__ == "__main__":
-    main()
 
=== added file 'src/utils.vala'
--- src/utils.vala	1970-01-01 00:00:00 +0000
+++ src/utils.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,77 @@
+/*
+ * 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]>
+ * based on python code by David Calle <[e-mail]>
+ */
+
+namespace Unity.Utils
+{
+  public bool is_regular_file (string path)
+  {
+    var file = GLib.File.new_for_path (path);
+    if (file.query_exists (null))
+      return file.query_file_type (GLib.FileQueryInfoFlags.NONE, null) == GLib.FileType.REGULAR;
+    return false;
+  }
+
+  public bool is_video (string path) throws Error
+  {
+    var file = GLib.File.new_for_path (path);
+    if (file.query_exists (null))
+    {
+      if (file.query_file_type (GLib.FileQueryInfoFlags.NONE, null) == GLib.FileType.REGULAR)
+      {
+        var content_type = file.query_info ("standard::content-type", GLib.FileQueryInfoFlags.NONE, null).get_content_type ();
+        return content_type.contains ("video");
+      }
+    }
+    return false;
+  }
+
+  private bool is_hidden (string path) throws Error
+  {
+    var file = GLib.File.new_for_path (path);
+    return file.query_info (GLib.FileAttribute.STANDARD_IS_HIDDEN, GLib.FileQueryInfoFlags.NONE, null).get_is_hidden ();
+  }
+
+  public string get_name (string path) throws Error
+  {
+    var file = GLib.File.new_for_path (path);
+    var finfo = file.query_info (GLib.FileAttribute.STANDARD_DISPLAY_NAME, GLib.FileQueryInfoFlags.NONE, null);
+    return finfo.get_attribute_as_string (GLib.FileAttribute.STANDARD_DISPLAY_NAME);
+  }
+
+  public uint gcd (uint a, uint b)
+    requires (a > 0 && b > 0)
+    ensures (result > 0)
+  {
+    for (;;)
+    {
+      if (a > b)
+      {
+        a = a % b;
+        if (a == 0)
+          return b;
+      }
+      else
+      {
+        b = b % a;
+        if (b == 0)
+          return a;
+      }
+    }
+  }
+}
 \ No newline at end of file
 
=== added file 'src/video-file.vala'
--- src/video-file.vala	1970-01-01 00:00:00 +0000
+++ src/video-file.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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 struct VideoFile
+  {
+    string title;
+    string lc_title;
+    string comment;
+    string uri;
+    string icon;
+    int category;
+  }
+
+  public struct RemoteVideoFile
+  {
+    string title;
+    string comment;
+    string uri;
+    string icon;
+    string details_uri;
+    string price;
+    int category;
+  }
+
+public struct RemoteVideoDetails
+  {
+    string title;
+    string description;
+    string uri;
+    string image;
+    string source;
+    string release_date;
+    int duration;
+    string[] directors;
+    string starring;
+    string[] genres;
+    string uploaded_by;
+    string date_uploaded;
+    string price;
+  }
+}
 \ No newline at end of file
 
=== added directory 'tests/unit'
=== added file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	1970-01-01 00:00:00 +0000
+++ tests/unit/Makefile.am	2013-02-19 17:19:01 +0000
@@ -0,0 +1,120 @@
+include $(top_srcdir)/Makefile.decl
+
+check_PROGRAMS = \
+	test-locate \
+	test-utils \
+        test-ubuntu-video-search \
+	$(NULL)
+
+TEST_PROGS += $(check_PROGRAMS)
+
+AM_VALAFLAGS = \
+	  --pkg dee-1.0 \
+	  --pkg unity \
+	  --pkg unity-extras \
+	  --pkg gio-2.0 \
+	  --pkg gio-unix-2.0 \
+	  --pkg json-glib-1.0 \
+	  --pkg glib-2.0 \
+	  --pkg zeitgeist-1.0 \
+	  --pkg libsoup-gnome-2.4 \
+	  --pkg libsoup-2.4 \
+	  --vapidir $(srcdir) \
+	  --vapidir $(top_srcdir)/vapi \
+	  --target-glib=2.26 \
+	  $(MAINTAINER_VALAFLAGS) \
+	  $(NULL)
+
+LDADD = $(LENS_DAEMON_LIBS) \
+	$(test_libs)
+
+AM_CPPFLAGS = \
+  $(LENS_DAEMON_CFLAGS) \
+  -I$(srcdir) \
+  -I$(top_srcdir)/src \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+  $(COVERAGE_CFLAGS) \
+  $(NULL)
+
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+
+if !ENABLE_C_WARNINGS
+  AM_CPPFLAGS += -w
+endif
+
+test_locate_VALASOURCES = \
+	test-locate.vala \
+	thumbnailer-mock.vala \
+	config-tests.vala \
+	$(top_srcdir)/src/locate.vala \
+	$(top_srcdir)/src/utils.vala \
+	$(top_srcdir)/src/video-file.vala \
+	$(NULL)
+
+test_utils_VALASOURCES = \
+	test-utils.vala \
+	config-tests.vala \
+	$(top_srcdir)/src/utils.vala \
+	$(NULL)
+
+test_ubuntu_video_search_VALASOURCES = \
+	test-ubuntu-video-search.vala \
+	config-tests.vala \
+	$(top_srcdir)/src/remote-scope-globals.vala \
+	$(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)
+
+nodist_test_locate_SOURCES = $(test_locate_VALASOURCES:.vala=.c)
+
+nodist_test_utils_SOURCES = $(test_utils_VALASOURCES:.vala=.c)
+
+nodist_test_ubuntu_video_search_SOURCES = $(test_ubuntu_video_search_VALASOURCES:.vala=.c)
+
+CLEANFILES = *.stamp \
+	  *.c \
+	  $(NULL)
+
+EXTRA_DIST = \
+	$(test_locate_VALASOURCES) \
+	$(test_utils_VALASOURCES) \
+	$(test_ubuntu_video_search_VALASOURCES) \
+	data/videosearch_input1.txt \
+	data/videosearch_input2.txt \
+	data/videosearch_details1.txt \
+        data/video1.avi \
+        data/video2.avi \
+        data/video3.avi \
+        data/video1.mpg \
+        data/video2.mpg \
+        data/video3.mpg \
+	$(NULL)
+
+BUILT_SOURCES = \
+	test-locate.vala.stamp \
+	test-utils.vala.stamp \
+	test-ubuntu-video-search.vala.stamp \
+	$(NULL)
+
+test-locate.vala.stamp: $(test_locate_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-utils.vala.stamp: $(test_utils_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-ubuntu-video-search.vala.stamp: $(test_ubuntu_video_search_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+# START HEADLESS TESTS
+if ENABLE_HEADLESS_TESTS
+test-headless:
+	$(XVFB) make test-nonrecursive; \
+	sleep 1;
+endif
+# END HEADLESS TESTS
 
=== added file 'tests/unit/config-tests.vala.in'
--- tests/unit/config-tests.vala.in	1970-01-01 00:00:00 +0000
+++ tests/unit/config-tests.vala.in	2013-02-19 17:19:01 +0000
@@ -0,0 +1,6 @@
+namespace Config {
+  const string TESTDATADIR = "@abs_top_srcdir@/tests/unit/data";
+  const string LOCALEDIR = "@DATADIR@/locale";
+  const string PACKAGE = "@PACKAGE@";
+  const string VERSION = "@VERSION@";
+}
 
=== added directory 'tests/unit/data'
=== added file 'tests/unit/data/video1.avi'
=== added file 'tests/unit/data/video1.mpg'
=== added file 'tests/unit/data/video2.avi'
=== added file 'tests/unit/data/video2.mpg'
=== added file 'tests/unit/data/video3.avi'
=== added file 'tests/unit/data/video3.mpg'
=== added file 'tests/unit/data/videosearch_details1.txt'
--- tests/unit/data/videosearch_details1.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/data/videosearch_details1.txt	2013-02-19 17:19:01 +0000
@@ -0,0 +1,26 @@
+{
+  "browser_url": "http://browserurl1",
+  "genres": [
+    "genre1",
+    "genre2"
+  ],
+  "description": "a movie",
+  "title": "title1",
+  "price": 1,
+  "source": "source1",
+  "directors": [
+    "director1",
+    "director2"
+  ],
+  "details": "http://detailsurl1",
+  "starring": [
+    "star1",
+    "star2"
+  ],
+  "uploaded_by": "uploader1",
+  "duration": "5477",
+  "release_date": "2010-04-01T07:00:00.000Z",
+  "image": "http://image1",
+  "date_uploaded": "2012-06-06T21:55:12.000Z",
+  "formatted_price": "$1"
+}
 
=== added file 'tests/unit/data/videosearch_input1.txt'
--- tests/unit/data/videosearch_input1.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/data/videosearch_input1.txt	2013-02-19 17:19:01 +0000
@@ -0,0 +1,44 @@
+{
+  "other": [
+    {
+      "url": "http://url0",
+      "source": "source0",
+      "img": "http://image0",
+      "title": "title0"
+    },
+    {
+      "url": "http://url1",
+      "source": "source1",
+      "details": "http://details1",
+      "img": "http://image1",
+      "title": "title1"
+    }
+  ],
+  "treats": [
+    {
+      "img": "http://image2",
+      "title": "title2",
+      "url": "http://url2",
+      "price": 1,
+      "source": "source2",
+      "details": "http://details2",
+      "formatted_price": "1 USD"
+    },
+    {
+      "img": "http://image3",
+      "title": "title3",
+      "url": "http://url3",
+      "price": 0,
+      "source": "source3",
+      "details": "http://details3",
+      "formatted_price": "free"
+    },
+    {
+      "img": "http://image4",
+      "title": "title4",
+      "url": "http://url4",
+      "source": "source4",
+      "details": "http://details4"
+    }
+  ]
+}
 
=== added file 'tests/unit/data/videosearch_input2.txt'
--- tests/unit/data/videosearch_input2.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/data/videosearch_input2.txt	2013-02-19 17:19:01 +0000
@@ -0,0 +1,17 @@
+[
+    {
+      "url": "http://url0",
+      "source": "source0",
+      "img": "http://image0",
+      "title": "title0"
+    },
+    {
+      "url": "http://url1",
+      "source": "source1",
+      "details": "http://details1",
+      "img": "http://image1",
+      "title": "title1",
+      "price": 1,
+      "formatted_price": "1 USD"
+    }
+]
 
=== added file 'tests/unit/test-locate.vala'
--- tests/unit/test-locate.vala	1970-01-01 00:00:00 +0000
+++ tests/unit/test-locate.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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
+{
+  private Thumbnailer thumbnailer;
+  private Locate locate;
+  private string video_dir;
+  private string user_videos_folder;
+
+  public static int main (string[] args)
+  {
+    video_dir = Config.TESTDATADIR;
+    user_videos_folder = GLib.Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
+
+    locate = new Locate ("cache", video_dir);
+    thumbnailer = new Thumbnailer ();
+
+    Test.init (ref args);
+    Test.add_data_func ("/Locate/ParseLocateResults", test_parse);
+    Test.add_data_func ("/Locate/LocateQueryString", test_query_string);
+    Test.run ();
+    return 0;
+  }
+
+  internal static void test_parse ()
+  {
+    string input = @"$video_dir/video1.avi\n$video_dir/video2.avi\n$video_dir/video1.mpg\n$video_dir/video2.mpg\n";
+    var results = locate.parse_locate_results (input, 1000, thumbnailer, (path) => { return true; });
+    assert (results.size == 4);
+
+    /* Filter out all results */
+    results = locate.parse_locate_results (input, 1000, thumbnailer, (path) => { return false; });
+    assert (results.size == 0);
+  }
+
+  internal static void test_query_string ()
+  {
+    assert (locate.locate_query_string ("foo") == video_dir + "*foo*");
+    assert (locate.locate_query_string ("foo bar") == video_dir + "*foo*bar*");
+  }
+}
 \ No newline at end of file
 
=== added file 'tests/unit/test-ubuntu-video-search.vala'
--- tests/unit/test-ubuntu-video-search.vala	1970-01-01 00:00:00 +0000
+++ tests/unit/test-ubuntu-video-search.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,329 @@
+/*
+ * 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 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, "");
+
+    Test.init (ref args);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessSourcesResults", test_process_sources_results);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessInvalidSourcesResults", test_process_invalid_sources_results);
+    Test.add_data_func ("/UbuntuVideoSearch/BuildSearchUri", test_build_search_uri);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessInvalidSearchResultsJson", test_invalid_search_results_json);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessSearchResults", test_process_search_results);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessSearchResultsTreatYourself", test_process_search_no_split_ty_category);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessSearchResultsOnline", test_process_search_no_split_online_category);
+    Test.add_data_func ("/UbuntuVideoSearch/JoinArray", test_join_array);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessInvalidDetailsResults", test_process_invalid_details_results);
+    Test.add_data_func ("/UbuntuVideoSearch/ProcessDetailsResults", test_process_details_results);
+
+    Test.run ();
+
+    return 0;
+  }
+
+  internal static void test_process_sources_results ()
+  {
+    assert (UbuntuVideoSearch.process_sources_results ("[]").size == 0);
+
+    var sources = UbuntuVideoSearch.process_sources_results ("[\"Foo\", \"Bar\"]");
+    assert (sources.size == 2);
+    assert (sources[0] == "Foo");
+    assert (sources[1] == "Bar");
+  }
+
+  internal static void test_process_invalid_sources_results ()
+  {
+    bool got_excp = false;
+    try
+    {
+      UbuntuVideoSearch.process_sources_results (";");
+    }
+    catch (Error e)
+    {
+      got_excp = true;
+    }
+    assert (got_excp == true);
+  }
+
+  internal static void test_build_search_uri ()
+  {
+    // test null sources
+    assert (UbuntuVideoSearch.build_search_uri ("foo", null) == "http://videosearch.ubuntu.com/v0/search?q=foo&split=true");
+
+    // test empty sources list
+    var sources = new Gee.ArrayList<string> (null);
+    assert (UbuntuVideoSearch.build_search_uri ("foo", sources) == "http://videosearch.ubuntu.com/v0/search?q=foo&split=true");
+
+    // test non-empty sources and uri escaping
+    sources.add ("Amazon");
+    sources.add ("BBC");
+    assert (UbuntuVideoSearch.build_search_uri ("foo!", sources) == "http://videosearch.ubuntu.com/v0/search?q=foo%21&split=true&sources=Amazon,BBC");
+  }
+
+  internal static void test_invalid_search_results_json ()
+  {
+    // ignore warnings
+    Test.log_set_fatal_handler (() => { return false; });
+
+    bool got_excp = false;
+    try
+    {
+      UbuntuVideoSearch.process_search_results (",", false);
+    }
+    catch (Error e)
+    {
+      got_excp = true;
+    }
+    assert (got_excp == true);
+  }
+
+  /**
+   * Test search results of search query with 'split=true' flag, resulting in search results
+   * being placed in CAT_INDEX_MORE (if from 'treats' results group) and CAT_INDEX_ONLINE category (if from 'other' group).
+   */
+  internal static void test_process_search_results ()
+  {
+    string datadir = Config.TESTDATADIR;
+    uint8[] contents;
+    assert (File.new_for_path (@"$datadir/videosearch_input1.txt").load_contents (null, out contents, null) == true);
+
+    var results = UbuntuVideoSearch.process_search_results ((string)contents, false);
+    assert (results.size == 5);
+
+    bool got_video[5] = {false, false, false, false, false};
+
+    // verify that all expected records are there
+    foreach (var res in results)
+    {
+      if (res.title == "title0")
+      {
+        got_video[0] = true;
+        assert (res.comment == "source0");
+        assert (res.uri == "http://url0");
+        assert (res.icon == "http://image0");
+        assert (res.details_uri == "");
+        assert (res.price == null);
+        assert (res.category == CAT_INDEX_ONLINE);
+      }
+      else if (res.title == "title1")
+      {
+        got_video[1] = true;
+        assert (res.comment == "source1");
+        assert (res.uri == "http://url1");
+        assert (res.icon == "http://image1");
+        assert (res.details_uri == "http://details1");
+        assert (res.price == null);
+        assert (res.category == CAT_INDEX_ONLINE);
+      }
+      else if (res.title == "title2")
+      {
+        got_video[2] = true;
+        assert (res.comment == "source2");
+        assert (res.uri == "http://url2");
+        assert (res.icon == "http://image2");
+        assert (res.details_uri == "http://details2");
+        assert (res.price == "1 USD");
+        assert (res.category == CAT_INDEX_MORE);
+      }
+      else if (res.title == "title3")
+      {
+        got_video[3] = true;
+        assert (res.comment == "source3");
+        assert (res.uri == "http://url3");
+        assert (res.icon == "http://image3");
+        assert (res.details_uri == "http://details3");
+        assert (res.price == _("Free"));
+        assert (res.category == CAT_INDEX_MORE);
+      }
+      else if (res.title == "title4")
+      {
+        got_video[4] = true;
+        assert (res.comment == "source4");
+        assert (res.uri == "http://url4");
+        assert (res.icon == "http://image4");
+        assert (res.details_uri == "http://details4");
+        assert (res.price == _("Free")); // null price of video4 turned into 'free' for 'Treat yourself category'
+        assert (res.category == CAT_INDEX_MORE);
+      }
+      else
+      {
+        assert (1 == 0); // this shouldn't happen
+      }
+    }
+
+    assert (got_video[0] == true);
+    assert (got_video[1] == true);
+    assert (got_video[2] == true);
+    assert (got_video[3] == true);
+    assert (got_video[4] == true);
+  }
+
+  /**
+   * Test search results of search query with no 'split' option and is_treat_yourself=true, resulting in all search results
+   * being placed in CAT_INDEX_MORE category.
+   */
+  internal static void test_process_search_no_split_ty_category ()
+  {
+    string datadir = Config.TESTDATADIR;
+    uint8[] contents;
+    assert (File.new_for_path (@"$datadir/videosearch_input2.txt").load_contents (null, out contents, null) == true);
+
+    var results = UbuntuVideoSearch.process_search_results ((string)contents,  /* is_treat_yourself */ true);
+    assert (results.size == 2);
+
+    bool got_video[2] = {false, false};
+
+    // verify that all expected records are there
+    foreach (var res in results)
+    {
+      if (res.title == "title0")
+      {
+        got_video[0] = true;
+        assert (res.comment == "source0");
+        assert (res.uri == "http://url0");
+        assert (res.icon == "http://image0");
+        assert (res.details_uri == "");
+        assert (res.price == _("Free"));
+        assert (res.category == CAT_INDEX_MORE);
+      }
+      else if (res.title == "title1")
+      {
+        got_video[1] = true;
+        assert (res.comment == "source1");
+        assert (res.uri == "http://url1");
+        assert (res.icon == "http://image1");
+        assert (res.details_uri == "http://details1");
+        assert (res.price == "1 USD");
+        assert (res.category == CAT_INDEX_MORE);
+      }
+      else
+      {
+        assert (1 == 0); // this shouldn't happen
+      }
+    }
+
+    assert (got_video[0] == true);
+    assert (got_video[1] == true);
+  }
+
+  /**
+   * Test search results of search query with no 'split' option and is_treat_yourself=false, resulting in all search results
+   * being placed in CAT_INDEX_ONLINE
+   */
+  internal static void test_process_search_no_split_online_category ()
+  {
+    string datadir = Config.TESTDATADIR;
+    uint8[] contents;
+    assert (File.new_for_path (@"$datadir/videosearch_input2.txt").load_contents (null, out contents, null) == true);
+
+    var results = UbuntuVideoSearch.process_search_results ((string)contents, /* is_treat_yourself */ false);
+    assert (results.size == 2);
+
+    bool got_video[2] = {false, false};
+
+    // verify that all expected records are there
+    foreach (var res in results)
+    {
+      if (res.title == "title0")
+      {
+        got_video[0] = true;
+        assert (res.comment == "source0");
+        assert (res.uri == "http://url0");
+        assert (res.icon == "http://image0");
+        assert (res.details_uri == "");
+        assert (res.price == null);
+        assert (res.category == CAT_INDEX_ONLINE);
+      }
+      else if (res.title == "title1")
+      {
+        got_video[1] = true;
+        assert (res.comment == "source1");
+        assert (res.uri == "http://url1");
+        assert (res.icon == "http://image1");
+        assert (res.details_uri == "http://details1");
+        assert (res.price == null);
+        assert (res.category == CAT_INDEX_ONLINE);
+      }
+      else
+      {
+        assert (1 == 0); // this shouldn't happen
+      }
+    }
+
+    assert (got_video[0] == true);
+    assert (got_video[1] == true);
+  }
+
+  internal static void test_join_array ()
+  {
+    var array = new Json.Array ();
+    array.add_string_element ("abc");
+    array.add_string_element ("def");
+
+    assert (UbuntuVideoSearch.join_array (array, ", ") == "abc, def");
+  }
+
+  internal static void test_process_invalid_details_results ()
+  {
+    bool got_excp = false;
+    try
+    {
+      UbuntuVideoSearch.process_details_results (",");
+    }
+    catch (Error e)
+    {
+      got_excp = true;
+    }
+    assert (got_excp == true);
+  }
+
+  internal static void test_process_details_results ()
+  {
+    string datadir = Config.TESTDATADIR;
+    uint8[] contents;
+    assert (File.new_for_path (@"$datadir/videosearch_details1.txt").load_contents (null, out contents, null) == true);
+
+    var video = UbuntuVideoSearch.process_details_results ((string)contents);
+
+    assert (video.title == "title1");
+    assert (video.description == "a movie");
+    assert (video.image == "http://image1");
+    assert (video.directors.length == 2);
+    assert (video.directors[0] == "director1");
+    assert (video.directors[1] == "director2");
+    assert (video.duration == 91);
+    assert (video.genres.length == 2);
+    assert (video.genres[0] == "genre1");
+    assert (video.genres[1] == "genre2");
+    assert (video.starring == "star1, star2");
+    assert (video.source == "source1");
+    assert (video.release_date == "2010");
+    assert (video.uploaded_by == "uploader1");
+    assert (video.price == "$1");
+    assert (video.date_uploaded == "2012-06-06T21:55:12.000Z");
+  }
+}
 
=== added file 'tests/unit/test-utils.vala'
--- tests/unit/test-utils.vala	1970-01-01 00:00:00 +0000
+++ tests/unit/test-utils.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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 static int main (string[] args)
+  {
+    Test.init (ref args);
+    Test.add_data_func ("/Utils/Gcd", test_gcd);
+    Test.add_data_func ("/Utils/IsRegularFile", test_is_regular_file);
+    Test.add_data_func ("/Utils/GetName", test_get_name);
+    Test.add_data_func ("/Utils/IsVideo", test_is_video);
+    Test.run ();
+    return 0;
+  }
+
+  internal static void test_gcd ()
+  {
+    assert (Utils.gcd (1, 1) == 1);
+    assert (Utils.gcd (2, 1) == 1);
+    assert (Utils.gcd (10, 2) == 2);
+    assert (Utils.gcd (2, 10) == 2);
+    assert (Utils.gcd (20, 15) == 5);
+  }
+
+  internal static void test_is_regular_file ()
+  {
+    assert (Utils.is_regular_file ("/etc/passwd") == true);
+    assert (Utils.is_regular_file ("/dev/null") == false);
+    assert (Utils.is_regular_file ("/non-existing-file") == false);
+  }
+
+ internal static void test_get_name ()
+ {
+   assert (Utils.get_name ("/etc/passwd") == "passwd");
+ }
+
+ internal static void test_is_video ()
+ {
+   var video_dir = Config.TESTDATADIR;
+
+   assert (Utils.is_video ("/etc/passwd") == false);
+   assert (Utils.is_video (@"$video_dir/video1.avi") == true);
+ }
+}
 \ No newline at end of file
 
=== added file 'tests/unit/thumbnailer-mock.vala'
--- tests/unit/thumbnailer-mock.vala	1970-01-01 00:00:00 +0000
+++ tests/unit/thumbnailer-mock.vala	2013-02-19 17:19:01 +0000
@@ -0,0 +1,29 @@
+/*
+ * 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 Thumbnailer
+  {
+    public string get_icon (string video_file)
+    {
+      return "mock-icon";
+    }
+  }
+}
 \ No newline at end of file
 
=== added directory 'vapi'
=== added file 'vapi/Makefile.am'
--- vapi/Makefile.am	1970-01-01 00:00:00 +0000
+++ vapi/Makefile.am	2013-02-19 17:19:01 +0000
@@ -0,0 +1,5 @@
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST = libsoup-gnome-2.4.vapi
+
 
=== added file 'vapi/libsoup-gnome-2.4.vapi'
--- vapi/libsoup-gnome-2.4.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libsoup-gnome-2.4.vapi	2013-02-19 17:19:01 +0000
@@ -0,0 +1,8 @@
+[CCode (cprefix = "Soup", gir_namespace = "SoupGNOME", gir_version = "2.4", lower_case_cprefix = "soup_")]
+namespace SoupGNOME {
+	[CCode (cheader_filename = "libsoup/soup-gnome.h", type_id = "soup_proxy_resolver_gnome_get_type ()")]
+	public class ProxyResolverGNOME : Soup.ProxyResolverDefault, Soup.ProxyURIResolver, Soup.SessionFeature {
+		[CCode (has_construct_function = false)]
+		protected ProxyResolverGNOME ();
+	}
+}