(2/2) rename

1 files changed, 4 insertions, 31 deletions

diff --git a/FileReader.cpp b/FileReader.cpp
index 4b72b11..b76de50 100644
--- a/FileReader.cpp
+++ b/FileReader.cpp
@@ -1,36 +1,9 @@
-#include <memory>
+#include <string>
 
-#include "FileReaderFactory.h"
 #include "FileReader.h"
+#include "FileReaderFactory.h"
 
-using namespace std;
-
-unique_ptr<FileReader> FileReaderFactory::open(const std::string url) {
-	FileReader * reader = find_reader(url)->clone();
-	reader->open(url);
-	return unique_ptr<FileReader>(reader);
-}
-
-void FileReaderFactory::register_strategy(const std::string type, const FileReader * node) {
-	static FactoryMap & map = get_map();
-	map[type] = node;
-}
-
-FactoryMap & FileReaderFactory::get_map() {
-	static FactoryMap map;
-	return map;
-}
-
-const FileReader * FileReaderFactory::find_reader(const std::string type) {
-	static FactoryMap & map = get_map();
-
-	// try to find protocol by prefix
-	for (auto item : map) {
-		if (!type.starts_with(item.first)) continue;
-		return item.second;
-	}
-
-	// fallback is local file
-	return map.find("file://")->second;
+FileReader::FileReader(const std::string protocol) {
+	FileReaderFactory::register_strategy(protocol, this);
 }