fixes to saving userdata

mail.h

@@ -2,12 +2,14 @@
 
 #include "user_handler.h"
 
+#include <nlohmann/json_fwd.hpp>
 #include <string>
 #include <vector>
 #include <filesystem>
 #include <fstream>
 
 namespace fs = std::filesystem;
+using json = nlohmann::json;
 
 struct mail {
 	std::string filename;

server.cpp

@@ -49,7 +49,6 @@ std::string get_sha1(const std::string& p_arg);
 
 // from myserver.c
 void *clientCommunication(void *data);
-inline std::string recvToStr(int __fd, size_t __n, int __flags);
 void signalHandler(int sig);
 
 inline void exiting();
@@ -193,15 +192,31 @@ void *clientCommunication(void *data)
 	}
 
 	do {
-		std::string message;
+		size = recv(*current_socket, buffer, BUF - 1, 0);
-		try {
+		if (size == -1) {
-			message = recvToStr(*current_socket, BUF - 1, 0);
+			if (abortRequested) {
+				perror("recv error after aborted");
+			} else {
+				perror("recv error");
 			}
-		catch(...) {
 			break;
 		}
 
-		std::stringstream ss(message.c_str());
+		if (size == 0) {
+			printf("Client closed remote socket\n"); // ignore error
+			break;
+		}
+
+		// remove ugly debug message, because of the sent newline of client
+		if (buffer[size - 2] == '\r' && buffer[size - 1] == '\n') {
+			size -= 2;
+		} else if (buffer[size - 1] == '\n') {
+			--size;
+		}
+
+		buffer[size] = '\0';
+
+		std::stringstream ss(buffer);
 		std::string line;
 
 		std::vector<std::string> lines;
@@ -219,22 +234,6 @@ void *clientCommunication(void *data)
 		else if (boost::iequals(lines.at(0), "DEL")) cmd = DEL;
 		else if (boost::iequals(lines.at(0), "QUIT")) cmd = QUIT;
 
-		if (cmd == SEND && !boost::equals(lines.back(), ".\n")) {
-			try {
-				message.append(recvToStr(*current_socket, BUF - 1, 0));
-				std::stringstream ss(message.c_str()); // inefficient to repeat
-				std::string line;
-
-				lines.clear();
-				while (std::getline(ss, line, '\n')) {
-					lines.push_back(line);
-				}
-			}
-			catch(...) {
-				break;
-			}
-		}
-
 		switch (cmd) {
 			case SEND:
 				if (lines.at(3).length() > 80) {
@@ -242,6 +241,12 @@ void *clientCommunication(void *data)
 					break;
 				}
 
+				if (lines.size() > 5) {
+					for (std::vector<std::string>::iterator it = lines.begin() + 5; it != lines.end() && *it != "."; it++) {
+						lines.at(4).append("\n").append(*it);
+					}
+				}
+
 				user_handler::getInstance()->getUser(lines.at(1))->sendMail(
 					new struct mail(saveToFile(user_handler::getInstance()->getSpoolDir()/"messages", lines.at(4)), std::time(0), lines.at(3)),
 					{lines.at(2)}
@@ -276,38 +281,6 @@ void *clientCommunication(void *data)
 	return NULL;
 }
 
-inline std::string recvToStr(int __fd, size_t __n, int __flags)
-{
-	char buffer[BUF];
-	int size;
-
-	size = recv(__fd, buffer, __n, __flags);
-	if (size == -1) {
-		if (abortRequested) {
-			perror("recv error after aborted");
-		} else {
-			perror("recv error");
-		}
-		throw std::exception().what();
-	}
-
-	if (size == 0) {
-		printf("Client closed remote socket\n"); // ignore error
-		throw std::exception().what();
-	}
-
-	// remove ugly debug message, because of the sent newline of client
-	if (buffer[size - 2] == '\r' && buffer[size - 1] == '\n') {
-		size -= 2;
-	} else if (buffer[size - 1] == '\n') {
-		--size;
-	}
-
-	buffer[size] = '\0';
-
-	return buffer;
-}
-
 void signalHandler(int sig)
 {
 	if (sig == SIGINT) {
@@ -370,5 +343,5 @@ std::string get_sha1(const std::string& p_arg)
 inline void exiting()
 {
 	user_handler::getInstance()->saveAll();
-	printf("Saving...\n");
+	printf("Saving...	\n");
 }

user.cpp

@@ -16,6 +16,18 @@ user::user(fs::path user_data_json)
 	json user = json::parse(ifs);
 
 	this->name = user["name"];
+	for ( auto& mail_json : user["mails"]["received"] ) {
+		mail* mail = new struct mail(
+			mail_json["filename"],
+			mail_json["timestamp"],
+			mail_json["subject"]
+		);
+		mail->id = mail_json["id"];
+		mail->sender = mail_json["sender"];
+		mail->recipients = mail_json["recipients"].get<std::vector<std::string>>();
+		
+		this->inbox.insert(mail);
+	}
 }
 
 user::user(std::string name, fs::path user_dir)
@@ -42,6 +54,8 @@ void user::addMail(mail* mail)
 
 	this->inbox.insert(mail);
 	this->user_data["mails"]["received"][std::to_string(mail->id)] = mail->mailToJson();
+
+	printf("%s\n", this->user_data.dump().c_str());
 }
 
 void user::sendMail(mail* mail, std::vector<std::string> recipients) 

user.h

@@ -1,20 +1,18 @@
 #pragma once
 
+#include "mail.h"
+
 #include <string>
 #include <set>
 #include <vector>
 
 #include <nlohmann/json.hpp>
 
-namespace fs = std::filesystem;
+struct comp {
-using json = nlohmann::json;
+	bool operator()(mail* left, mail* right) const { return *left < *right; };
+};
 
-struct mail;
+typedef std::set<mail*, comp> maillist;
-
-template <typename T>
-static const bool ptr_cmp(T* left, T* right) { return *left < *right; };
-
-typedef std::set<mail*, decltype(ptr_cmp<mail>)*> maillist;
 
 class user {
 public:

user_handler.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "user.h"
-
 #include <filesystem>
 #include <map>
 #include <string>
 
+class user;
+
 namespace fs = std::filesystem;
 
 /* singleton for handling users */