6 files changed, 63 insertions, 6 deletions

diff --git a/sinksh/CMakeLists.txt b/sinksh/CMakeLists.txt
index 1489fb3..3149347 100644
--- a/sinksh/CMakeLists.txt
+++ b/sinksh/CMakeLists.txt
@@ -2,7 +2,6 @@ project(sinksh)
 
 find_package(Readline REQUIRED)
 
-
 set(sink_cli_SRCS
     main.cpp
     syntaxtree.cpp
@@ -24,6 +23,6 @@ set(sink_cli_SRCS
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(${PROJECT_NAME} ${sink_cli_SRCS})
-target_link_libraries(${PROJECT_NAME} Qt5::Core ${Readline_LIBRARY} sinkcommon)
+target_link_libraries(${PROJECT_NAME} Qt5::Core ${Readline_LIBRARY} sink)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
diff --git a/sinksh/repl/replStates.cpp b/sinksh/repl/replStates.cpp
index 43b1353..0cd2620 100644
--- a/sinksh/repl/replStates.cpp
+++ b/sinksh/repl/replStates.cpp
@@ -168,4 +168,8 @@ static char *sink_cli_next_tab_complete_match(const char *text, int state)
     return rl_filename_completion_function(text, state);
 }
 
+//Ignore warning I don't know how to fix in a moc file
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
 #include "moc_replStates.cpp"
+#pragma clang diagnostic pop
diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index fa06b34..d5b1c22 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -20,7 +20,7 @@
 
 #include "sinksh_utils.h"
 
-#include "common/clientapi.h"
+#include "common/store.h"
 
 #include "utils.h"
 
diff --git a/sinksh/sinksh_utils.h b/sinksh/sinksh_utils.h
index 457f644..bc4f6e5 100644
--- a/sinksh/sinksh_utils.h
+++ b/sinksh/sinksh_utils.h
@@ -24,7 +24,7 @@
 #include <QSharedPointer>
 
 #include "common/query.h"
-#include "common/clientapi.h"
+#include "common/store.h"
 
 #include "state.h"
 
@@ -47,6 +47,7 @@ QMap<QString, QString> keyValueMapFromArgs(const QStringList &args);
  */
 class StoreBase {
 public:
+    virtual ~StoreBase() {};
     virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject() = 0;
     virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) = 0;
     virtual KAsync::Job<void> create(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0;
diff --git a/sinksh/syntax_modules/core_syntax.cpp b/sinksh/syntax_modules/core_syntax.cpp
index f5b6274..e90d894 100644
--- a/sinksh/syntax_modules/core_syntax.cpp
+++ b/sinksh/syntax_modules/core_syntax.cpp
@@ -25,6 +25,7 @@
 #include "state.h"
 #include "syntaxtree.h"
 #include "utils.h"
+#include "common/log.h"
 
 namespace CoreSyntax
 {
@@ -32,7 +33,6 @@ namespace CoreSyntax
 bool exit(const QStringList &, State &)
 {
     ::exit(0);
-    return true;
 }
 
 bool showHelp(const QStringList &commands, State &state)
@@ -164,6 +164,49 @@ bool printLoggingLevel(const QStringList &commands, State &state)
     return true;
 }
 
+bool setLoggingAreas(const QStringList &commands, State &state)
+{
+    if (commands.isEmpty()) {
+        state.printError(QObject::tr("Wrong number of arguments; expected logging areas."));
+        return false;
+    }
+
+    QByteArrayList areas;
+    for (const auto &c : commands) {
+        areas << c.toLatin1();
+    }
+
+    Sink::Log::setDebugOutputFilter(Sink::Log::Area, areas);
+    return true;
+}
+
+bool setLoggingFilter(const QStringList &commands, State &state)
+{
+    if (commands.isEmpty()) {
+        state.printError(QObject::tr("Wrong number of arguments; expected resource identifier or application names."));
+        return false;
+    }
+
+    QByteArrayList filter;
+    for (const auto &c : commands) {
+        filter << c.toLatin1();
+    }
+
+    Sink::Log::setDebugOutputFilter(Sink::Log::ApplicationName, filter);
+    return true;
+}
+
+bool setLoggingFields(const QStringList &commands, State &state)
+{
+    QByteArrayList output;
+    for (const auto &c : commands) {
+        output << c.toLatin1();
+    }
+
+    Sink::Log::setDebugOutputFields(output);
+    return true;
+}
+
 Syntax::List syntax()
 {
     Syntax::List syntax;
@@ -187,6 +230,16 @@ Syntax::List syntax()
     logging.completer = [](const QStringList &, const QString &fragment, State &state) -> QStringList { return Utils::filteredCompletions(QStringList() << "trace" << "log" << "warning" << "error", fragment, Qt::CaseInsensitive); };
     set.children << logging;
 
+    Syntax loggingAreas("loggingAreas", QObject::tr("Set logging areas."), &CoreSyntax::setLoggingAreas);
+    set.children << loggingAreas;
+
+    Syntax loggingFilter("loggingFilter", QObject::tr("Set logging filter."), &CoreSyntax::setLoggingFilter);
+    set.children << loggingFilter;
+
+    Syntax loggingFields("loggingFields", QObject::tr("Set logging fields."), &CoreSyntax::setLoggingFields);
+    loggingFields.completer = [](const QStringList &, const QString &fragment, State &state) -> QStringList { return Utils::filteredCompletions(QStringList() << "name" << "function" << "location" << "", fragment, Qt::CaseInsensitive); };
+    set.children << loggingFields;
+
     syntax << set;
 
     Syntax get("get", QObject::tr("Gets settings for the session"));
diff --git a/sinksh/syntax_modules/sink_clear.cpp b/sinksh/syntax_modules/sink_clear.cpp
index d02c638..72d9a14 100644
--- a/sinksh/syntax_modules/sink_clear.cpp
+++ b/sinksh/syntax_modules/sink_clear.cpp
@@ -41,7 +41,7 @@ bool clear(const QStringList &args, State &state)
 {
     for (const auto &resource : args) {
         state.print(QObject::tr("Removing local cache for '%1' ...").arg(resource));
-        Sink::Store::removeFromDisk(resource.toLatin1());
+        Sink::Store::removeDataFromDisk(resource.toLatin1()).exec().waitForFinished();
         state.printLine(QObject::tr("done"));
     }