8 files changed, 111 insertions, 53 deletions

diff --git a/sinksh/CMakeLists.txt b/sinksh/CMakeLists.txt
index e7d3b6e..f0e2f6c 100644
--- a/sinksh/CMakeLists.txt
+++ b/sinksh/CMakeLists.txt
@@ -15,6 +15,7 @@ set(sink_cli_SRCS
     syntax_modules/sink_stat.cpp
     syntax_modules/sink_sync.cpp
     syntax_modules/sink_show.cpp
+    syntax_modules/sink_trace.cpp
     sinksh_utils.cpp
     repl/repl.cpp
     repl/replStates.cpp
diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index 091eb38..0e26c5a 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -21,6 +21,7 @@
 #include "sinksh_utils.h"
 
 #include "common/store.h"
+#include "common/log.h"
 
 #include "utils.h"
 
@@ -88,48 +89,35 @@ QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Sink::Query qu
     return model;
 }
 
-QStringList resourceIds(State &state)
+QStringList resourceIds()
 {
-    QStringList resources;
     Sink::Query query;
     query.liveQuery = false;
-    auto model = SinkshUtils::loadModel("resource", query);
-
-    QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model, &resources](const QModelIndex &index, int start, int end) mutable {
-        for (int i = start; i <= end; i++) {
-            auto object = model->data(model->index(i, 0, index), Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>();
-            resources << object->identifier();
-        }
-    });
-
-    QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
-        if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
-            state.commandFinished();
-        }
-    });
-
-    state.commandStarted();
-
+    QStringList resources;
+    for (const auto &r : getStore("resource").read(query)) {
+        resources << r.identifier();
+    }
     return resources;
 }
 
+QStringList debugareaCompleter(const QStringList &, const QString &fragment, State &state)
+{
+    return Utils::filteredCompletions(Sink::Log::debugAreas().toList(), fragment);
+}
+
 QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state)
 {
-    return Utils::filteredCompletions(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(), fragment);
 }
 
 QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state)
 {
-    static QStringList types = QStringList() << "resource"
-                                             << "folder"
-                                             << "mail"
-                                             << "event"
-                                             << "account";
+    static QStringList types = s_types;
     if (commands.count() == 1) {
         return Utils::filteredCompletions(s_types, fragment);
     }
 
-    return Utils::filteredCompletions(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(), fragment);
 }
 
 QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state)
diff --git a/sinksh/sinksh_utils.h b/sinksh/sinksh_utils.h
index b5b6f3c..0a47661 100644
--- a/sinksh/sinksh_utils.h
+++ b/sinksh/sinksh_utils.h
@@ -40,6 +40,7 @@ QStringList resourceIds();
 QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state);
 QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state);
 QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state);
+QStringList debugareaCompleter(const QStringList &, const QString &fragment, State &state);
 QMap<QString, QString> keyValueMapFromArgs(const QStringList &args);
 
 /**
diff --git a/sinksh/syntax_modules/sink_clear.cpp b/sinksh/syntax_modules/sink_clear.cpp
index 72d9a14..1537ecd 100644
--- a/sinksh/syntax_modules/sink_clear.cpp
+++ b/sinksh/syntax_modules/sink_clear.cpp
@@ -50,7 +50,7 @@ bool clear(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &SinkClear::clear);
+    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &SinkClear::clear, Syntax::NotInteractive);
     clear.completer = &SinkshUtils::resourceCompleter;
 
     return Syntax::List() << clear;
diff --git a/sinksh/syntax_modules/sink_remove.cpp b/sinksh/syntax_modules/sink_remove.cpp
index b374824..d474518 100644
--- a/sinksh/syntax_modules/sink_remove.cpp
+++ b/sinksh/syntax_modules/sink_remove.cpp
@@ -98,7 +98,7 @@ bool resource(const QStringList &args, State &state)
 Syntax::List syntax()
 {
     Syntax remove("remove", QObject::tr("Remove items in a resource"), &SinkRemove::remove);
-    Syntax resource("resource", QObject::tr("Removes a resource"), &SinkRemove::resource);//, Syntax::EventDriven);
+    Syntax resource("resource", QObject::tr("Removes a resource"), &SinkRemove::resource, Syntax::NotInteractive);
     resource.completer = &SinkshUtils::resourceCompleter;
     remove.children << resource;
 
diff --git a/sinksh/syntax_modules/sink_stat.cpp b/sinksh/syntax_modules/sink_stat.cpp
index 06586d9..9f0fe44 100644
--- a/sinksh/syntax_modules/sink_stat.cpp
+++ b/sinksh/syntax_modules/sink_stat.cpp
@@ -70,30 +70,11 @@ bool statAllResources(State &state)
 {
     Sink::Query query;
     query.liveQuery = false;
-    auto model = SinkshUtils::loadModel("resource", query);
-
-    //SUUUPER ugly, but can't think of a better way with 2 glasses of wine in me on Christmas day
-    static QStringList resources;
-    resources.clear();
-
-    QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model](const QModelIndex &index, int start, int end) mutable {
-        for (int i = start; i <= end; i++) {
-            auto object = model->data(model->index(i, 0, index), Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>();
-            resources << object->identifier();
-        }
-    });
-
-    QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
-        if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
-            statResources(resources, state);
-            state.commandFinished();
-        }
-    });
-
-    if (!model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool()) {
-        return true;
+    QStringList resources;
+    for (const auto &r : SinkshUtils::getStore("resource").read(query)) {
+        resources << r.identifier();
     }
-
+    statResources(resources, state);
     return false;
 }
 
@@ -109,7 +90,7 @@ bool stat(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &SinkStat::stat, Syntax::EventDriven);
+    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &SinkStat::stat, Syntax::NotInteractive);
     state.completer = &SinkshUtils::resourceCompleter;
 
     return Syntax::List() << state;
diff --git a/sinksh/syntax_modules/sink_sync.cpp b/sinksh/syntax_modules/sink_sync.cpp
index 3006202..208b869 100644
--- a/sinksh/syntax_modules/sink_sync.cpp
+++ b/sinksh/syntax_modules/sink_sync.cpp
@@ -56,7 +56,7 @@ bool sync(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &SinkSync::sync, Syntax::EventDriven );
+    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &SinkSync::sync, Syntax::EventDriven);
     sync.completer = &SinkshUtils::resourceCompleter;
 
     return Syntax::List() << sync;
diff --git a/sinksh/syntax_modules/sink_trace.cpp b/sinksh/syntax_modules/sink_trace.cpp
new file mode 100644
index 0000000..8bd52a0
--- /dev/null
+++ b/sinksh/syntax_modules/sink_trace.cpp
@@ -0,0 +1,87 @@
+/*
+ *   Copyright (C) 2016 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   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 2 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, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+
+#include <QDebug>
+#include <QObject> // tr()
+#include <QTimer>
+
+#include "common/resource.h"
+#include "common/storage.h"
+#include "common/resourceconfig.h"
+#include "common/log.h"
+#include "common/storage.h"
+#include "common/definitions.h"
+
+#include "sinksh_utils.h"
+#include "state.h"
+#include "syntaxtree.h"
+#include "iostream"
+
+namespace SinkTrace
+{
+
+bool traceOff(const QStringList &args, State &state)
+{
+    Sink::Log::setDebugOutputLevel(Sink::Log::Log);
+    std::cout << "Turned trace off." << std::endl;
+    return true;
+}
+
+bool traceOn(const QStringList &args, State &state)
+{
+    Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+    if (args.isEmpty() || (args.size() == 1 && args.first() == "*")) {
+        Sink::Log::setDebugOutputFilter(Sink::Log::Area, QByteArrayList());
+        std::cout << "Set trace filter to: *" << std::endl;
+    } else {
+        QByteArrayList filter;
+        for (const auto &arg : args) {
+            filter << arg.toLatin1();
+        }
+        Sink::Log::setDebugOutputFilter(Sink::Log::Area, filter);
+        std::cout << "Set trace filter to: " << filter.join(", ").toStdString() << std::endl;
+    }
+    return true;
+}
+
+bool trace(const QStringList &args, State &state)
+{
+    return traceOn(args, state);
+}
+
+
+Syntax::List syntax()
+{
+    Syntax trace("trace", QObject::tr("Control trace debug output."), &SinkTrace::trace, Syntax::NotInteractive);
+    trace.completer = &SinkshUtils::debugareaCompleter; 
+
+    Syntax traceOff("off", QObject::tr("Turns off trace output."), &SinkTrace::traceOff, Syntax::NotInteractive);
+    traceOff.completer = &SinkshUtils::debugareaCompleter; 
+    trace.children << traceOff;
+
+    Syntax traceOn("on", QObject::tr("Turns on trace output."), &SinkTrace::traceOn, Syntax::NotInteractive);
+    traceOn.completer = &SinkshUtils::debugareaCompleter; 
+    trace.children << traceOn;
+
+    return Syntax::List() << trace;
+}
+
+REGISTER_SYNTAX(SinkTrace)
+
+}