Merge lp:~ken-vandine/content-hub/noclick into lp:content-hub

[Ken VanDine]

* Removed the click hook and check for registered peers on service startup
* Removed click usage in the helper and dropped the depends
* Added QFileWatcher to watch for peers to be installed/removed

* Removed the click hook and check for registered peers on service startup
* Removed click usage in the helper and dropped the depends
* Added QFileWatcher to watch for peers to be installed/removed

[lp:~ken-vandine/content-hub/noclick]

328. By Ken VanDine on 2017-03-08

Removed some debugging

329. By Ken VanDine on 2017-03-08

Rename the Hook class to RegistryUpdater

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:329
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2308/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2307
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2128/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2128/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2128
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2128/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2128
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2128/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2128/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2128/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/content-hub/noclick]

330. By Ken VanDine on 2017-03-15

merged trunk

331. By Ken VanDine on 2017-03-15

removed unused filed

332. By Ken VanDine on 2017-03-15

Added /var/cache/content-hub/peers/ to the list of directories watched for peers. The snap interface hook will install them there.

333. By Ken VanDine on 2017-03-15

Install an empty dir for the snap interface hook to install peers.

334. By Ken VanDine on 2017-03-15

updated copyright years

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:330
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2313/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2312
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2134/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2134/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2134/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2134
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2134/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2134/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2134/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:334
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2314/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2313
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2135/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2135/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2135/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2135/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2135/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-16 12:08:29 +0000
+++ CMakeLists.txt	2017-03-15 13:33:04 +0000
@@ -72,7 +72,6 @@
 pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER REQUIRED ubuntu-download-manager-client)
 pkg_check_modules(NOTIFY REQUIRED libnotify)
 pkg_check_modules(MIRCLIENT REQUIRED mirclient)
-pkg_check_modules(CLICK REQUIRED click-0.4)
 pkg_check_modules(APPARMOR REQUIRED libapparmor)
 
 add_definitions(-DDEBUG_ENABLED)
 
=== modified file 'debian/content-hub.install'
--- debian/content-hub.install	2016-12-08 12:11:27 +0000
+++ debian/content-hub.install	2017-03-15 13:33:04 +0000
@@ -2,10 +2,8 @@
 usr/bin/content-hub-peer-picker
 usr/bin/content-hub-send
 usr/bin/content-hub-service
-usr/lib/*/content-hub
 usr/lib/*/ubuntu-app-launch
 usr/lib/systemd/user
-usr/share/click/hooks
 usr/share/dbus-1
 usr/share/glib-2.0/schemas
 usr/share/locale/*/LC_MESSAGES/content-hub.mo
@@ -14,5 +12,6 @@
 usr/share/applications/content-hub-peer-picker.desktop
 usr/share/url-dispatcher/urls/content-hub-send.url-dispatcher
 usr/share/content-hub/icons
+var/cache/content-hub/peers
 debian/apparmor/content-hub-clipboard etc/apparmor.d
 debian/apparmor/content-hub-peer-picker etc/apparmor.d
 
=== modified file 'debian/control'
--- debian/control	2017-03-09 02:39:40 +0000
+++ debian/control	2017-03-15 13:33:04 +0000
@@ -2,7 +2,6 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               click-dev,
                dbus-test-runner,
                debhelper (>= 9),
                dh-apparmor,
@@ -11,7 +10,6 @@
                google-mock,
                lcov,
                libapparmor-dev,
-               libclick-0.4-dev,
                libglib2.0-dev,
                libgsettings-qt-dev,
                libmirclient-dev [!powerpc !ppc64 !ppc64el],
 
=== modified file 'debian/rules'
--- debian/rules	2017-01-04 16:16:00 +0000
+++ debian/rules	2017-03-15 13:33:04 +0000
@@ -11,7 +11,7 @@
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 %:
-	dh $@ --with click,translations --fail-missing -- -B build
+	dh $@ --with translations --fail-missing -- -B build
 
 override_dh_auto_test:
 	make -C build/tests/acceptance-tests test
@@ -21,6 +21,7 @@
 	dh_apparmor -pcontent-hub --profile-name=content-hub-clipboard
 	dh_apparmor -pcontent-hub --profile-name=content-hub-peer-picker
 	dh_apparmor -pcontent-hub-testability --profile-name=content-hub-testability
+	mkdir -p debian/tmp/var/cache/content-hub/peers
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 # Skip tests on the archs they are known to be flaky with current configuration
 
=== modified file 'include/com/ubuntu/content/type.h'
--- include/com/ubuntu/content/type.h	2015-06-24 20:22:45 +0000
+++ include/com/ubuntu/content/type.h	2017-03-15 13:33:04 +0000
@@ -30,7 +30,7 @@
 namespace detail
 {
 class Service;
-class Hook;
+class RegistryUpdater;
 }
 class Type : public QObject
 {
@@ -67,7 +67,7 @@
   protected:
     friend struct Known;
     friend class detail::Service;
-    friend class detail::Hook;
+    friend class detail::RegistryUpdater;
 
     explicit Type(const QString&, QObject* = nullptr);
     
 
=== modified file 'src/com/ubuntu/content/service/CMakeLists.txt'
--- src/com/ubuntu/content/service/CMakeLists.txt	2016-11-15 19:45:40 +0000
+++ src/com/ubuntu/content/service/CMakeLists.txt	2017-03-15 13:33:04 +0000
@@ -37,11 +37,18 @@
 
   main.cpp
   registry.cpp
+  registry-updater.cpp
   ../debug.cpp
   ../utils.cpp
   ${CONTENT_SERVICE_SKELETON}
 )
 
+set_target_properties(
+  content-hub-service
+  PROPERTIES
+  AUTOMOC TRUE
+)
+
 qt5_use_modules(content-hub-service Core DBus Gui)
 
 target_link_libraries(
@@ -85,60 +92,6 @@
 
 add_schema ("com.ubuntu.content.hub.gschema.xml")
 
-add_executable(
-  content-hub-peer-hook
-
-  helper.cpp
-  registry.cpp
-  hook.cpp
-)
-
-qt5_use_modules(content-hub-peer-hook Core Gui DBus)
-
-target_link_libraries(
-  content-hub-peer-hook
- 
-  content-hub
-  ${GSETTINGS_LDFLAGS}
-  ${UBUNTU_LAUNCH_LDFLAGS}
-)
-
-configure_file("content-hub-peer-hook-wrapper.in"
-  "content-hub-peer-hook-wrapper"
-  @ONLY
-)
-
-install(
-  PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/content-hub-peer-hook-wrapper"
-  DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/content-hub"
-)
-
-install(
-  TARGETS content-hub-peer-hook
-  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/content-hub"
-)
-
-set_target_properties(
-  content-hub-peer-hook
-  PROPERTIES
-  AUTOMOC TRUE
-)
-
-set(CLICK_HOOK
-"${CMAKE_CURRENT_BINARY_DIR}/content-hub.hook"
-)
-
-configure_file("content-hub.hook.in"
-  "${CLICK_HOOK}"
-  @ONLY
-)
-
-install(
-FILES
-"${CLICK_HOOK}"
-DESTINATION "/usr/share/click/hooks"
-)
-
 install(
   FILES xorg.png
   DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/icons/
 
=== removed file 'src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in'
--- src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in	2014-11-10 12:57:43 +0000
+++ src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh 
-
-# PackageKit clears all environment variables, so we get the UID and then read
-# in $DBUS_SESSION_BUS_ADDRESS from /run/user/$UID/dbus-session
-
-USERID=`id -u`
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-  [ -e /run/user/$USERID/dbus-session ] && . /run/user/$USERID/dbus-session
-  [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && export DBUS_SESSION_BUS_ADDRESS
-fi
-
-@pkglibexecdir@/content-hub/content-hub-peer-hook
 
=== removed file 'src/com/ubuntu/content/service/content-hub.hook.in'
--- src/com/ubuntu/content/service/content-hub.hook.in	2014-06-02 16:33:13 +0000
+++ src/com/ubuntu/content/service/content-hub.hook.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-Pattern: ${home}/.local/share/content-hub/${id}
-Exec: @pkglibexecdir@/content-hub/content-hub-peer-hook-wrapper
-User-Level: yes
-Hook-Name: content-hub
 
=== removed file 'src/com/ubuntu/content/service/helper.cpp'
--- src/com/ubuntu/content/service/helper.cpp	2015-08-12 17:24:29 +0000
+++ src/com/ubuntu/content/service/helper.cpp	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * 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; version 3.
- *
- * 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: Ken VanDine <[e-mail]>
- */
-
-#include <QCoreApplication>
-#include <QDir>
-#include <QStandardPaths>
-
-#include "hook.h"
-#include "debug.h"
-
-namespace cuc = com::ubuntu::content;
-
-int main(int argc, char** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    TRACE() << Q_FUNC_INFO;
-
-    if (app.arguments().count() > 1)
-    {
-            qWarning() << "Shouldn't have arguments";
-            return 1;
-    }
-
-    /* read environment variables */
-    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
-    if (environment.contains(QLatin1String("CONTENT_HUB_LOGGING_LEVEL"))) {
-        bool isOk;
-        int value = environment.value(
-            QLatin1String("CONTENT_HUB_LOGGING_LEVEL")).toInt(&isOk);
-        if (isOk)
-            setLoggingLevel(value);
-    }
-
-    QDir contentDir(
-        QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
-        + QString("/")
-        + QString("content-hub"));
-
-    if (!contentDir.exists()) {
-        if (!contentDir.mkpath(contentDir.absolutePath()))
-            return 0;
-    }
-
-    new cuc::detail::Hook();
-
-    app.exec();
-
-    /* We always want to return 0 */
-    return 0;
-}
 
=== modified file 'src/com/ubuntu/content/service/main.cpp'
--- src/com/ubuntu/content/service/main.cpp	2014-07-15 14:31:08 +0000
+++ src/com/ubuntu/content/service/main.cpp	2017-03-15 13:33:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * 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
@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "common.h"
 #include "registry.h"
+#include "registry-updater.h"
 #include "detail/i18n.h"
 #include "detail/service.h"
 #include "detail/peer_registry.h"
@@ -63,6 +64,8 @@
 
     auto registry = QSharedPointer<cucd::PeerRegistry>(new Registry());
 
+    auto updater = new cuc::detail::RegistryUpdater(registry);
+
     auto app_manager = QSharedPointer<cuca::ApplicationManager>(new cucd::AppManager());
 
     auto server = new cucd::Service(connection, registry, app_manager, app->parent());
 
=== renamed file 'src/com/ubuntu/content/service/hook.cpp' => 'src/com/ubuntu/content/service/registry-updater.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2015-06-24 20:22:45 +0000
+++ src/com/ubuntu/content/service/registry-updater.cpp	2017-03-15 13:33:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * 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
@@ -20,6 +20,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QFile>
+#include <QFileSystemWatcher>
 #include <QDir>
 #include <QStandardPaths>
 #include <QTimer>
@@ -27,34 +28,18 @@
 #include <com/ubuntu/content/peer.h>
 
 #include "debug.h"
-#include "hook.h"
+#include "registry-updater.h"
 
+namespace cuc = com::ubuntu::content;
 namespace cucd = com::ubuntu::content::detail;
 
-cucd::Hook::Hook(QObject *parent) :
-    QObject(parent),
-    registry(new Registry())
-{
-    QTimer::singleShot(200, this, SLOT(run()));
-}
-
-cucd::Hook::Hook(com::ubuntu::content::detail::PeerRegistry *registry, QObject *parent) :
-    QObject(parent),
-    registry(registry)
-{
-}
-
-cucd::Hook::~Hook()
-{
-    TRACE() << Q_FUNC_INFO;
-    delete registry;
-}
-
-void cucd::Hook::run()
-{
-    TRACE() << Q_FUNC_INFO;
-    /* Looks for files in ${HOME}/.local/share/content-hub/${id} installed
-     * by click packages.  These files are JSON, for example:
+cucd::RegistryUpdater::RegistryUpdater(const QSharedPointer<cucd::PeerRegistry>& registry, QObject *parent) :
+    QObject(parent),
+    registry(registry),
+    watcher(new QFileSystemWatcher)
+{
+    /* Looks for files installed packages that define peer registration.
+     * These files are JSON, for example:
      *
      * {
      *     "source": [
@@ -63,22 +48,56 @@
      *     ]
      * }
      *
-     * The hook also iterates known peers and removes them if there is
+     * The updater also iterates known peers and removes them if there is
      * no JSON file installed in this path.
      */
-
-    QVector<QDir> contentDirs;
-
     contentDirs.append(QDir(
         QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
         + QString("/")
         + QString("content-hub")));
-    
+
     contentDirs.append(QDir("/usr/share/content-hub/peers/"));
     contentDirs.append(QDir("/usr/share/local/content-hub/peers/"));
+    contentDirs.append(QDir("/var/cache/content-hub/peers/"));
+
+    QStringList dirs;
+    Q_FOREACH(QDir d, contentDirs)
+    {
+        if (d.exists())
+            dirs << d.path();
+    }
+
+    watcher->addPaths(dirs);
+    connect(watcher.data(), SIGNAL(directoryChanged(const QString&)), SLOT(refresh(const QString&)));
+
+    QTimer::singleShot(200, this, SLOT(run()));
+}
+
+cucd::RegistryUpdater::~RegistryUpdater()
+{
+    TRACE() << Q_FUNC_INFO;
+}
+
+void cucd::RegistryUpdater::refresh(const QString& dir)
+{
+    TRACE() << Q_FUNC_INFO << dir;
+    bool shouldRefresh = true;
+    /* Don't update the registry for temp files */
+    Q_FOREACH(QFileInfo f, QDir(dir).entryInfoList(QDir::Files))
+    {
+    	if (f.completeSuffix().contains("dpkg-"))
+            shouldRefresh = false;
+    }
+    if (shouldRefresh)
+        run();
+}
+
+void cucd::RegistryUpdater::run()
+{
+    TRACE() << Q_FUNC_INFO;
 
     QStringList all_peers;
-    registry->enumerate_known_peers([&all_peers](const com::ubuntu::content::Peer& peer)
+    registry->enumerate_known_peers([&all_peers](const cuc::Peer& peer)
                                     {
                                         all_peers.append(peer.id());
                                     });
@@ -95,7 +114,7 @@
             }
         }
         if(!foundPeer) {
-            registry->remove_peer(com::ubuntu::content::Peer{p});
+            registry->remove_peer(cuc::Peer{p});
         }
     }
 
@@ -107,9 +126,10 @@
         if (contentDir.exists()) 
         {
             peerDirsExist = true;
-
             Q_FOREACH(QFileInfo f, contentDir.entryInfoList(QDir::Files))
+            {
                 add_peer(f);
+            }
         }
 
     }
@@ -117,13 +137,11 @@
     if(!peerDirsExist)
         return_error("No peer setting directories exist.");
 
-    deleteLater();
-    QCoreApplication::instance()->quit();
 }
 
-bool cucd::Hook::add_peer(QFileInfo result)
+bool cucd::RegistryUpdater::add_peer(QFileInfo result)
 {
-    TRACE() << Q_FUNC_INFO << "Hook:" << result.filePath();
+    TRACE() << Q_FUNC_INFO << "RegistryUpdater:" << result.filePath();
 
     QStringList knownTypes;
     knownTypes << "all" << "pictures" << "music" << "contacts" << "documents" << "videos" << "links" << "ebooks" << "text" << "events";
@@ -182,7 +200,7 @@
     return true;
 }
 
-bool cucd::Hook::return_error(QString err)
+bool cucd::RegistryUpdater::return_error(QString err)
 {
     qWarning() << "Failed to install peer" << err;
     return false;
 
=== renamed file 'src/com/ubuntu/content/service/hook.h' => 'src/com/ubuntu/content/service/registry-updater.h'
--- src/com/ubuntu/content/service/hook.h	2015-09-23 14:45:09 +0000
+++ src/com/ubuntu/content/service/registry-updater.h	2017-03-15 13:33:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2017 Canonical, Ltd.
  *
  * 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
@@ -16,8 +16,8 @@
  * Authored by: Ken VanDine <[e-mail]>
  */
 
-#ifndef HOOK_H
-#define HOOK_H
+#ifndef REGISTRY_UPDATER_H
+#define REGISTRY_UPDATER_H
 
 #include <QObject>
 #include <QFileInfo>
@@ -33,21 +33,23 @@
 {
 namespace detail
 {
-class Hook : public QObject
+class RegistryUpdater : public QObject
 {
     Q_OBJECT
 public:
-    explicit Hook(QObject *parent = 0);
-    Hook(com::ubuntu::content::detail::PeerRegistry *registry, QObject *parent = 0);
-    ~Hook();
+    RegistryUpdater(const QSharedPointer<com::ubuntu::content::detail::PeerRegistry>& registry, QObject *parent = 0);
+    ~RegistryUpdater();
 
 public Q_SLOTS:
     bool return_error(QString err = "");
+    void refresh(const QString&);
     void run();
     bool add_peer(QFileInfo);
 
 private:
-    com::ubuntu::content::detail::PeerRegistry* registry;
+    const QSharedPointer<com::ubuntu::content::detail::PeerRegistry>& registry;
+    QVector<QDir> contentDirs;
+    QScopedPointer<QFileSystemWatcher> watcher;
     
 };
 }
@@ -55,4 +57,4 @@
 }
 }
 
-#endif // HOOK_H
+#endif // REGISTRY_UPDATER_H
 
=== modified file 'src/helper/CMakeLists.txt'
--- src/helper/CMakeLists.txt	2016-11-09 17:55:06 +0000
+++ src/helper/CMakeLists.txt	2017-03-15 13:33:04 +0000
@@ -21,7 +21,6 @@
   ${UBUNTU_LAUNCH_INCLUDE_DIRS}
   ${GIO_INCLUDE_DIRS}
   ${GLIB_INCLUDE_DIRS}
-  ${CLICK_INCLUDE_DIRS}
   ${MIRCLIENT_INCLUDE_DIRS}
 )
 
@@ -37,7 +36,6 @@
   exec-tool
  
   ${UBUNTU_LAUNCH_LDFLAGS}
-  ${CLICK_LDFLAGS}
   ${GLIB_LDFLAGS}
   ${GIO_LDFLAGS}
   ${MIRCLIENT_LDFLAGS}
 
=== modified file 'src/helper/exec-tool.c'
--- src/helper/exec-tool.c	2016-11-09 17:55:06 +0000
+++ src/helper/exec-tool.c	2017-03-15 13:33:04 +0000
@@ -18,7 +18,7 @@
  */
 
 #include <glib.h>
-#include <click.h>
+#include <gio/gio.h>
 #include <ubuntu-app-launch.h>
 
 gchar *
@@ -65,7 +65,6 @@
 gchar *
 build_dir (const gchar * appid)
 {
-        GError * error = NULL;
         gchar * package = NULL;
 
         /* 'Parse' the App ID */
@@ -73,42 +72,9 @@
                 g_warning("Unable to parse App ID: '%s'", appid);
                 return NULL;
         }
-
-        /* Check click to find out where the files are */
-        ClickDB * db = click_db_new();
-
-        /* If TEST_CLICK_DB is unset, this reads the system database. */
-        click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
-        if (error != NULL) {
-                g_warning("Unable to read Click database: %s", error->message);
-                g_error_free(error);
-                g_free(package);
-                return NULL;
-        }
-
-        /* If TEST_CLICK_USER is unset, this uses the current user name. */
-        ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
-        if (error != NULL) {
-                g_warning("Unable to read Click database: %s", error->message);
-                g_error_free(error);
-                g_free(package);
-                g_object_unref(db);
-                return NULL;
-        }
-
-        gchar * pkgdir = click_user_get_path(user, package, &error);
-
-        g_object_unref(user);
-        g_object_unref(db);
         g_free(package);
 
-        if (error != NULL) {
-                g_warning("Unable to get the Click package directory for %s: %s", package, error->message);
-                g_error_free(error);
-                return NULL;
-        }
-
-        return pkgdir;
+        return NULL;
 }
 
 int
@@ -136,13 +102,6 @@
                 exec = build_exec(appid, SYSTEM_DIRECTORY);
         }
 
-        /* If not there look to the user directory (click) */
-        if (exec == NULL) {
-                gchar * userdir = g_build_filename(g_get_user_cache_dir(), "ubuntu-app-launch", "desktop", NULL);
-                exec = build_exec(appid, userdir);
-                g_free(userdir);
-        }
-
         if (exec == NULL) {
                 const gchar * props[3] = {
                         "AppID",
 
=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2017-01-04 16:16:00 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2017-03-15 13:33:04 +0000
@@ -71,25 +71,25 @@
 endforeach(test)
 
 add_executable(
-  test_hook
-  test_hook.cpp
+  test_registry_updater
+  test_registry_updater.cpp
   ${MOCS}
-  ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/service/hook.cpp
+  ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/service/registry-updater.cpp
   ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/service/registry.cpp
   good.json
   bad.json
   source_all.json
 )
 
-qt5_use_modules(test_hook Core Gui DBus Test)
-target_link_libraries(test_hook content-hub ${GTEST_ALL_LIBRARIES} ${GSETTINGS_LDFLAGS})
-add_test(NAME test_hook COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/test_hook)
+qt5_use_modules(test_registry_updater Core Gui DBus Test)
+target_link_libraries(test_registry_updater content-hub ${GTEST_ALL_LIBRARIES} ${GSETTINGS_LDFLAGS})
+add_test(NAME test_registry_updater COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/test_registry_updater)
 
-SET_TESTS_PROPERTIES(test_hook
+SET_TESTS_PROPERTIES(test_registry_updater
   PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
 
 set_target_properties(
-  test_hook
+  test_registry_updater
   PROPERTIES
   AUTOMOC TRUE
 )
 
=== renamed file 'tests/acceptance-tests/test_hook.cpp' => 'tests/acceptance-tests/test_registry_updater.cpp'
--- tests/acceptance-tests/test_hook.cpp	2015-10-20 20:23:09 +0000
+++ tests/acceptance-tests/test_registry_updater.cpp	2017-03-15 13:33:04 +0000
@@ -19,7 +19,7 @@
 #include <com/ubuntu/content/peer.h>
 #include <com/ubuntu/content/type.h>
 #include "com/ubuntu/content/detail/peer_registry.h"
-#include "com/ubuntu/content/service/hook.h"
+#include "com/ubuntu/content/service/registry-updater.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -60,7 +60,7 @@
 };
 }
 
-TEST(Hook, parse_json)
+TEST(RegistryUpdater, parse_json)
 {
     using namespace ::testing;
     
@@ -70,12 +70,13 @@
     WillRepeatedly(Return(true));
 
     QFileInfo f("good.json");
-    cucd::Hook *hook = new cucd::Hook(mock);
+    auto mock_ptr = QSharedPointer<cuc::detail::PeerRegistry>(mock);
+    cucd::RegistryUpdater *updater = new cucd::RegistryUpdater(mock_ptr);
 
-    EXPECT_TRUE(hook->add_peer(f));
+    EXPECT_TRUE(updater->add_peer(f));
     f.setFile("bad.json");
-    EXPECT_FALSE(hook->add_peer(f));
+    EXPECT_FALSE(updater->add_peer(f));
     f.setFile("source_all.json");
-    EXPECT_TRUE(hook->add_peer(f));
-    delete mock;
+    EXPECT_TRUE(updater->add_peer(f));
+    mock_ptr.clear();
 }
 
=== modified file 'tools/peer-picker/content-hub-peer-picker.desktop'
--- tools/peer-picker/content-hub-peer-picker.desktop	2016-11-16 18:25:30 +0000
+++ tools/peer-picker/content-hub-peer-picker.desktop	2017-03-15 13:33:04 +0000
@@ -6,7 +6,7 @@
 Icon=
 Terminal=false
 Type=Application
-OnlyShowIn=Old
+NoDisplay=true
 X-Ubuntu-Touch=true
 X-Ubuntu-Single-Instance=false
 X-Ubuntu-Splash-Show-Header=true
 
=== modified file 'tools/send/content-hub-send.desktop'
--- tools/send/content-hub-send.desktop	2015-04-20 23:17:37 +0000
+++ tools/send/content-hub-send.desktop	2017-03-15 13:33:04 +0000
@@ -5,5 +5,5 @@
 Icon=
 Terminal=false
 Type=Application
-OnlyShowIn=Old
+NoDisplay=true
 X-Ubuntu-Touch=true