--- a/src/FilesystemCommand.h	Sat Jan 25 16:37:20 2020 +0100
+++ b/src/FilesystemCommand.h	Sat Jan 25 21:28:37 2020 +0100
@@ -39,6 +39,7 @@
 #include "FileAttributeFinder.h"
 #include "XattrAttributeFinder.h"
 #include "StreamletAttributeFinder.h"
+#include "FilesystemWorker.h"
 
 namespace relpipe {
 namespace in {
@@ -47,65 +48,7 @@
 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();
-	}
-
-	string_t fetchRelationName(Configuration* configuration) {
-		return configuration->relation.empty() ? L"filesystem" : configuration->relation;
-	}
-
-	void writeHeader(RelationalWriter* writer, std::map<string_t, std::shared_ptr < AttributeFinder>> attributeFinders, string_t relationName, std::vector<RequestedField>* fields, bool writeHeader = true) {
-		std::vector<AttributeMetadata> attributesMetadata;
-		for (RequestedField field : *fields) {
-			std::shared_ptr<AttributeFinder> finder = attributeFinders[field.group];
-			if (finder) for (AttributeMetadata m : finder->toMetadata(writer, relationName, field)) attributesMetadata.push_back(m);
-			else throw RelpipeWriterException(L"Unsupported field group: " + field.group);
-		}
-
-		writer->startRelation(relationName, attributesMetadata, writeHeader);
-	}
-
-	void processSingleFile(std::shared_ptr<RelationalWriter> writer, std::stringstream& originalName, std::map<string_t, std::shared_ptr < AttributeFinder>>&attributeFinders, Configuration& configuration, string_t relationName) {
-		fs::path file(originalName.str().empty() ? "." : originalName.str()); // interpret empty string as current directory (e.g. result of: find -printf '%P\0')
-		bool exists = false;
-
-		try {
-			exists = fs::exists(file);
-		} catch (const fs::filesystem_error& e) {
-			// we probably do not have permissions to given directory → pretend that the file does not exist
-		}
-
-		for (auto& finder : attributeFinders) finder.second->startFile(file, originalName.str(), exists);
-
-		for (RequestedField field : configuration.fields) {
-			std::shared_ptr<AttributeFinder> finder = attributeFinders[field.group]; // should not be nullptr, because already checked while writing the relation metadata
-			finder->writeField(writer.get(), relationName, field);
-		}
-
-		for (auto& finder : attributeFinders) finder.second->endFile();
-	}
-
+class FilesystemCommand : public FilesystemWorker {
 public:
 
 	virtual ~FilesystemCommand() = default;