12 files changed, 184 insertions, 75 deletions

diff --git a/akonadish/CMakeLists.txt b/akonadish/CMakeLists.txt
index 6761a32..eaedf9a 100644
--- a/akonadish/CMakeLists.txt
+++ b/akonadish/CMakeLists.txt
@@ -18,7 +18,8 @@ set(akonadi2_cli_SRCS
     akonadish_utils.cpp
     repl/repl.cpp
     repl/replStates.cpp
-    state.cpp)
+    state.cpp
+    utils.cpp)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
diff --git a/akonadish/akonadish_utils.cpp b/akonadish/akonadish_utils.cpp
index 070d788..27a863d 100644
--- a/akonadish/akonadish_utils.cpp
+++ b/akonadish/akonadish_utils.cpp
@@ -22,6 +22,8 @@
 
 #include "common/clientapi.h"
 
+#include "utils.h"
+
 namespace AkonadishUtils
 {
 
@@ -75,8 +77,6 @@ QStringList resourceIds(State &state)
 {
     QStringList resources;
     Akonadi2::Query query;
-    query.syncOnDemand = false;
-    query.processAll = false;
     query.liveQuery = false;
     auto model = AkonadishUtils::loadModel("resource", query);
 
@@ -98,40 +98,24 @@ QStringList resourceIds(State &state)
     return resources;
 }
 
-QStringList filtered(const QStringList &list, const QString &fragment)
-{
-    if (fragment.isEmpty()) {
-        return list;
-    }
-
-    QStringList filtered;
-    for (auto item: list) {
-        if (item.startsWith(fragment)) {
-            filtered << item;
-        }
-    }
-
-    return filtered;
-}
-
 QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state)
 {
-    return filtered(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(state), fragment);
 }
 
 QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state)
 {
     static QStringList types = QStringList() << "resource" << "folder" << "mail" << "event";
     if (commands.count() == 1) {
-        return filtered(s_types, fragment);
+        return Utils::filteredCompletions(s_types, fragment);
     }
 
-    return filtered(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(state), fragment);
 }
 
 QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state)
 {
-    return filtered(s_types, fragment);
+    return Utils::filteredCompletions(s_types, fragment);
 }
 
 QMap<QString, QString> keyValueMapFromArgs(const QStringList &args)
diff --git a/akonadish/main.cpp b/akonadish/main.cpp
index f3cbcac..4c00b9b 100644
--- a/akonadish/main.cpp
+++ b/akonadish/main.cpp
@@ -31,71 +31,82 @@
 /*
  * modes of operation:
  *
- *   1. called with no commands: start the REPL and listen for JSON on stin
- *   2. called with -: listen for JSON on stdin
- *   3. called with commands: try to match to syntx
+ *   1. called with no commands: start the REPL
+ *   2. called with -: listen for commands on stdin
+ *   3. called with a filename: try to run it as a script
+ *   4. called with commands: try to match to syntax and run the result
  */
 
+int enterRepl()
+{
+    if (State::hasEventLoop()) {
+        return 0;
+    }
+
+    Repl *repl = new Repl;
+    QObject::connect(repl, &QStateMachine::finished,
+                     repl, &QObject::deleteLater);
+    QObject::connect(repl, &QStateMachine::finished,
+                     QCoreApplication::instance(), &QCoreApplication::quit);
+
+    State::setHasEventLoop(true);
+    int rv = QCoreApplication::instance()->exec();
+    State::setHasEventLoop(false);
+    return rv;
+}
+
+bool goInteractive(const QStringList &, State &)
+{
+    enterRepl();
+    return true;
+}
+
+Syntax::List goInteractiveSyntax()
+{
+    Syntax interactive("go_interactive", QString(), &goInteractive);
+    return Syntax::List() << interactive;
+}
+
+void processCommandStream(QTextStream &stream)
+{
+    SyntaxTree::self()->registerSyntax(&goInteractiveSyntax);
+    QString line = stream.readLine();
+    while (!line.isEmpty()) {
+        line = line.trimmed();
+
+        if (!line.isEmpty() && !line.startsWith('#')) {
+            SyntaxTree::self()->run(SyntaxTree::tokenize(line));
+        }
+
+        line = stream.readLine();
+    }
+}
+
 int main(int argc, char *argv[])
 {
     const bool interactive = isatty(fileno(stdin));
     const bool startRepl = (argc == 1) && interactive;
     //TODO: make a json command parse cause that would be awesomesauce
-    const bool startJsonListener = !startRepl &&
-                                   (argc == 2 && qstrcmp(argv[1], "-") == 0);
     const bool fromScript = !startRepl && QFile::exists(argv[1]);
 
-    //qDebug() << "state at startup is" << interactive << startRepl << startJsonListener << fromScript;
+    //qDebug() << "state at startup is" << interactive << startRepl << fromScript;
 
     QCoreApplication app(argc, argv);
     app.setApplicationName(fromScript ? "interactive-app-shell" : argv[0]);
-    //app.setApplicationName(argv[0]);
-
-    if (startRepl || startJsonListener) {
-        if (startRepl) {
-            Repl *repl = new Repl;
-            QObject::connect(repl, &QStateMachine::finished,
-                             repl, &QObject::deleteLater);
-            QObject::connect(repl, &QStateMachine::finished,
-                             &app, &QCoreApplication::quit);
-        }
-
-        if (startJsonListener) {
-//        JsonListener listener(syntax);
-        }
 
-        State::setHasEventLoop(true);
-        return app.exec();
+    if (startRepl) {
+        return enterRepl();
     } else if (fromScript) {
         QFile f(argv[1]);
         if (!f.open(QIODevice::ReadOnly)) { 
             return 1;
         }
 
-        QString line = f.readLine();
-        while (!line.isEmpty()) {
-            line = line.trimmed();
-
-            if (!line.isEmpty() && !line.startsWith('#')) {
-                SyntaxTree::self()->run(SyntaxTree::tokenize(line));
-            }
-
-            line = f.readLine();
-        }
-        exit(0);
+        QTextStream inputStream(&f);
+        processCommandStream(inputStream);
     } else if (!interactive) {
         QTextStream inputStream(stdin);
-
-        QString line = inputStream.readLine();
-        while (!line.isEmpty()) {
-            line = line.trimmed();
-
-            if (!line.isEmpty() && !line.startsWith('#')) {
-                SyntaxTree::self()->run(SyntaxTree::tokenize(line));
-            }
-
-            line = inputStream.readLine();
-        }
+        processCommandStream(inputStream);
     } else {
         QStringList commands = app.arguments();
         commands.removeFirst();
diff --git a/akonadish/state.cpp b/akonadish/state.cpp
index f3f5975..9fb5bcc 100644
--- a/akonadish/state.cpp
+++ b/akonadish/state.cpp
@@ -24,6 +24,8 @@
 #include <QEventLoop>
 #include <QTextStream>
 
+#include "common/log.h"
+
 static bool s_hasEventLoop = false;
 
 class State::Private
@@ -112,6 +114,11 @@ void State::setHasEventLoop(bool evented)
     s_hasEventLoop = evented;
 }
 
+bool State::hasEventLoop()
+{
+    return s_hasEventLoop;
+}
+
 void State::setCommandTiming(bool time)
 {
     d->timing = time;
@@ -122,4 +129,16 @@ bool State::commandTiming() const
     return d->timing;
 }
 
+void State::setLoggingLevel(const QString &level) const
+{
+    Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::debugLevelFromName(level.toLatin1()));
+}
+
+QString State::loggingLevel() const
+{
+    // do not turn this into a single line return: that core dumps due to allocation of
+    // the byte array in Akonadi2::Log
+    QByteArray rv = Akonadi2::Log::debugLevelName(Akonadi2::Log::debugOutputLevel());
+    return rv.toLower();
+}
 
diff --git a/akonadish/state.h b/akonadish/state.h
index 9c1ab6f..3c4c2c7 100644
--- a/akonadish/state.h
+++ b/akonadish/state.h
@@ -39,7 +39,11 @@ public:
     int commandStarted() const;
     void commandFinished(int returnCode = 0) const;
 
+    void setLoggingLevel(const QString &level) const;
+    QString loggingLevel() const;
+
     static void setHasEventLoop(bool evented);
+    static bool hasEventLoop();
 
 private:
     class Private;
diff --git a/akonadish/syntax_modules/akonadi_count.cpp b/akonadish/syntax_modules/akonadi_count.cpp
index 5acdcdd..bb1cd19 100644
--- a/akonadish/syntax_modules/akonadi_count.cpp
+++ b/akonadish/syntax_modules/akonadi_count.cpp
@@ -53,8 +53,6 @@ bool count(const QStringList &args, State &state)
     for (const auto &res : resources) {
         query.resources << res.toLatin1();
     }
-    query.syncOnDemand = false;
-    query.processAll = false;
     query.liveQuery = false;
 
     auto model = AkonadishUtils::loadModel(type, query);
diff --git a/akonadish/syntax_modules/akonadi_list.cpp b/akonadish/syntax_modules/akonadi_list.cpp
index 82f13b5..7709d3b 100644
--- a/akonadish/syntax_modules/akonadi_list.cpp
+++ b/akonadish/syntax_modules/akonadi_list.cpp
@@ -58,8 +58,6 @@ bool list(const QStringList &args, State &state)
     for (const auto &res : resources) {
         query.resources << res.toLatin1();
     }
-    query.syncOnDemand = false;
-    query.processAll = false;
     query.liveQuery = false;
 
     QTime time;
diff --git a/akonadish/syntax_modules/akonadi_stat.cpp b/akonadish/syntax_modules/akonadi_stat.cpp
index 9270f9d..d10556f 100644
--- a/akonadish/syntax_modules/akonadi_stat.cpp
+++ b/akonadish/syntax_modules/akonadi_stat.cpp
@@ -69,8 +69,6 @@ void statResources(const QStringList &resources, const State &state)
 bool statAllResources(State &state)
 {
     Akonadi2::Query query;
-    query.syncOnDemand = false;
-    query.processAll = false;
     query.liveQuery = false;
     auto model = AkonadishUtils::loadModel("resource", query);
 
diff --git a/akonadish/syntax_modules/akonadi_sync.cpp b/akonadish/syntax_modules/akonadi_sync.cpp
index 03abbb4..0c994d0 100644
--- a/akonadish/syntax_modules/akonadi_sync.cpp
+++ b/akonadish/syntax_modules/akonadi_sync.cpp
@@ -43,8 +43,6 @@ bool sync(const QStringList &args, State &state)
     for (const auto &res : args) {
         query.resources << res.toLatin1();
     }
-    query.syncOnDemand = true;
-    query.processAll = true;
 
     QTimer::singleShot(0, [query, state]() {
     Akonadi2::Store::synchronize(query).then<void>([state]() {
diff --git a/akonadish/syntax_modules/core_syntax.cpp b/akonadish/syntax_modules/core_syntax.cpp
index b4812df..ccf96c1 100644
--- a/akonadish/syntax_modules/core_syntax.cpp
+++ b/akonadish/syntax_modules/core_syntax.cpp
@@ -24,6 +24,7 @@
 
 #include "state.h"
 #include "syntaxtree.h"
+#include "utils.h"
 
 namespace CoreSyntax
 {
@@ -145,6 +146,24 @@ bool printSyntaxTree(const QStringList &, State &state)
     return true;
 }
 
+bool setLoggingLevel(const QStringList &commands, State &state)
+{
+    if (commands.count() != 1) {
+        state.printError(QObject::tr("Wrong number of arguments; expected 1 got %1").arg(commands.count()));
+        return false;
+    }
+
+    state.setLoggingLevel(commands.at(0));
+    return true;
+}
+
+bool printLoggingLevel(const QStringList &commands, State &state)
+{
+    const QString level = state.loggingLevel();
+    state.printLine(level);
+    return true;
+}
+
 Syntax::List syntax()
 {
     Syntax::List syntax;
@@ -158,15 +177,22 @@ Syntax::List syntax()
 
     Syntax set("set", QObject::tr("Sets settings for the session"));
     set.children << Syntax("debug", QObject::tr("Set the debug level from 0 to 6"), &CoreSyntax::setDebugLevel);
+
     Syntax setTiming = Syntax("timing", QObject::tr("Whether or not to print the time commands take to complete"));
     setTiming.children << Syntax("on", QString(), [](const QStringList &, State &state) -> bool { state.setCommandTiming(true); return true; });
     setTiming.children << Syntax("off", QString(), [](const QStringList &, State &state) -> bool { state.setCommandTiming(false); return true; });
     set.children << setTiming;
+
+    Syntax logging("logging", QObject::tr("Set the logging level to one of Trace, Log, Warning or Error"), &CoreSyntax::setLoggingLevel);
+    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 << set;
 
     Syntax get("get", QObject::tr("Gets settings for the session"));
     get.children << Syntax("debug", QObject::tr("The current debug level from 0 to 6"), &CoreSyntax::printDebugLevel);
     get.children << Syntax("timing", QObject::tr("Whether or not to print the time commands take to complete"), &CoreSyntax::printCommandTiming);
+    get.children << Syntax("logging", QObject::tr("The current logging level"), &CoreSyntax::printLoggingLevel);
     syntax << get;
 
     return syntax;
diff --git a/akonadish/utils.cpp b/akonadish/utils.cpp
new file mode 100644
index 0000000..d2a28ed
--- /dev/null
+++ b/akonadish/utils.cpp
@@ -0,0 +1,42 @@
+/*
+ *   Copyright (C) 2016 Aaron Seigo <aseigo@kde.org>
+ *
+ *   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 "utils.h"
+
+namespace Utils
+{
+
+QStringList filteredCompletions(const QStringList &possibleCompletions, const QString &commandFragment, Qt::CaseSensitivity cs)
+{
+    if (commandFragment.isEmpty()) {
+        return possibleCompletions;
+    }
+
+    QStringList filtered;
+    for (auto item: possibleCompletions) {
+        if (item.startsWith(commandFragment, cs)) {
+            filtered << item;
+        }
+    }
+
+    return filtered;
+}
+
+} // namespace Utils
+
diff --git a/akonadish/utils.h b/akonadish/utils.h
new file mode 100644
index 0000000..82be8d5
--- /dev/null
+++ b/akonadish/utils.h
@@ -0,0 +1,30 @@
+/*
+ *   Copyright (C) 2016 Aaron Seigo <aseigo@kde.org>
+ *
+ *   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.
+ */
+
+#pragma once
+
+#include <QStringList>
+
+namespace Utils
+{
+
+QStringList filteredCompletions(const QStringList &possibleCompletions, const QString &commandFragment, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+
+} // namespace Utils
+