From 8952f17e278088be95094ddb8e81a09131c9154b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 10 Oct 2017 17:16:49 +0200 Subject: hawd json output module --- tests/hawd/CMakeLists.txt | 1 + tests/hawd/dataset.cpp | 22 ++++++++++-- tests/hawd/dataset.h | 4 ++- tests/hawd/module.cpp | 2 ++ tests/hawd/modules/json.cpp | 87 +++++++++++++++++++++++++++++++++++++++++++++ tests/hawd/modules/json.h | 37 +++++++++++++++++++ 6 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 tests/hawd/modules/json.cpp create mode 100644 tests/hawd/modules/json.h (limited to 'tests') diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt index 7546920..8c9b389 100644 --- a/tests/hawd/CMakeLists.txt +++ b/tests/hawd/CMakeLists.txt @@ -23,6 +23,7 @@ set(SRCS modules/list.cpp modules/check.cpp modules/print.cpp + modules/json.cpp ) add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS}) diff --git a/tests/hawd/dataset.cpp b/tests/hawd/dataset.cpp index fb2d7e6..62fa0d7 100644 --- a/tests/hawd/dataset.cpp +++ b/tests/hawd/dataset.cpp @@ -77,6 +77,11 @@ void Dataset::Row::setValue(const QString &col, const QVariant &value) } } +QVariant Dataset::Row::value(const QString &col) const +{ + return m_data.value(col); +} + void Dataset::Row::annotate(const QString ¬e) { m_annotation = note; @@ -176,6 +181,19 @@ QString Dataset::tableHeaders(const QStringList &cols, int standardCols, const Q return strings.join(seperator); } + +QString Dataset::Row::commitHash() const +{ + return m_commitHash; +} + +QDateTime Dataset::Row::timestamp() const +{ + QDateTime dt; + dt.setMSecsSinceEpoch(m_key); + return dt; +} + QString Dataset::Row::toString(const QStringList &cols, int standardCols, const QString &seperator) const { if (m_data.isEmpty()) { @@ -185,9 +203,7 @@ QString Dataset::Row::toString(const QStringList &cols, int standardCols, const QStringList strings; if (standardCols & Timestamp) { - QDateTime dt; - dt.setMSecsSinceEpoch(m_key); - strings << dt.toString("yyMMdd:hhmmss").leftJustified(s_fieldWidth, ' '); + strings << timestamp().toString("yyMMdd:hhmmss").leftJustified(s_fieldWidth, ' '); } if (standardCols & CommitHash) { diff --git a/tests/hawd/dataset.h b/tests/hawd/dataset.h index bb2aae5..9660709 100644 --- a/tests/hawd/dataset.h +++ b/tests/hawd/dataset.h @@ -47,7 +47,9 @@ public: Row(const Row &other); Row &operator=(const Row &rhs); void setValue(const QString &column, const QVariant &value); - QVariant value(const QString &column); + QVariant value(const QString &column) const; + QString commitHash() const; + QDateTime timestamp() const; void annotate(const QString ¬e); void setCommitHash(const QString &hash); qint64 key() const; diff --git a/tests/hawd/module.cpp b/tests/hawd/module.cpp index 7753b44..0fcbfc6 100644 --- a/tests/hawd/module.cpp +++ b/tests/hawd/module.cpp @@ -22,6 +22,7 @@ #include "modules/list.h" #include "modules/check.h" #include "modules/print.h" +#include "modules/json.h" #include @@ -53,6 +54,7 @@ void Module::loadModules() addModule(Check()); addModule(CheckAll()); addModule(Print()); + addModule(Json()); // addModule(Annotate()); // addModule(Remove()); } diff --git a/tests/hawd/modules/json.cpp b/tests/hawd/modules/json.cpp new file mode 100644 index 0000000..d08df49 --- /dev/null +++ b/tests/hawd/modules/json.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2017 Christian Mollekopf + * + * 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 "json.h" + +#include "../datasetdefinition.h" +#include "../dataset.h" + +#include +#include +#include +#include +#include +#include + +#include + +namespace HAWD +{ + +Json::Json() + : Module() +{ + Syntax top("json", &Json::toJson); + setSyntax(top); + setDescription(QObject::tr("Prints a table from a dataset to json; you can provide a list of rows to output")); +} + +bool Json::toJson(const QStringList &commands, State &state) +{ + if (commands.isEmpty()) { + std::cout << QObject::tr("print requires a dataset to be named").toStdString() << std::endl; + return true; + } + + const QString datasetName = commands.first(); + + QDir project(state.projectPath()); + Dataset dataset(datasetName, state); + + if (!dataset.isValid()) { + std::cout << QObject::tr("The dataset %1 could not be loaded; try checking it with the check command").arg(datasetName).toStdString() << std::endl; + return true; + } + + auto definition = state.datasetDefinition(datasetName); + + QJsonObject json; + json.insert("dataset", datasetName); + json.insert("description", definition.description()); + + const auto columns = definition.columns(); + + QJsonArray array; + dataset.eachRow( + [&](const Dataset::Row &row) { + QJsonObject jsonRow; + jsonRow.insert("timestamp", QJsonValue::fromVariant(row.timestamp())); + jsonRow.insert("commit", row.commitHash()); + for (const auto &col : columns) { + jsonRow.insert(col.first, QJsonValue::fromVariant(row.value(col.first))); + } + array.append(jsonRow); + }); + json.insert("rows", array); + std::cout << QJsonDocument{json}.toJson().toStdString() << std::endl; + return true; +} + +} // namespace HAWD + diff --git a/tests/hawd/modules/json.h b/tests/hawd/modules/json.h new file mode 100644 index 0000000..75f7171 --- /dev/null +++ b/tests/hawd/modules/json.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2017 Christian Mollekopf + * + * 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 "module.h" + +namespace HAWD +{ + +class Json : public Module +{ +public: + Json(); + +private: + static bool toJson(const QStringList &commands, State &state); +}; + +} // namespace HAWD + -- cgit v1.2.3