Merge lp:~jamesh/unity-scope-mediascanner/click-support into lp:unity-scope-mediascanner/rtm-14.09

[James Henstridge]

Reorganise package and update build rules to support building scopes as click packages. Also update icons to the latest versions from design.

Add support for building as click packages. Original merge proposal can be found here:

https://code.launchpad.net/~jamesh/unity-scope-mediascanner/click-support/+merge/237731

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-16 15:45:31 +0000
+++ CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -1,5 +1,8 @@
 project(unity-scope-mediascanner C CXX)
 cmake_minimum_required(VERSION 2.8.9)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+set(VERSION 0.3)
 
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
@@ -15,15 +18,10 @@
 
 find_program(XGETTEXT_BIN xgettext)
 find_program(MSGFMT_BIN msgfmt)
-find_program(INTLTOOL_EXTRACT_BIN intltool-extract)
-find_program(INTLTOOL_MERGE_BIN intltool-merge)
 
 if(NOT MSGFMT_BIN)
   message(FATAL_ERROR "Gettext binaries not found.")
 endif()
-if(NOT INTLTOOL_MERGE_BIN)
-  message(FATAL_ERROR "Intltool binaries not found.")
-endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wmissing-prototypes -pedantic -std=c99")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wmissing-declarations -pedantic -std=c++11")
@@ -34,6 +32,9 @@
 set(SOURCE_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/src")
 
 include(GNUInstallDirs)
+include(ClickBuild)
+include(ClickScope)
+include(Intltool)
 
 set(GETTEXT_PACKAGE unity-scope-mediascanner)
 
@@ -44,9 +45,14 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory("po")
-add_subdirectory("src")
-add_subdirectory("data")
+add_subdirectory("src/utils")
+add_subdirectory("src/musicaggregator")
+add_subdirectory("src/videoaggregator")
+add_subdirectory("src/mymusic")
+add_subdirectory("src/myvideos")
 
-enable_testing()
-add_subdirectory("tests")
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -V --output-on-failure)
+if(NOT CMAKE_CROSSCOMPILING)
+  enable_testing()
+  add_subdirectory("tests")
+  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -V --output-on-failure)
+endif()

=== added directory 'cmake'
=== added file 'cmake/ClickBuild.cmake'
--- cmake/ClickBuild.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ClickBuild.cmake	2014-10-30 09:54:03 +0000
@@ -0,0 +1,43 @@
+set(CLICK_MODE OFF CACHE BOOL "Whether to install in click mode")
+
+# Add top level target to build all click packages
+add_custom_target(click COMMENT Build click packages)
+find_program(click_bin click)
+
+# Determine the architecture for the Click package based on the compiler target.
+execute_process(
+  COMMAND ${CMAKE_C_COMPILER} -dumpmachine
+  OUTPUT_VARIABLE _cc_arch)
+set(_click_arch "unknown")
+if(${_cc_arch} MATCHES "^x86_64-.*")
+  set(_click_arch "amd64")
+elseif(${_cc_arch} MATCHES "^i.86-.*")
+  set(_click_arch "amd64")
+elseif(${_cc_arch} MATCHES "^arm-.*")
+  set(_click_arch "armhf")
+endif()
+set(CLICK_ARCH "${_click_arch}" CACHE STRING "Click package architecture")
+
+macro(click_build _pkg _version _manifest _apparmor)
+  set(_builddir ${CMAKE_INSTALL_PREFIX}/${_pkg})
+
+  add_custom_target(
+    ${_pkg}.click
+    COMMAND ${click_bin} build ${_builddir}
+    WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+  set_target_properties(${_pkg}.click PROPERTIES
+    OUTPUT_NAME ${_pkg}_${_version}_${CLICK_ARCH}.click
+    CLICK_DIR ${_builddir})
+  add_dependencies(click ${_pkg}.click)
+
+  install(
+    FILES ${_manifest}
+    DESTINATION "${_builddir}"
+    RENAME manifest.json
+    COMPONENT "${_pkg}")
+  install(
+    FILES ${_apparmor}
+    DESTINATION "${_builddir}"
+    RENAME apparmor.json
+    COMPONENT "${_pkg}")
+endmacro(click_build)

=== added file 'cmake/ClickScope.cmake'
--- cmake/ClickScope.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ClickScope.cmake	2014-10-30 09:54:03 +0000
@@ -0,0 +1,33 @@
+macro(click_scope _pkg _scopename _library _config)
+  set(_fullname ${_pkg}_${_scopename})
+  get_target_property(_builddir ${_pkg}.click CLICK_DIR)
+
+  set_target_properties(${_library} PROPERTIES
+    OUTPUT_NAME "${_fullname}")
+  install(
+    TARGETS ${_library}
+    DESTINATION "${_builddir}/${_scopename}"
+    COMPONENT "${_pkg}")
+  install(
+    FILES ${_config}
+    DESTINATION "${_builddir}/${_scopename}"
+    RENAME "${_fullname}.ini"
+    COMPONENT "${_pkg}")
+
+  if(${ARGC} EQUAL 5)
+    set(_settings ${ARGV4})
+    install(
+      FILES ${_settings}
+      DESTINATION "${_builddir}/${_scopename}"
+      RENAME "${_fullname}-settings.ini"
+      COMPONENT "${_pkg}")
+  endif()
+endmacro(click_scope)
+
+macro(click_scope_data _pkg _scopename)
+  get_target_property(_builddir ${_pkg}.click CLICK_DIR)
+  install(
+    FILES ${ARGN}
+    DESTINATION "${_builddir}/${_scopename}"
+    COMPONENT "${_pkg}")
+endmacro(click_scope_data)

=== added file 'cmake/Intltool.cmake'
--- cmake/Intltool.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Intltool.cmake	2014-10-30 09:54:03 +0000
@@ -0,0 +1,17 @@
+
+find_program(INTLTOOL_EXTRACT_BIN intltool-extract)
+find_program(INTLTOOL_MERGE_BIN intltool-merge)
+
+if(NOT INTLTOOL_MERGE_BIN)
+  message(FATAL_ERROR "Intltool binaries not found.")
+endif()
+
+add_custom_target(intltool-merge ALL)
+
+macro(intltool_merge _source _dest)
+  add_custom_target(
+    ${_dest}
+    COMMAND ${INTLTOOL_MERGE_BIN} -d ${CMAKE_SOURCE_DIR}/po ${_source} ${_dest}
+    DEPENDS ${_source})
+  add_dependencies(intltool-merge ${_dest})
+endmacro(intltool_merge)

=== modified file 'config.h.in'
--- config.h.in	2013-08-01 04:36:38 +0000
+++ config.h.in	2014-10-30 09:54:03 +0000
@@ -2,5 +2,8 @@
 #define _CONFIG_H
 
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+#cmakedefine CLICK_MODE
+
+#define LOCALE_DIR "@CMAKE_INSTALL_FULL_DATADIR@/locale"
 
 #endif

=== removed directory 'data'
=== removed file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-10-03 13:25:48 +0000
+++ data/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-
-# Unity Scope files
-set(SCOPES_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes")
-set(SCOPES_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes")
-
-set(SCOPE_CONFIG_FILES
-  mediascanner-music.ini
-  mediascanner-video.ini
-  musicaggregator.ini
-  musicaggregator-settings.ini
-  videoaggregator.ini
-  videoaggregator-settings.ini
-)
-
-foreach(configfile ${SCOPE_CONFIG_FILES})
-    configure_file(${configfile}.in.in ${configfile}.in)
-    get_filename_component(basename ${configfile} NAME_WE)
-    string(REPLACE "-settings" "" basename ${basename})
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${configfile}"
-            DESTINATION "${SCOPES_LIBDIR}/${basename}")
-    add_custom_command(OUTPUT ${configfile} COMMAND ${INTLTOOL_MERGE_BIN} -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${configfile}.in ${configfile})
-endforeach()
-
-add_custom_target(ini-i18n ALL DEPENDS ${SCOPE_CONFIG_FILES})
-
-install(
-  FILES music.png music-scope.png mediascanner-music-screenshot.jpg
-  DESTINATION "${SCOPES_DATADIR}/mediascanner-music"
-)
-
-install(
-  FILES video.png video-scope.png mediascanner-video-screenshot.jpg
-  DESTINATION "${SCOPES_DATADIR}/mediascanner-video"
-)
-
-install(
-  FILES musicaggregator-screenshot.jpg
-  DESTINATION "${SCOPES_DATADIR}/musicaggregator"
-)
-
-install(
-  FILES videoaggregator-screenshot.jpg
-  DESTINATION "${SCOPES_DATADIR}/videoaggregator"
-)
-
-install(
-  FILES paper-white-bg-v2.png
-  DESTINATION "${SCOPES_DATADIR}"
-)

=== removed file 'data/music.png'
Binary files data/music.png	2014-02-20 11:24:59 +0000 and data/music.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/video.png'
Binary files data/video.png	2014-02-20 11:24:59 +0000 and data/video.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-04-30 09:50:27 +0000
+++ po/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -1,7 +1,7 @@
-file(GLOB CPPFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-                   "${CMAKE_SOURCE_DIR}/src/*.cpp")
-file(GLOB INIFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-                   "${CMAKE_SOURCE_DIR}/data/*.ini.in.in")
+file(GLOB_RECURSE CPPFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                                    "${CMAKE_SOURCE_DIR}/src/*.cpp")
+file(GLOB_RECURSE INIFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                                    "${CMAKE_SOURCE_DIR}/src/*.ini.in")
 
 foreach(inifile ${INIFILES})
     get_filename_component(fname ${inifile} NAME)
@@ -29,9 +29,6 @@
     DEPENDS pot-ini
 )
 
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION share)
-
 file(GLOB pofiles *.po)
 foreach(f ${pofiles})
   get_filename_component(pofile ${f} NAME_WE)
@@ -44,8 +41,21 @@
   DEPENDS ${i}.po
   )
   add_custom_target(${i}gen ALL DEPENDS ${i}.mo)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${i}.mo 
-  DESTINATION share/locale/${i}/LC_MESSAGES
-  RENAME ${GETTEXT_PACKAGE}.mo)
+
+  if(CLICK_MODE)
+    foreach(clickpkg
+        com.ubuntu.scopes.mymusic
+        com.ubuntu.scopes.myvideos
+        com.ubuntu.scopes.music
+        com.ubuntu.scopes.video)
+      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${i}.mo
+        DESTINATION ${clickpkg}/locale/${i}/LC_MESSAGES
+        RENAME ${GETTEXT_PACKAGE}.mo)
+    endforeach()
+  else()
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${i}.mo
+      DESTINATION share/locale/${i}/LC_MESSAGES
+      RENAME ${GETTEXT_PACKAGE}.mo)
+  endif(CLICK_MODE)
 endforeach()
 

=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-09-16 15:45:31 +0000
+++ src/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-set(SCOPE_SOURCES
-  main.cpp
-  base-scope.cpp
-  music-scope.cpp
-  video-scope.cpp
-)
-
-include_directories(${UNITY_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
-add_library(mediascanner-music MODULE music-scope.cpp)
-#set_target_properties(mediascanner-music PROPERTIES PREFIX "")
-target_link_libraries(mediascanner-music ${UNITY_LDFLAGS}
-        ${GIO_DEPS_LDFLAGS}
-)
-
-add_library(mediascanner-video MODULE video-scope.cpp)
-#set_target_properties(mediascanner-video PROPERTIES PREFIX "")
-target_link_libraries(mediascanner-video ${UNITY_LDFLAGS} ${Boost_LIBRARIES})
-
-add_library(musicaggregator SHARED
-musicaggregatorscope.cpp
-musicaggregatorquery.cpp
-resultforwarder.cpp
-onlinemusicresultforwarder.cpp
-bufferedresultforwarder.cpp
-notify-strategy.cpp)
-target_link_libraries(musicaggregator ${UNITY_SCOPES_LDFLAGS})
-
-add_library(videoaggregator SHARED
-videoaggregatorscope.cpp
-videoaggregatorquery.cpp
-resultforwarder.cpp
-bufferedresultforwarder.cpp
-notify-strategy.cpp)
-target_link_libraries(videoaggregator ${UNITY_SCOPES_LDFLAGS})
-
-install(
-  TARGETS mediascanner-music
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/mediascanner-music")
-
-install(
-  TARGETS mediascanner-video
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/mediascanner-video")
-
-install(TARGETS musicaggregator
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/musicaggregator")
-
-  install(TARGETS videoaggregator
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/unity-scopes/videoaggregator")
-  

=== added directory 'src/musicaggregator'
=== added file 'src/musicaggregator/CMakeLists.txt'
--- src/musicaggregator/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/musicaggregator/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -0,0 +1,39 @@
+include_directories(${UNITY_INCLUDE_DIRS})
+
+add_library(musicaggregator MODULE
+  musicaggregatorscope.cpp
+  musicaggregatorquery.cpp
+  onlinemusicresultforwarder.cpp)
+target_link_libraries(musicaggregator scope-utils ${UNITY_SCOPES_LDFLAGS})
+
+configure_file(manifest.json.in manifest.json)
+intltool_merge(${CMAKE_CURRENT_SOURCE_DIR}/musicaggregator.ini.in musicaggregator.ini)
+intltool_merge(${CMAKE_CURRENT_SOURCE_DIR}/musicaggregator-settings.ini.in musicaggregator-settings.ini)
+
+if(CLICK_MODE)
+  click_build(com.ubuntu.scopes.music ${VERSION}
+    ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json)
+  click_scope(com.ubuntu.scopes.music musicaggregator
+    musicaggregator
+    ${CMAKE_CURRENT_BINARY_DIR}/musicaggregator.ini
+    ${CMAKE_CURRENT_BINARY_DIR}/musicaggregator-settings.ini)
+  click_scope_data(com.ubuntu.scopes.music musicaggregator
+    screenshot.jpg
+    icon.png
+    paper-white-bg-v2.png
+    )
+else()
+  set(scopedir "${CMAKE_INSTALL_LIBDIR}/unity-scopes/musicaggregator")
+  install(
+    TARGETS musicaggregator
+    LIBRARY DESTINATION "${scopedir}")
+  install(
+    FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/musicaggregator.ini
+      ${CMAKE_CURRENT_BINARY_DIR}/musicaggregator-settings.ini
+      screenshot.jpg
+      icon.png
+      paper-white-bg-v2.png
+    DESTINATION "${scopedir}")
+endif(CLICK_MODE)
+

=== added file 'src/musicaggregator/apparmor.json'
--- src/musicaggregator/apparmor.json	1970-01-01 00:00:00 +0000
+++ src/musicaggregator/apparmor.json	2014-10-30 09:54:03 +0000
@@ -0,0 +1,5 @@
+{
+    "template": "unconfined",
+    "policy_groups": [],
+    "policy_version": 1.2
+}

=== added file 'src/musicaggregator/icon.png'
Binary files src/musicaggregator/icon.png	1970-01-01 00:00:00 +0000 and src/musicaggregator/icon.png	2014-10-30 09:54:03 +0000 differ
=== added file 'src/musicaggregator/manifest.json.in'
--- src/musicaggregator/manifest.json.in	1970-01-01 00:00:00 +0000
+++ src/musicaggregator/manifest.json.in	2014-10-30 09:54:03 +0000
@@ -0,0 +1,16 @@
+{
+    "description": "Music scope",
+    "framework": "ubuntu-sdk-14.10-dev2",
+    "architecture": "@CLICK_ARCH@",
+    "hooks": {
+        "musicaggregator": {
+            "scope": "musicaggregator",
+            "apparmor": "apparmor.json"
+        }
+    },
+    "icon": "musicaggregator/icon.png",
+    "maintainer": "Ubuntu Developers <[e-mail]>",
+    "name": "com.ubuntu.scopes.music",
+    "title": "Music scope",
+    "version": "@VERSION@"
+}

=== renamed file 'data/musicaggregator-settings.ini.in.in' => 'src/musicaggregator/musicaggregator-settings.ini.in'
=== renamed file 'data/musicaggregator.ini.in.in' => 'src/musicaggregator/musicaggregator.ini.in'
--- data/musicaggregator.ini.in.in	2014-10-07 15:13:12 +0000
+++ src/musicaggregator/musicaggregator.ini.in	2014-10-30 09:54:03 +0000
@@ -2,16 +2,12 @@
 _DisplayName=Music
 _Description=This is an Ubuntu search plugin that merges all music sources into one.
 Author=Canonical Ltd.
-Art=@SCOPES_DATADIR@/musicaggregator/musicaggregator-screenshot.jpg
-Icon=@SCOPES_DATADIR@/mediascanner-music/music-scope.png
+Art=./screenshot.jpg
+Icon=./icon.png
 _SearchHint=Search music
 HotKey=
 LocationDataNeeded=true
 
 [Appearance]
 LogoOverlayColor=#26000000
-PageHeader.Background=@SCOPES_DATADIR@/paper-white-bg-v2.png
-
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-scope-musicaggregator
-
+PageHeader.Background=./paper-white-bg-v2.png

=== renamed file 'src/musicaggregatorquery.cpp' => 'src/musicaggregator/musicaggregatorquery.cpp'
--- src/musicaggregatorquery.cpp	2014-10-07 10:42:31 +0000
+++ src/musicaggregator/musicaggregatorquery.cpp	2014-10-30 09:54:03 +0000
@@ -21,10 +21,10 @@
 #include <config.h>
 #include "musicaggregatorquery.h"
 #include "musicaggregatorscope.h"
-#include "resultforwarder.h"
+#include "../utils/resultforwarder.h"
 #include "onlinemusicresultforwarder.h"
-#include "notify-strategy.h"
-#include "i18n.h"
+#include "../utils/notify-strategy.h"
+#include "../utils/i18n.h"
 #include <memory>
 
 #include <unity/scopes/Annotation.h>

=== renamed file 'src/musicaggregatorquery.h' => 'src/musicaggregator/musicaggregatorquery.h'
=== renamed file 'src/musicaggregatorscope.cpp' => 'src/musicaggregator/musicaggregatorscope.cpp'
--- src/musicaggregatorscope.cpp	2014-09-15 07:26:58 +0000
+++ src/musicaggregator/musicaggregatorscope.cpp	2014-10-30 09:54:03 +0000
@@ -17,6 +17,7 @@
  *
  */
 
+#include <config.h>
 #include "musicaggregatorscope.h"
 #include "musicaggregatorquery.h"
 #include <unity/scopes/Registry.h>
@@ -24,17 +25,22 @@
 #include <unity/scopes/CategoryRenderer.h>
 #include <vector>
 #include <iostream>
+#include "../utils/i18n.h"
 
 using namespace unity::scopes;
 
+#ifdef CLICK_MODE
+const std::string MusicAggregatorScope::LOCALSCOPE = "com.ubuntu.scopes.mymusic_mymusic";
+#else
 const std::string MusicAggregatorScope::LOCALSCOPE = "mediascanner-music";
+#endif
 const std::string MusicAggregatorScope::GROOVESHARKSCOPE = "com.canonical.scopes.grooveshark";
 const std::string MusicAggregatorScope::SEVENDIGITAL = "com.canonical.scopes.sevendigital";
 const std::string MusicAggregatorScope::SOUNDCLOUD = "com.canonical.scopes.soundcloud";
 const std::string MusicAggregatorScope::SONGKICK = "com.canonical.scopes.songkick_songkick";
 
 void MusicAggregatorScope::start(std::string const&) {
-    setlocale(LC_ALL, "");
+    init_gettext(*this);
     CategoryRenderer basic;
     local_scope = registry()->get_metadata(LOCALSCOPE).proxy();
 }

=== renamed file 'src/musicaggregatorscope.h' => 'src/musicaggregator/musicaggregatorscope.h'
=== renamed file 'src/onlinemusicresultforwarder.cpp' => 'src/musicaggregator/onlinemusicresultforwarder.cpp'
=== renamed file 'src/onlinemusicresultforwarder.h' => 'src/musicaggregator/onlinemusicresultforwarder.h'
--- src/onlinemusicresultforwarder.h	2014-07-30 13:50:55 +0000
+++ src/musicaggregator/onlinemusicresultforwarder.h	2014-10-30 09:54:03 +0000
@@ -20,7 +20,7 @@
 #ifndef ONLINEMUSICRESULTFORWARDER_H 
 #define ONLINEMUSICRESULTFORWARDER_H
 
-#include "bufferedresultforwarder.h"
+#include "../utils/bufferedresultforwarder.h"
 
 /*
    ResultForwarder that buffers results up until it gets

=== renamed file 'data/paper-white-bg-v2.png' => 'src/musicaggregator/paper-white-bg-v2.png'
=== renamed file 'data/musicaggregator-screenshot.jpg' => 'src/musicaggregator/screenshot.jpg'
Binary files data/musicaggregator-screenshot.jpg	2014-02-20 11:59:22 +0000 and src/musicaggregator/screenshot.jpg	2014-10-30 09:54:03 +0000 differ
=== added directory 'src/mymusic'
=== added file 'src/mymusic/CMakeLists.txt'
--- src/mymusic/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/mymusic/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -0,0 +1,29 @@
+include_directories(${UNITY_INCLUDE_DIRS})
+
+add_library(mediascanner-music MODULE music-scope.cpp)
+#set_target_properties(mediascanner-music PROPERTIES PREFIX "")
+target_link_libraries(mediascanner-music scope-utils ${UNITY_LDFLAGS} ${GIO_DEPS_LDFLAGS})
+
+configure_file(manifest.json.in manifest.json)
+intltool_merge(${CMAKE_CURRENT_SOURCE_DIR}/mediascanner-music.ini.in mediascanner-music.ini)
+
+if(CLICK_MODE)
+  click_build(com.ubuntu.scopes.mymusic ${VERSION}
+    ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json)
+  click_scope(com.ubuntu.scopes.mymusic mymusic
+    mediascanner-music ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-music.ini)
+  click_scope_data(com.ubuntu.scopes.mymusic mymusic
+    screenshot.jpg
+    icon.png)
+else()
+  set(scopedir "${CMAKE_INSTALL_LIBDIR}/unity-scopes/mediascanner-music")
+  install(
+    TARGETS mediascanner-music
+    LIBRARY DESTINATION "${scopedir}")
+  install(
+    FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-music.ini
+      screenshot.jpg
+      icon.png
+    DESTINATION "${scopedir}")
+endif(CLICK_MODE)

=== added file 'src/mymusic/apparmor.json'
--- src/mymusic/apparmor.json	1970-01-01 00:00:00 +0000
+++ src/mymusic/apparmor.json	2014-10-30 09:54:03 +0000
@@ -0,0 +1,5 @@
+{
+    "template": "unconfined",
+    "policy_groups": [],
+    "policy_version": 1.2
+}

=== renamed file 'data/music-scope.png' => 'src/mymusic/icon.png'
=== added file 'src/mymusic/manifest.json.in'
--- src/mymusic/manifest.json.in	1970-01-01 00:00:00 +0000
+++ src/mymusic/manifest.json.in	2014-10-30 09:54:03 +0000
@@ -0,0 +1,16 @@
+{
+    "description": "My Music scope",
+    "framework": "ubuntu-sdk-14.10-dev2",
+    "architecture": "@CLICK_ARCH@",
+    "hooks": {
+        "mymusic": {
+            "scope": "mymusic",
+            "apparmor": "apparmor.json"
+        }
+    },
+    "icon": "mymusic/icon.png",
+    "maintainer": "Ubuntu Developers <[e-mail]>",
+    "name": "com.ubuntu.scopes.mymusic",
+    "title": "My Music scope",
+    "version": "@VERSION@"
+}

=== renamed file 'data/mediascanner-music.ini.in.in' => 'src/mymusic/mediascanner-music.ini.in'
--- data/mediascanner-music.ini.in.in	2014-08-07 13:32:30 +0000
+++ src/mymusic/mediascanner-music.ini.in	2014-10-30 09:54:03 +0000
@@ -2,14 +2,10 @@
 _DisplayName=My Music
 _Description=This is an Ubuntu search plugin that scans the device for music and allows it to be searched and displayed in the Dash.
 Author=Canonical Ltd.
-Art=@SCOPES_DATADIR@/mediascanner-music/mediascanner-music-screenshot.jpg
-Icon=@SCOPES_DATADIR@/mediascanner-music/music-scope.png
+Art=./screenshot.jpg
+Icon=./icon.png
 _SearchHint=Search local music collection
-HotKey=
 
 [Appearance]
 LogoOverlayColor=#26000000
 
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-scope-mediascanner
-

=== renamed file 'src/music-scope.cpp' => 'src/mymusic/music-scope.cpp'
--- src/music-scope.cpp	2014-09-16 15:40:24 +0000
+++ src/mymusic/music-scope.cpp	2014-10-30 09:54:03 +0000
@@ -36,7 +36,7 @@
 #include <unity/scopes/VariantBuilder.h>
 
 #include "music-scope.h"
-#include "i18n.h"
+#include "../utils/i18n.h"
 
 #define MAX_RESULTS 100
 #define MAX_GENRES 100
@@ -133,7 +133,7 @@
 namespace json = Json;
 
 void MusicScope::start(std::string const&) {
-    setlocale(LC_ALL, "");
+    init_gettext(*this);
     store.reset(new MediaStore(MS_READ_ONLY));
     client = http::make_client();
     set_api_key();

=== renamed file 'src/music-scope.h' => 'src/mymusic/music-scope.h'
=== renamed file 'data/mediascanner-music-screenshot.jpg' => 'src/mymusic/screenshot.jpg'
Binary files data/mediascanner-music-screenshot.jpg	2014-02-20 11:59:22 +0000 and src/mymusic/screenshot.jpg	2014-10-30 09:54:03 +0000 differ
=== added directory 'src/myvideos'
=== added file 'src/myvideos/CMakeLists.txt'
--- src/myvideos/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/myvideos/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -0,0 +1,29 @@
+include_directories(${UNITY_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+
+add_library(mediascanner-video MODULE video-scope.cpp)
+#set_target_properties(mediascanner-video PROPERTIES PREFIX "")
+target_link_libraries(mediascanner-video scope-utils ${UNITY_LDFLAGS} ${Boost_LIBRARIES})
+
+configure_file(manifest.json.in manifest.json)
+intltool_merge(${CMAKE_CURRENT_SOURCE_DIR}/mediascanner-video.ini.in mediascanner-video.ini)
+
+if(CLICK_MODE)
+  click_build(com.ubuntu.scopes.myvideos ${VERSION}
+    ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json)
+  click_scope(com.ubuntu.scopes.myvideos myvideos
+    mediascanner-video ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-video.ini)
+  click_scope_data(com.ubuntu.scopes.myvideos myvideos
+    screenshot.jpg
+    icon.png)
+else()
+  set(scopedir "${CMAKE_INSTALL_LIBDIR}/unity-scopes/mediascanner-video")
+  install(
+    TARGETS mediascanner-video
+    LIBRARY DESTINATION "${scopedir}")
+  install(
+    FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-video.ini
+      screenshot.jpg
+      icon.png
+    DESTINATION "${scopedir}")
+endif(CLICK_MODE)

=== added file 'src/myvideos/apparmor.json'
--- src/myvideos/apparmor.json	1970-01-01 00:00:00 +0000
+++ src/myvideos/apparmor.json	2014-10-30 09:54:03 +0000
@@ -0,0 +1,5 @@
+{
+    "template": "unconfined",
+    "policy_groups": [],
+    "policy_version": 1.2
+}

=== added file 'src/myvideos/icon.png'
Binary files src/myvideos/icon.png	1970-01-01 00:00:00 +0000 and src/myvideos/icon.png	2014-10-30 09:54:03 +0000 differ
=== added file 'src/myvideos/manifest.json.in'
--- src/myvideos/manifest.json.in	1970-01-01 00:00:00 +0000
+++ src/myvideos/manifest.json.in	2014-10-30 09:54:03 +0000
@@ -0,0 +1,16 @@
+{
+    "description": "My Videos scope",
+    "framework": "ubuntu-sdk-14.10-dev2",
+    "architecture": "@CLICK_ARCH@",
+    "hooks": {
+        "mymusic": {
+            "scope": "myvideos",
+            "apparmor": "apparmor.json"
+        }
+    },
+    "icon": "myvideos/icon.png",
+    "maintainer": "Ubuntu Developers <[e-mail]>",
+    "name": "com.ubuntu.scopes.myvideos",
+    "title": "My Videos scope",
+    "version": "@VERSION@"
+}

=== renamed file 'data/mediascanner-video.ini.in.in' => 'src/myvideos/mediascanner-video.ini.in'
--- data/mediascanner-video.ini.in.in	2014-08-07 13:32:30 +0000
+++ src/myvideos/mediascanner-video.ini.in	2014-10-30 09:54:03 +0000
@@ -2,13 +2,10 @@
 _DisplayName=My Videos
 _Description=This is an Ubuntu search plugin that scans the device for videos and allows them to be searched and displayed in the Dash.
 Author=Canonical Ltd.
-Art=@SCOPES_DATADIR@/mediascanner-video/mediascanner-video-screenshot.jpg
-Icon=@SCOPES_DATADIR@/mediascanner-video/video-scope.png
+Art=./screenshot.jpg
+Icon=./icon.png
 _SearchHint=
 HotKey=
 
 [Appearance]
 LogoOverlayColor=#26000000
-
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-scope-hollywood

=== renamed file 'data/mediascanner-video-screenshot.jpg' => 'src/myvideos/screenshot.jpg'
Binary files data/mediascanner-video-screenshot.jpg	2014-02-20 11:59:22 +0000 and src/myvideos/screenshot.jpg	2014-10-30 09:54:03 +0000 differ
=== renamed file 'src/video-scope.cpp' => 'src/myvideos/video-scope.cpp'
--- src/video-scope.cpp	2014-10-09 14:19:51 +0000
+++ src/myvideos/video-scope.cpp	2014-10-30 09:54:03 +0000
@@ -32,7 +32,7 @@
 #include <unity/scopes/VariantBuilder.h>
 
 #include "video-scope.h"
-#include "i18n.h"
+#include "../utils/i18n.h"
 
 #define MAX_RESULTS 100
 
@@ -101,7 +101,7 @@
 };
 
 void VideoScope::start(std::string const&) {
-    setlocale(LC_ALL, "");
+    init_gettext(*this);
     store.reset(new MediaStore(MS_READ_ONLY));
 }
 

=== renamed file 'src/video-scope.h' => 'src/myvideos/video-scope.h'
=== added directory 'src/utils'
=== added file 'src/utils/CMakeLists.txt'
--- src/utils/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/utils/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -0,0 +1,11 @@
+include_directories(${UNITY_INCLUDE_DIRS})
+
+add_definitions(-fPIC)
+
+add_library(scope-utils STATIC
+  resultforwarder.cpp
+  bufferedresultforwarder.cpp
+  notify-strategy.cpp
+  i18n.cpp)
+
+target_link_libraries(scope-utils ${UNITY_SCOPES_LDFLAGS})

=== renamed file 'src/bufferedresultforwarder.cpp' => 'src/utils/bufferedresultforwarder.cpp'
=== renamed file 'src/bufferedresultforwarder.h' => 'src/utils/bufferedresultforwarder.h'
=== added file 'src/utils/i18n.cpp'
--- src/utils/i18n.cpp	1970-01-01 00:00:00 +0000
+++ src/utils/i18n.cpp	2014-10-30 09:54:03 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+#include <config.h>
+#include "i18n.h"
+#include <unity/scopes/ScopeBase.h>
+
+using unity::scopes::ScopeBase;
+
+void init_gettext(const ScopeBase &scope) {
+    setlocale(LC_ALL, "");
+
+#ifdef CLICK_MODE
+    std::string locale_dir = scope.scope_directory() + "/../locale";
+    bindtextdomain(GETTEXT_PACKAGE, locale_dir.c_str());
+#else
+    bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+#endif
+}

=== renamed file 'src/i18n.h' => 'src/utils/i18n.h'
--- src/i18n.h	2014-04-25 17:35:42 +0000
+++ src/utils/i18n.h	2014-10-30 09:54:03 +0000
@@ -21,4 +21,12 @@
 
 #define _(value) dgettext(GETTEXT_PACKAGE, value)
 
+namespace unity {
+namespace scopes {
+class ScopeBase;
+}
+}
+
+void init_gettext(const unity::scopes::ScopeBase &scope);
+
 #endif

=== renamed file 'src/notify-strategy.cpp' => 'src/utils/notify-strategy.cpp'
=== renamed file 'src/notify-strategy.h' => 'src/utils/notify-strategy.h'
=== renamed file 'src/resultforwarder.cpp' => 'src/utils/resultforwarder.cpp'
=== renamed file 'src/resultforwarder.h' => 'src/utils/resultforwarder.h'
=== added directory 'src/videoaggregator'
=== added file 'src/videoaggregator/CMakeLists.txt'
--- src/videoaggregator/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/videoaggregator/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -0,0 +1,37 @@
+include_directories(${UNITY_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+
+add_library(videoaggregator MODULE
+  videoaggregatorscope.cpp
+  videoaggregatorquery.cpp)
+target_link_libraries(videoaggregator scope-utils ${UNITY_SCOPES_LDFLAGS})
+
+configure_file(manifest.json.in manifest.json)
+intltool_merge(${CMAKE_CURRENT_SOURCE_DIR}/videoaggregator.ini.in videoaggregator.ini)
+intltool_merge(${CMAKE_CURRENT_SOURCE_DIR}/videoaggregator-settings.ini.in videoaggregator-settings.ini)
+
+if(CLICK_MODE)
+  click_build(com.ubuntu.scopes.video ${VERSION}
+    ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json)
+  click_scope(com.ubuntu.scopes.video videoaggregator
+    videoaggregator
+    ${CMAKE_CURRENT_BINARY_DIR}/videoaggregator.ini
+    ${CMAKE_CURRENT_BINARY_DIR}/videoaggregator-settings.ini)
+  click_scope_data(com.ubuntu.scopes.video videoaggregator
+    screenshot.jpg
+    icon.png
+    paper-white-bg-v2.png
+    )
+else()
+  set(scopedir "${CMAKE_INSTALL_LIBDIR}/unity-scopes/videoaggregator")
+  install(
+    TARGETS videoaggregator
+    LIBRARY DESTINATION "${scopedir}")
+  install(
+    FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/videoaggregator.ini
+      ${CMAKE_CURRENT_BINARY_DIR}/videoaggregator-settings.ini
+      screenshot.jpg
+      icon.png
+      paper-white-bg-v2.png
+    DESTINATION "${scopedir}")
+endif(CLICK_MODE)

=== added file 'src/videoaggregator/apparmor.json'
--- src/videoaggregator/apparmor.json	1970-01-01 00:00:00 +0000
+++ src/videoaggregator/apparmor.json	2014-10-30 09:54:03 +0000
@@ -0,0 +1,5 @@
+{
+    "template": "unconfined",
+    "policy_groups": [],
+    "policy_version": 1.2
+}

=== renamed file 'data/video-scope.png' => 'src/videoaggregator/icon.png'
Binary files data/video-scope.png	2014-08-07 09:54:06 +0000 and src/videoaggregator/icon.png	2014-10-30 09:54:03 +0000 differ
=== added file 'src/videoaggregator/manifest.json.in'
--- src/videoaggregator/manifest.json.in	1970-01-01 00:00:00 +0000
+++ src/videoaggregator/manifest.json.in	2014-10-30 09:54:03 +0000
@@ -0,0 +1,16 @@
+{
+    "description": "Music scope",
+    "framework": "ubuntu-sdk-14.10-dev2",
+    "architecture": "@CLICK_ARCH@",
+    "hooks": {
+        "videoaggregator": {
+            "scope": "videoaggregator",
+            "apparmor": "apparmor.json"
+        }
+    },
+    "icon": "videoaggregator/icon.png",
+    "maintainer": "Ubuntu Developers <[e-mail]>",
+    "name": "com.ubuntu.scopes.video",
+    "title": "Video scope",
+    "version": "@VERSION@"
+}

=== added file 'src/videoaggregator/paper-white-bg-v2.png'
Binary files src/videoaggregator/paper-white-bg-v2.png	1970-01-01 00:00:00 +0000 and src/videoaggregator/paper-white-bg-v2.png	2014-10-30 09:54:03 +0000 differ
=== renamed file 'data/videoaggregator-screenshot.jpg' => 'src/videoaggregator/screenshot.jpg'
Binary files data/videoaggregator-screenshot.jpg	2014-02-20 11:59:22 +0000 and src/videoaggregator/screenshot.jpg	2014-10-30 09:54:03 +0000 differ
=== renamed file 'data/videoaggregator-settings.ini.in.in' => 'src/videoaggregator/videoaggregator-settings.ini.in'
=== renamed file 'data/videoaggregator.ini.in.in' => 'src/videoaggregator/videoaggregator.ini.in'
--- data/videoaggregator.ini.in.in	2014-10-03 13:25:48 +0000
+++ src/videoaggregator/videoaggregator.ini.in	2014-10-30 09:54:03 +0000
@@ -2,15 +2,12 @@
 _DisplayName=Video
 _Description=This is an Ubuntu search plugin that merges all video sources into one.
 Author=Canonical Ltd.
-Art=@SCOPES_DATADIR@/videoaggregator/videoaggregator-screenshot.jpg
-Icon=@SCOPES_DATADIR@/mediascanner-video/video-scope.png
+Art=./screenshot.jpg
+Icon=./icon.png
 _SearchHint=Search video
 HotKey=
 
 [Appearance]
 LogoOverlayColor=#26000000
-PageHeader.Background=@SCOPES_DATADIR@/paper-white-bg-v2.png
-
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-scope-videoaggregator
+PageHeader.Background=./paper-white-bg-v2.png
 

=== renamed file 'src/videoaggregatorquery.cpp' => 'src/videoaggregator/videoaggregatorquery.cpp'
--- src/videoaggregatorquery.cpp	2014-07-31 13:16:12 +0000
+++ src/videoaggregator/videoaggregatorquery.cpp	2014-10-30 09:54:03 +0000
@@ -28,10 +28,10 @@
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/SearchReply.h>
 
-#include "i18n.h"
+#include "../utils/i18n.h"
 #include "videoaggregatorquery.h"
-#include "resultforwarder.h"
-#include "bufferedresultforwarder.h"
+#include "../utils/resultforwarder.h"
+#include "../utils/bufferedresultforwarder.h"
 
 using namespace unity::scopes;
 

=== renamed file 'src/videoaggregatorquery.h' => 'src/videoaggregator/videoaggregatorquery.h'
=== renamed file 'src/videoaggregatorscope.cpp' => 'src/videoaggregator/videoaggregatorscope.cpp'
--- src/videoaggregatorscope.cpp	2014-08-01 14:46:26 +0000
+++ src/videoaggregator/videoaggregatorscope.cpp	2014-10-30 09:54:03 +0000
@@ -17,22 +17,28 @@
  *
  */
 
+#include <config.h>
 #include "videoaggregatorscope.h"
 #include "videoaggregatorquery.h"
 #include <unity/scopes/Registry.h>
 #include <unity/scopes/Category.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <iostream>
+#include "../utils/i18n.h"
 
 using namespace unity::scopes;
 
 const std::vector<const char*> SUBSCOPE_NAMES{
+#ifdef CLICK_MODE
+    "com.ubuntu.scopes.myvideos_myvideos",
+#else
     "mediascanner-video",
+#endif
     "com.ubuntu.scopes.youtube_youtube",
 };
 
 void VideoAggregatorScope::start(std::string const&) {
-    setlocale(LC_ALL, "");
+    init_gettext(*this);
     find_subscopes(true);
 }
 

=== renamed file 'src/videoaggregatorscope.h' => 'src/videoaggregator/videoaggregatorscope.h'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-09-16 15:45:31 +0000
+++ tests/CMakeLists.txt	2014-10-30 09:54:03 +0000
@@ -13,22 +13,22 @@
 
 add_executable(test-music-scope
   test-music-scope.cpp
-  ../src/music-scope.cpp
+  ../src/mymusic/music-scope.cpp
 )
-target_link_libraries(test-music-scope ${UNITY_LDFLAGS} ${gtest_libs} ${GIO_DEPS_LDFLAGS})
+target_link_libraries(test-music-scope
+  scope-utils ${UNITY_LDFLAGS} ${gtest_libs} ${GIO_DEPS_LDFLAGS})
 add_test(test-music-scope test-music-scope)
 
 add_executable(test-video-scope
   test-video-scope.cpp
-  ../src/video-scope.cpp
+  ../src/myvideos/video-scope.cpp
 )
-target_link_libraries(test-video-scope ${UNITY_LDFLAGS} ${gtest_libs} ${Boost_LIBRARIES})
+target_link_libraries(test-video-scope
+  scope-utils ${UNITY_LDFLAGS} ${gtest_libs} ${Boost_LIBRARIES})
 add_test(test-video-scope test-video-scope)
 
 add_executable(test-result-forwarder
-                test-result-forwarder.cpp
-                ../src/notify-strategy.cpp
-                ../src/resultforwarder.cpp
-                ../src/bufferedresultforwarder.cpp)
-target_link_libraries(test-result-forwarder ${UNITY_LDFLAGS} ${gtest_libs})
+  test-result-forwarder.cpp)
+target_link_libraries(test-result-forwarder
+  scope-utils ${UNITY_LDFLAGS} ${gtest_libs})
 add_test(test-result-forwarder test-result-forwarder)

=== modified file 'tests/test-music-scope.cpp'
--- tests/test-music-scope.cpp	2014-09-10 07:33:32 +0000
+++ tests/test-music-scope.cpp	2014-10-30 09:54:03 +0000
@@ -14,7 +14,7 @@
 #include <unity/scopes/testing/Result.h>
 #include <unity/scopes/testing/TypedScopeFixture.h>
 
-#include "../src/music-scope.h"
+#include "../src/mymusic/music-scope.h"
 
 using namespace mediascanner;
 using namespace unity::scopes;
@@ -37,6 +37,7 @@
         ASSERT_EQ(0, setenv("MEDIASCANNER_CACHEDIR", cachedir.c_str(), 1));
         store.reset(new MediaStore(MS_READ_WRITE));
 
+        set_scope_directory("/no/such/directory");
         unity::scopes::testing::TypedScopeFixture<MusicScope>::SetUp();
     }
 

=== modified file 'tests/test-result-forwarder.cpp'
--- tests/test-result-forwarder.cpp	2014-07-30 13:50:55 +0000
+++ tests/test-result-forwarder.cpp	2014-10-30 09:54:03 +0000
@@ -20,9 +20,9 @@
 #include <gtest/gtest.h>
 #include <unity/scopes/testing/MockSearchReply.h>
 #include <unity/scopes/testing/Category.h>
-#include "../src/bufferedresultforwarder.h"
-#include "../src/resultforwarder.h"
-#include "../src/notify-strategy.h"
+#include "../src/utils/bufferedresultforwarder.h"
+#include "../src/utils/resultforwarder.h"
+#include "../src/utils/notify-strategy.h"
 
 using namespace unity::scopes;
 using ::testing::Truly;

=== modified file 'tests/test-video-scope.cpp'
--- tests/test-video-scope.cpp	2014-09-17 10:31:46 +0000
+++ tests/test-video-scope.cpp	2014-10-30 09:54:03 +0000
@@ -14,7 +14,7 @@
 #include <unity/scopes/testing/Result.h>
 #include <unity/scopes/testing/TypedScopeFixture.h>
 
-#include "../src/video-scope.h"
+#include "../src/myvideos/video-scope.h"
 
 using namespace mediascanner;
 using namespace unity::scopes;
@@ -37,6 +37,7 @@
         ASSERT_EQ(0, setenv("MEDIASCANNER_CACHEDIR", cachedir.c_str(), 1));
         store.reset(new MediaStore(MS_READ_WRITE));
 
+        set_scope_directory("/no/such/directory");
         unity::scopes::testing::TypedScopeFixture<VideoScope>::SetUp();
     }