From 991a5cbfea6b4ae6551a17e3e8ec375aec1a2a62 Mon Sep 17 00:00:00 2001
From: Claudius 'keldu' Holeksa <mail@keldu.de>
Date: Wed, 14 Aug 2024 10:38:42 +0200
Subject: Fixed assignement in data server creation

---
 modules/remote-filesystem/c++/remote.hpp      | 12 ++++++-
 modules/remote-filesystem/c++/transfer.hpp    | 49 +++++++++++++++++++++++++
 modules/remote-filesystem/c++/transport.hpp   | 51 ---------------------------
 modules/remote-filesystem/tests/transport.cpp |  6 ++--
 4 files changed, 64 insertions(+), 54 deletions(-)
 create mode 100644 modules/remote-filesystem/c++/transfer.hpp
 delete mode 100644 modules/remote-filesystem/c++/transport.hpp

(limited to 'modules/remote-filesystem')

diff --git a/modules/remote-filesystem/c++/remote.hpp b/modules/remote-filesystem/c++/remote.hpp
index 8390501..0225bc5 100644
--- a/modules/remote-filesystem/c++/remote.hpp
+++ b/modules/remote-filesystem/c++/remote.hpp
@@ -2,6 +2,7 @@
 
 #include <filesystem>
 
+#include <forstio/codec/schema_hash.hpp>
 #include <forstio/remote/remote.hpp>
 
 namespace saw {
@@ -35,6 +36,8 @@ private:
 
 	std::map<std::string, ptr<i_data_server<rmt::File>>> registered_data_servers_;
 public:
+	remote() = default;
+
 	error_or<own<remote_address<rmt::File>>> parse_address(const std::string_view& path_v){
 		return heap<remote_address<rmt::File>>(path_v);
 	}
@@ -47,8 +50,15 @@ public:
 		}
 
 		auto dat_srv = heap<data_server<Schema, Encode, rmt::File>>(*this, addr);
-		insert_res.first->second = {dat_srv};
+		insert_res.first->second = ptr<i_data_server<rmt::File>>{*dat_srv};
 		return dat_srv;
 	}
+
+	/**
+	 * Internal deregister function
+	 */
+	error_or<void> deregister_data_server(ptr<i_data_server<rmt::File>> srv){
+		return make_error<err::not_implemented>();
+	}
 };
 }
diff --git a/modules/remote-filesystem/c++/transfer.hpp b/modules/remote-filesystem/c++/transfer.hpp
new file mode 100644
index 0000000..e3df023
--- /dev/null
+++ b/modules/remote-filesystem/c++/transfer.hpp
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "remote.hpp"
+
+#include <forstio/remote/transfer.hpp>
+
+namespace saw {
+template<typename Schema, typename Encoding>
+class data_server<Schema, Encoding, rmt::File> final : public i_data_server<rmt::File> {
+private:
+	ptr<remote<rmt::File>> remote_;
+	remote_address<rmt::File> addr_;
+public:
+	static constexpr std::pair<uint32_t,uint32_t> class_id{schema_hash<Schema>::apply(), schema_hash<Encoding>::apply()};
+
+	data_server(ptr<remote<rmt::File>> remote__, ref<remote_address<rmt::File>> addr__):
+		remote_{remote__},
+		addr_{addr__()}
+	{}
+
+	~data_server(){
+		remote_().deregister_data_server(*this);
+	}
+
+	SAW_FORBID_MOVE(data_server);
+	SAW_FORBID_COPY(data_server);
+
+	std::pair<uint32_t,uint32_t> get_class_id() const override {
+		return class_id;
+	}
+
+	error_or<void> send(const data<Schema, Encoding>& dat, id<Schema> store_id){
+		return make_error<err::not_implemented>();
+	}
+
+	error_or<void> allocate(data<typename meta_schema<Schema>::MetaSchema, Encoding> meta, id<Schema> store_id){
+		return make_error<err::not_implemented>();
+	}
+
+	error_or<void> erase(id<Schema> store_id){
+		return make_error<err::not_implemented>();
+	}
+
+	error_or<data<Schema,Encoding>> receive(id<Schema> store_id){
+		return make_error<err::not_implemented>();
+	}
+
+};
+}
diff --git a/modules/remote-filesystem/c++/transport.hpp b/modules/remote-filesystem/c++/transport.hpp
deleted file mode 100644
index 0db4600..0000000
--- a/modules/remote-filesystem/c++/transport.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "remote.hpp"
-
-#include <forstio/remote/transport.hpp>
-
-namespace saw {
-template<typename Schema, typename Encode>
-class data_server<Schema, Encode, rmt::File> final : public i_data_server<rmt::File> {
-private:
-	ptr<remote<rmt::File>> remote_;
-	remote_address<rmt::File> addr_;
-public:
-	static constexpr std::pair<uint32_t,uint32_t> class_id{schema_hash<Schema>::apply(), schema_hash<Encoding>::apply()};
-
-	data_server(ptr<remote<rmt::File>> remote__, ref<remote_address<rmt::File>> addr__):
-		remote_{remote__},
-		addr_{addr__()}
-	{}
-
-	~data_server(){
-		remote().deregister_data_server(*this);
-	}
-
-	SAW_FORBID_MOVE(data_server);
-	SAW_FORBID_COPY(data_server);
-
-	std::pair<uint32_t,uint32_t> get_class_id() const override {
-		return class_id;
-	}
-
-	error_or<void> send(const data<Schema, Encoding>& dat, id<Schema> store_id){
-		try {
-		}
-		return make_error<err::not_implemented>();
-	}
-
-	error_or<void> allocate(data<typename meta_schema<Schema>::MetaSchema, Encoding> meta, id<Schema> store_id){
-		return make_error<err::not_implemented>();
-	}
-
-	error_or<void> erase(id<Schema> store_id){
-		return make_error<err::not_implemented>();
-	}
-
-	error_or<data<Schema,Encoding>> receive(id<Schema> store_id){
-		return make_error<err::not_implemented>();
-	}
-
-};
-}
diff --git a/modules/remote-filesystem/tests/transport.cpp b/modules/remote-filesystem/tests/transport.cpp
index 05c13a6..e8df294 100644
--- a/modules/remote-filesystem/tests/transport.cpp
+++ b/modules/remote-filesystem/tests/transport.cpp
@@ -1,5 +1,7 @@
 #include <forstio/test/suite.hpp>
-#include "../c++/transport.hpp"
+#include "../c++/transfer.hpp"
+
+#include <forstio/codec/simple.hpp>
 
 namespace {
 namespace sch {
@@ -20,7 +22,7 @@ SAW_TEST("File Remote"){
 	SAW_EOV_EXPECT(eo_addr, "Couldn't parse file");
 	auto& addr = eo_addr.get_value();
 
-	auto eo_dat_srv = file_remote.data_listen({*addr});
+	auto eo_dat_srv = file_remote.template data_listen<sch::Foo,encode::KelSimple>({*addr});
 	SAW_EOV_EXPECT(eo_dat_srv, "Couldn't setup data server.");
 	auto& dat_srv = eo_dat_srv.get_value();
 
-- 
cgit v1.2.3