--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FilesystemCommand.h Mon Jan 20 13:19:23 2020 +0100
@@ -0,0 +1,83 @@
+/**
+ * Relational pipes
+ * Copyright © 2019 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 <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <map>
+#include <memory>
+#include <algorithm>
+#include <filesystem>
+
+#include <pwd.h>
+#include <grp.h>
+#include <sys/stat.h>
+
+#include <sys/xattr.h>
+
+#include <relpipe/writer/typedefs.h>
+
+#include "Configuration.h"
+#include "AttributeFinder.h"
+#include "FileAttributeFinder.h"
+#include "XattrAttributeFinder.h"
+#include "StreamletAttributeFinder.h"
+
+namespace relpipe {
+namespace in {
+namespace filesystem {
+
+namespace fs = std::filesystem;
+using namespace relpipe::writer;
+
+class FilesystemCommand {
+protected:
+ std::wstring_convert<codecvt_utf8<wchar_t>> convertor; // TODO: support also other encodings.
+
+ std::map<string_t, std::shared_ptr<AttributeFinder>> createAttributeFinders() {
+ return {
+ {RequestedField::GROUP_FILE, std::make_shared<FileAttributeFinder>()},
+ {RequestedField::GROUP_STREAMLET, std::make_shared<StreamletAttributeFinder>()},
+ {RequestedField::GROUP_XATTR, std::make_shared<XattrAttributeFinder>()}};
+ }
+
+ void reset(std::stringstream& stream) {
+ stream.str("");
+ stream.clear();
+ }
+
+ bool readNext(std::istream& input, std::stringstream& originalName) {
+ for (char ch; input.get(ch);) {
+ if (ch == 0) return true;
+ else originalName << ch;
+ }
+ return originalName.tellp();
+ }
+
+public:
+
+ virtual ~FilesystemCommand() = default;
+
+ virtual void process(std::istream& input, std::ostream& output, Configuration& configuration) = 0;
+};
+
+}
+}
+}
--- a/src/FilesystemCommandBase.h Mon Jan 20 13:11:50 2020 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/**
- * Relational pipes
- * Copyright © 2019 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 <cstdlib>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
-#include <algorithm>
-#include <filesystem>
-
-#include <pwd.h>
-#include <grp.h>
-#include <sys/stat.h>
-
-#include <sys/xattr.h>
-
-#include <relpipe/writer/typedefs.h>
-
-#include "Configuration.h"
-#include "AttributeFinder.h"
-#include "FileAttributeFinder.h"
-#include "XattrAttributeFinder.h"
-#include "StreamletAttributeFinder.h"
-
-namespace relpipe {
-namespace in {
-namespace filesystem {
-
-namespace fs = std::filesystem;
-using namespace relpipe::writer;
-
-class FilesystemCommandBase {
-protected:
- std::wstring_convert<codecvt_utf8<wchar_t>> convertor; // TODO: support also other encodings.
-
- std::map<string_t, std::shared_ptr<AttributeFinder>> createAttributeFinders() {
- return {
- {RequestedField::GROUP_FILE, std::make_shared<FileAttributeFinder>()},
- {RequestedField::GROUP_STREAMLET, std::make_shared<StreamletAttributeFinder>()},
- {RequestedField::GROUP_XATTR, std::make_shared<XattrAttributeFinder>()}};
- }
-
- void reset(std::stringstream& stream) {
- stream.str("");
- stream.clear();
- }
-
- bool readNext(std::istream& input, std::stringstream& originalName) {
- for (char ch; input.get(ch);) {
- if (ch == 0) return true;
- else originalName << ch;
- }
- return originalName.tellp();
- }
-
-public:
-
- virtual ~FilesystemCommandBase() = default;
-
- virtual void process(std::istream& input, std::ostream& output, Configuration& configuration) = 0;
-};
-
-}
-}
-}
--- a/src/ParallelFilesystemCommand.h Mon Jan 20 13:11:50 2020 +0100
+++ b/src/ParallelFilesystemCommand.h Mon Jan 20 13:19:23 2020 +0100
@@ -16,7 +16,7 @@
*/
#pragma once
-#include "FilesystemCommandBase.h"
+#include "FilesystemCommand.h"
namespace relpipe {
namespace in {
@@ -25,7 +25,7 @@
namespace fs = std::filesystem;
using namespace relpipe::writer;
-class ParallelFilesystemCommand : public FilesystemCommandBase {
+class ParallelFilesystemCommand : public FilesystemCommand {
public:
void process(std::istream& input, std::ostream& output, Configuration& configuration) {
--- a/src/PlainFilesystemCommand.h Mon Jan 20 13:11:50 2020 +0100
+++ b/src/PlainFilesystemCommand.h Mon Jan 20 13:19:23 2020 +0100
@@ -16,7 +16,7 @@
*/
#pragma once
-#include "FilesystemCommandBase.h"
+#include "FilesystemCommand.h"
namespace relpipe {
namespace in {
@@ -25,7 +25,7 @@
namespace fs = std::filesystem;
using namespace relpipe::writer;
-class PlainFilesystemCommand : public FilesystemCommandBase {
+class PlainFilesystemCommand : public FilesystemCommand {
private:
std::map<string_t, std::shared_ptr<AttributeFinder>> attributeFinders = createAttributeFinders();
--- a/src/relpipe-in-filesystem.cpp Mon Jan 20 13:11:50 2020 +0100
+++ b/src/relpipe-in-filesystem.cpp Mon Jan 20 13:19:23 2020 +0100
@@ -47,7 +47,7 @@
try {
CLIParser cliParser;
Configuration configuration = cliParser.parse(cli.arguments());
- std::unique_ptr<FilesystemCommandBase> command;
+ std::unique_ptr<FilesystemCommand> command;
if (configuration.parallelism == 1) command = std::make_unique<PlainFilesystemCommand>();
else command = std::make_unique<ParallelFilesystemCommand>();
command->process(cin, cout, configuration);