6 files changed, 187 insertions, 120 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 02335ad..0becad6 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -34,11 +34,12 @@ set(storage_LIBS lmdb)
 
 set(command_SRCS
     store.cpp
+    notifier.cpp
+    resourcecontrol.cpp
     modelresult.cpp
     definitions.cpp
     log.cpp
     entitybuffer.cpp
-    clientapi.cpp
     facadefactory.cpp
     commands.cpp
     facade.cpp
@@ -104,6 +105,8 @@ add_clang_static_analysis(${PROJECT_NAME})
 
 install(FILES
     store.h
+    notifier.h
+    resourcecontrol.h
     clientapi.h
     domain/applicationdomaintype.h
     query.h
diff --git a/common/clientapi.h b/common/clientapi.h
index a1d2469..8333987 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -20,67 +20,6 @@
 
 #pragma once
 
-#include "sink_export.h"
-#include <QString>
-#include <QSharedPointer>
-
-#include <Async/Async>
-
 #include "store.h"
-
-#include "query.h"
-#include "inspection.h"
-#include "applicationdomaintype.h"
-
-class QAbstractItemModel;
-
-namespace Sink {
-class ResourceAccess;
-class Notification;
-
-class SINK_EXPORT Notifier {
-public:
-    Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
-    Notifier(const QByteArray &resourceInstanceIdentifier);
-    // Notifier(const QByteArrayList &resource);
-    void registerHandler(std::function<void(const Notification &)>);
-
-private:
-    class Private;
-    QSharedPointer<Private> d;
-};
-
-
-namespace ResourceControl {
-
-template <class DomainType>
-KAsync::Job<void> SINK_EXPORT inspect(const Inspection &inspectionCommand);
-
-/**
- * Shutdown resource.
- */
-KAsync::Job<void> SINK_EXPORT shutdown(const QByteArray &resourceIdentifier);
-
-/**
- * Start resource.
- * 
- * The resource is ready for operation once this command completes.
- * This command is only necessary if a resource was shutdown previously,
- * otherwise the resource process will automatically start as necessary.
- */
-KAsync::Job<void> SINK_EXPORT start(const QByteArray &resourceIdentifier);
-
-/**
- * Flushes any pending messages to disk
- */
-KAsync::Job<void> SINK_EXPORT flushMessageQueue(const QByteArrayList &resourceIdentifier);
-
-/**
- * Flushes any pending messages that haven't been replayed to the source.
- */
-KAsync::Job<void> SINK_EXPORT flushReplayQueue(const QByteArrayList &resourceIdentifier);
-
-}
-
-}
-
+#include "notifier.h"
+#include "resourcecontrol.h"
diff --git a/common/notifier.cpp b/common/notifier.cpp
new file mode 100644
index 0000000..e4248df
--- /dev/null
+++ b/common/notifier.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "notifier.h"
+
+#include <functional>
+
+#include "resourceaccess.h"
+#include "log.h"
+
+using namespace Sink;
+
+class Sink::Notifier::Private {
+public:
+    Private()
+        : context(new QObject)
+    {
+
+    }
+    QList<QSharedPointer<ResourceAccess> > resourceAccess;
+    QList<std::function<void(const Notification &)> > handler;
+    QSharedPointer<QObject> context;
+};
+
+Notifier::Notifier(const QSharedPointer<ResourceAccess> &resourceAccess)
+    : d(new Sink::Notifier::Private)
+{
+    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
+        for (const auto &handler : d->handler) {
+            handler(notification);
+        }
+    });
+    d->resourceAccess << resourceAccess;
+}
+
+Notifier::Notifier(const QByteArray &instanceIdentifier)
+    : d(new Sink::Notifier::Private)
+{
+    auto resourceAccess = Sink::ResourceAccess::Ptr::create(instanceIdentifier);
+    resourceAccess->open();
+    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
+        for (const auto &handler : d->handler) {
+            handler(notification);
+        }
+    });
+    d->resourceAccess << resourceAccess;
+}
+
+void Notifier::registerHandler(std::function<void(const Notification &)> handler)
+{
+    d->handler << handler;
+}
diff --git a/common/notifier.h b/common/notifier.h
new file mode 100644
index 0000000..d16a311
--- /dev/null
+++ b/common/notifier.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "sink_export.h"
+#include <QByteArray>
+#include <QSharedPointer>
+
+#include <Async/Async>
+
+class QAbstractItemModel;
+
+namespace Sink {
+class ResourceAccess;
+class Notification;
+
+class SINK_EXPORT Notifier {
+public:
+    Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
+    Notifier(const QByteArray &resourceInstanceIdentifier);
+    void registerHandler(std::function<void(const Notification &)>);
+
+private:
+    class Private;
+    QSharedPointer<Private> d;
+};
+
+}
diff --git a/common/clientapi.cpp b/common/resourcecontrol.cpp
index 01411c2..4a6f9b4 100644
--- a/common/clientapi.cpp
+++ b/common/resourcecontrol.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
+ * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,30 +18,19 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clientapi.h"
+#include "resourcecontrol.h"
 
-#include <QtConcurrent/QtConcurrentRun>
-#include <QTimer>
 #include <QTime>
-#include <QEventLoop>
-#include <QAbstractItemModel>
-#include <QDir>
 #include <QUuid>
 #include <functional>
-#include <memory>
 
 #include "resourceaccess.h"
 #include "commands.h"
-#include "resourcefacade.h"
-#include "definitions.h"
-#include "resourceconfig.h"
-#include "facadefactory.h"
-#include "modelresult.h"
-#include "storage.h"
 #include "log.h"
+#include "notifier.h"
 
 #undef DEBUG_AREA
-#define DEBUG_AREA "client.clientapi"
+#define DEBUG_AREA "client.resourcecontrol"
 
 namespace Sink
 {
@@ -129,47 +118,6 @@ KAsync::Job<void> ResourceControl::inspect(const Inspection &inspectionCommand)
         });
 }
 
-class Sink::Notifier::Private {
-public:
-    Private()
-        : context(new QObject)
-    {
-
-    }
-    QList<QSharedPointer<ResourceAccess> > resourceAccess;
-    QList<std::function<void(const Notification &)> > handler;
-    QSharedPointer<QObject> context;
-};
-
-Notifier::Notifier(const QSharedPointer<ResourceAccess> &resourceAccess)
-    : d(new Sink::Notifier::Private)
-{
-    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
-        for (const auto &handler : d->handler) {
-            handler(notification);
-        }
-    });
-    d->resourceAccess << resourceAccess;
-}
-
-Notifier::Notifier(const QByteArray &instanceIdentifier)
-    : d(new Sink::Notifier::Private)
-{
-    auto resourceAccess = Sink::ResourceAccess::Ptr::create(instanceIdentifier);
-    resourceAccess->open();
-    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
-        for (const auto &handler : d->handler) {
-            handler(notification);
-        }
-    });
-    d->resourceAccess << resourceAccess;
-}
-
-void Notifier::registerHandler(std::function<void(const Notification &)> handler)
-{
-    d->handler << handler;
-}
-
 #define REGISTER_TYPE(T) template KAsync::Job<void> ResourceControl::inspect<T>(const Inspection &); \
 
 REGISTER_TYPE(ApplicationDomain::Event);
diff --git a/common/resourcecontrol.h b/common/resourcecontrol.h
new file mode 100644
index 0000000..5bfa67f
--- /dev/null
+++ b/common/resourcecontrol.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "sink_export.h"
+#include <QByteArray>
+
+#include <Async/Async>
+
+#include "inspection.h"
+
+namespace Sink {
+namespace ResourceControl {
+
+template <class DomainType>
+KAsync::Job<void> SINK_EXPORT inspect(const Inspection &inspectionCommand);
+
+/**
+ * Shutdown resource.
+ */
+KAsync::Job<void> SINK_EXPORT shutdown(const QByteArray &resourceIdentifier);
+
+/**
+ * Start resource.
+ * 
+ * The resource is ready for operation once this command completes.
+ * This command is only necessary if a resource was shutdown previously,
+ * otherwise the resource process will automatically start as necessary.
+ */
+KAsync::Job<void> SINK_EXPORT start(const QByteArray &resourceIdentifier);
+
+/**
+ * Flushes any pending messages to disk
+ */
+KAsync::Job<void> SINK_EXPORT flushMessageQueue(const QByteArrayList &resourceIdentifier);
+
+/**
+ * Flushes any pending messages that haven't been replayed to the source.
+ */
+KAsync::Job<void> SINK_EXPORT flushReplayQueue(const QByteArrayList &resourceIdentifier);
+
+    }
+}
+