Merge branch 'feature/akonadish_log_control' into develop

9 files changed, 139 insertions, 27 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..140c741 100644
--- a/akonadish/akonadish_utils.cpp
+++ b/akonadish/akonadish_utils.cpp
@@ -22,6 +22,8 @@
 
 #include "common/clientapi.h"
 
+#include "utils.h"
+
 namespace AkonadishUtils
 {
 
@@ -98,40 +100,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/state.cpp b/akonadish/state.cpp
index 85cbe10..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
@@ -127,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 b1ca358..3c4c2c7 100644
--- a/akonadish/state.h
+++ b/akonadish/state.h
@@ -39,6 +39,9 @@ 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();
 
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
+
diff --git a/common/log.cpp b/common/log.cpp
index c33c700..489e1bd 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -96,7 +96,7 @@ static QString colorCommand(QList<int> colorCodes)
     return string;
 }
 
-QByteArray debugLevelName(DebugLevel debugLevel)
+QByteArray Akonadi2::Log::debugLevelName(DebugLevel debugLevel)
 {
     switch (debugLevel) {
         case DebugLevel::Trace:
@@ -114,15 +114,16 @@ QByteArray debugLevelName(DebugLevel debugLevel)
     return QByteArray();
 }
 
-DebugLevel debugLevelFromName(const QByteArray &name)
+DebugLevel Akonadi2::Log::debugLevelFromName(const QByteArray &name)
 {
-    if (name.toLower() == "trace")
+    const QByteArray lowercaseName = name.toLower();
+    if (lowercaseName == "trace")
         return DebugLevel::Trace;
-    if (name.toLower() == "log")
+    if (lowercaseName == "log")
         return DebugLevel::Log;
-    if (name.toLower() == "warning")
+    if (lowercaseName == "warning")
         return DebugLevel::Warning;
-    if (name.toLower() == "error")
+    if (lowercaseName == "error")
         return DebugLevel::Error;
     return DebugLevel::Log;
 }
@@ -132,6 +133,11 @@ void Akonadi2::Log::setDebugOutputLevel(DebugLevel debugLevel)
     qputenv("AKONADI2DEBUGLEVEL", debugLevelName(debugLevel));
 }
 
+Akonadi2::Log::DebugLevel Akonadi2::Log::debugOutputLevel()
+{
+    return debugLevelFromName(qgetenv("AKONADI2DEBUGLEVEL"));
+}
+
 QDebug Akonadi2::Log::debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea)
 {
     DebugLevel debugOutputLevel = debugLevelFromName(qgetenv("AKONADI2DEBUGLEVEL"));
diff --git a/common/log.h b/common/log.h
index 9db9e8e..e531348 100644
--- a/common/log.h
+++ b/common/log.h
@@ -12,7 +12,11 @@ enum DebugLevel {
     Error
 };
 
+QByteArray debugLevelName(DebugLevel debugLevel);
+DebugLevel debugLevelFromName(const QByteArray &name);
+
 void setDebugOutputLevel(DebugLevel);
+DebugLevel debugOutputLevel();
 
 QDebug debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea = 0);