--- a/bash-completion.sh Wed Dec 09 17:55:03 2020 +0100
+++ b/bash-completion.sh Wed Dec 09 23:53:30 2020 +0100
@@ -31,7 +31,7 @@
"auto"
"dropped"
"literal"
- "literal-with-section-attribute"
+ "section-first"
"standard"
)
--- a/src/CLIParser.h Wed Dec 09 17:55:03 2020 +0100
+++ b/src/CLIParser.h Wed Dec 09 23:53:30 2020 +0100
@@ -57,7 +57,7 @@
if (style == L"auto") return Style::Automatic;
else if (style == L"dropped") return Style::Dropped;
else if (style == L"literal") return Style::Literal;
- else if (style == L"literal-with-section-attribute") return Style::LiteralWithSectionAttribute; // TODO: better names
+ else if (style == L"section-first") return Style::SectionFirst;
else if (style == L"standard") return Style::Standard;
else throw relpipe::cli::RelpipeCLIException(L"Unsupported style option: " + style, relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
}
@@ -80,6 +80,7 @@
currentRelation.relation = readNext(arguments, i);
} else if (option == OPTION_STYLE) {
currentRelation.style = parseStyle(readNext(arguments, i));
+ if (currentRelation.relation.empty()) currentRelation.relation = L".*";
} else if (option == OPTION_WRITER_OPTION) {
c.writerOptions.push_back({readNext(arguments, i), readNext(arguments, i)});
} else throw relpipe::cli::RelpipeCLIException(L"Unsupported CLI option: " + option, relpipe::cli::CLI::EXIT_CODE_BAD_CLI_ARGUMENTS);
--- a/src/Configuration.h Wed Dec 09 17:55:03 2020 +0100
+++ b/src/Configuration.h Wed Dec 09 23:53:30 2020 +0100
@@ -36,7 +36,7 @@
/** Relation name = section name; record = section; attribute = key/value. */
Literal,
/** Like previous style, but the relation name is ignored and the section name is based on the attribute value. This style is useful for generating multiple sections with same keys. */
- LiteralWithSectionAttribute,
+ SectionFirst,
};
class WriterOptionRecipe {
@@ -50,6 +50,7 @@
class RelationConfiguration {
public:
+ /** regular expression */
relpipe::common::type::StringX relation;
Style style = Style::Automatic;
};
--- a/src/INIDispatchHandler.h Wed Dec 09 17:55:03 2020 +0100
+++ b/src/INIDispatchHandler.h Wed Dec 09 23:53:30 2020 +0100
@@ -35,6 +35,7 @@
#include "INIWriter.h"
#include "INIStandardHandler.h"
#include "INILiteralHandler.h"
+#include "INISectionFirstHandler.h"
namespace relpipe {
namespace out {
@@ -65,7 +66,7 @@
if (std::regex_match(name, std::wregex(rc.relation))) {
if (rc.style == Style::Standard) return new INIStandardHandler(writer);
else if (rc.style == Style::Literal) return new INILiteralHandler(writer);
- else if (rc.style == Style::LiteralWithSectionAttribute) return new INILiteralHandler(writer, L"section");
+ else if (rc.style == Style::SectionFirst) return new INISectionFirstHandler(writer);
else if (rc.style == Style::Dropped) return nullptr;
else if (rc.style == Style::Automatic) return createHandlerAuto(name, attributes);
else throw std::invalid_argument("Unsupported style: " + std::to_string((int) rc.style));
--- a/src/INILiteralHandler.h Wed Dec 09 17:55:03 2020 +0100
+++ b/src/INILiteralHandler.h Wed Dec 09 23:53:30 2020 +0100
@@ -39,14 +39,14 @@
class INILiteralHandler : public relpipe::reader::handlers::RelationalReaderStringHandler {
private:
INIWriter& writer;
- relpipe::common::type::StringX sectionAttributeName;
+ bool hasSections = false;
relpipe::common::type::StringX currentSection;
std::vector<relpipe::reader::handlers::AttributeMetadata> currentAttributes;
relpipe::common::type::Integer relationCount = 0;
relpipe::common::type::Integer currentAttributeIndex = 0;
public:
- INILiteralHandler(INIWriter& writer, relpipe::common::type::StringX sectionAttributeName = L"") : writer(writer), sectionAttributeName(sectionAttributeName) {
+ INILiteralHandler(INIWriter& writer) : writer(writer) {
}
virtual ~INILiteralHandler() {
@@ -59,6 +59,7 @@
INIWriter::SectionStartEvent e;
e.name = name;
writer.startSection(e);
+ hasSections = true;
relationCount++;
}
@@ -72,6 +73,7 @@
INIWriter::SectionStartEvent e;
e.name = currentSection;
writer.startSection(e);
+ hasSections = true;
}
INIWriter::EntryEvent e;
@@ -83,7 +85,7 @@
}
void endOfPipe() {
- writer.endSection();
+ if (hasSections) writer.endSection();
}
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/INISectionFirstHandler.h Wed Dec 09 23:53:30 2020 +0100
@@ -0,0 +1,85 @@
+/**
+ * Relational pipes
+ * Copyright © 2020 František Kučera (Frantovo.cz, GlobalCode.info)
+ *
+ * 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, version 3 of the License.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include <locale>
+#include <codecvt>
+
+#include <relpipe/common/type/typedefs.h>
+#include <relpipe/reader/TypeId.h>
+#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
+#include <relpipe/reader/handlers/AttributeMetadata.h>
+
+#include "Configuration.h"
+#include "INIWriter.h"
+
+namespace relpipe {
+namespace out {
+namespace ini {
+
+class INISectionFirstHandler : public relpipe::reader::handlers::RelationalReaderStringHandler {
+private:
+ INIWriter& writer;
+ bool hasSections = false;
+ relpipe::common::type::StringX currentSection;
+ std::vector<relpipe::reader::handlers::AttributeMetadata> currentAttributes;
+ relpipe::common::type::Integer relationCount = 0;
+ relpipe::common::type::Integer currentAttributeIndex = 0;
+public:
+
+ INISectionFirstHandler(INIWriter& writer) : writer(writer) {
+ }
+
+ virtual ~INISectionFirstHandler() {
+ }
+
+ void startRelation(relpipe::common::type::StringX name, std::vector<relpipe::reader::handlers::AttributeMetadata> attributes) override {
+ currentAttributes = attributes;
+ }
+
+ void attribute(const relpipe::common::type::StringX& value) override {
+ if (currentAttributeIndex % currentAttributes.size() == 0) {
+ currentAttributeIndex = 0;
+ if (hasSections) writer.endSection();
+ INIWriter::SectionStartEvent e;
+ e.name = value;
+ writer.startSection(e);
+ hasSections = true;
+ } else {
+ INIWriter::EntryEvent e;
+ e.key = currentAttributes[currentAttributeIndex].getAttributeName();
+ e.value = value;
+ writer.entry(e);
+ }
+
+ currentAttributeIndex++;
+ }
+
+ void endOfPipe() {
+ if (hasSections) writer.endSection();
+ }
+
+};
+
+}
+}
+}