Custom layouts, disconnect client by hand

Author: Tetrapak0

Server/include/Config.h

@@ -50,39 +50,42 @@ class profile {
 
 class id {
 public:
-	int current_profile = 0;
-	bool locked = false;
 	string ID;
+	string nickname;
 	string config_file;
+	sockinfo sock;
 	json config;
 	vector<profile> profiles;
+	int current_profile = 0;
+	bool locked = false;
 	id() {}
 	id(string in_ID) : ID(in_ID) {};
 	id(const id& ID) {
 		this->ID = ID.ID;
+		this->current_profile = ID.current_profile;
+		this->nickname = ID.nickname;
+		this->sock = ID.sock;
 		this->config_file = ID.config_file;
+		this->config = ID.config;
 		this->profiles = ID.profiles;
 	}
 	id(const id* ID) {
 		this->ID = ID->ID;
+		this->current_profile = ID->current_profile;
+		this->nickname = ID->nickname;
+		this->sock = ID->sock;
 		this->config_file = ID->config_file;
+		this->config = ID->config;
 		this->profiles = ID->profiles;
 	}
-	bool operator==(const id& other) const {
-		return this->ID == other.ID;
-	}
-	id operator=(const id& other) {
-		this->config_file = other.config_file;
-		this->profiles = other.profiles;
-		return this;
-	}
 };
 
-extern vector<id> ids;
+extern unordered_map<string, id> ids;
 
 extern bool ids_locked;
+extern bool button_cleared;
 
 extern void clear_button(int profile, int page, int button);
-extern void configure_id(id& ID);
-extern void reconfigure(id& ID);
+extern int configure_id(id& ID);
+extern int reconfigure(id& ID);
 extern void write_config(vector<string> args, size_t arg_size);

Server/include/GUI.h

@@ -52,9 +52,8 @@ extern bool should_draw_button_properties;
 extern bool clear_dialog_shown;
 
 extern int button_properties_to_draw;
-extern int selected_id;
 
-extern std::string selected_id_id;
+extern std::string selected_id;
 
 extern int gui_init();
 extern int tray_init();

Server/include/Header.h

@@ -30,7 +30,3 @@ using std::unordered_map;
 using std::to_string;
 
 extern bool done;
-extern bool button_cleared;
-
-extern int selected_id;
-extern int connected_devices;

Server/include/Server.h

@@ -21,7 +21,7 @@ struct sockinfo {
 	struct addrinfo* result = NULL;
 };
 
-extern unordered_map<string, sockinfo> sock_map;
+extern int connected_devices;
 
 extern int server_init();
 
@@ -33,5 +33,5 @@ extern int accept_socket(sockinfo& sock, char* idbuf, bool& is_valid);
 extern bool is_id(string message);
 
 extern void begin_accept_cycle(sockinfo& sock);
-extern void comm();
+extern void comm(string ID);
 extern void parse_message(string& message, id& ID);

Server/src/Config.cpp

@@ -1,12 +1,14 @@
 #include "../include/Header.h"
 #include "../include/Config.h"
+#include "../include/GUI.h"
 
 bool button_cleared = false;
 bool ids_locked = false;
 
-vector<id> ids = {};
+unordered_map<string, id> ids = {};
 
 void read_config(json& config, id& ID) {
+	if (config[config.begin().key()].contains("nickname")) ID.nickname = config[config.begin().key()]["nickname"].get<string>();
 	if (config[config.begin().key()].contains("profiles")) {
 		ID.profiles.clear();
 		int profile_count = 0;
@@ -70,7 +72,7 @@ void read_config(json& config, id& ID) {
 	}
 }
 
-void configure_id(id& ID) {
+int configure_id(id& ID) {
 	ID.config_file = getenv("USERPROFILE");
 	ID.config_file += "\\AppData\\Roaming\\NexusShell\\";
 	if (!exists(ID.config_file)) create_directory(ID.config_file);
@@ -82,20 +84,16 @@ void configure_id(id& ID) {
 		if (reader.peek() != ifstream::traits_type::eof()) {
 			try {
 				json config = json::parse(reader);
-				cerr << "here\n";
 				reader.close();
 				read_config(config, ID);
 				reconfigure(ID);
-				cerr << "configured\n";
-				return;
+				cerr << "Configured " << ID.nickname << "\n";
+				return 0;
 			} catch (...) {
-				cerr << "invalid config!\nclearing...\n";		// TODO: Don't clear invalid configs
-				//string to_write = "{\"" + ID.ID + "\": {}}";
-				//json empty_config = json::parse(to_write);
-				//ofstream writer(ID.config_file);
-				//writer << empty_config.dump(4);
-				//writer.close();
-				//reconfigure(ID);
+				cerr << "invalid config!\n";
+				send(ID.sock.ClientSocket, "killreason: invalid config", strlen("killreason: invalid config") + 1, 0);
+				closesocket(ID.sock.ClientSocket);
+				return 1;
 			}
 		}
 		reader.close();
@@ -112,19 +110,22 @@ void configure_id(id& ID) {
 	reconfigure(ID);
 }
 
-void reconfigure(id& ID) {
+int reconfigure(id& ID) {
 	if (exists(ID.config_file)) {
 		ifstream reader(ID.config_file);
 		json config;
 		try {
 			config = json::parse(reader);
 		} catch (...) {
 			cerr << "Invalid Config\n";
+			send(ID.sock.ClientSocket, "killreason: invalid config", strlen("killreason: invalid config") + 1, 0);
+			closesocket(ID.sock.ClientSocket);
 			reader.close();
-			return;	// TODO: Change all functions that oculd fail to int and return 1
+			return 1;	// TODO: Change all functions that oculd fail to int and return 1
 		}
 		reader.close();
-		ID.config = config;
+		ID.config = config;	// TODO: use instead;
+		if (config[config.begin().key()].contains("nickname"))	config[config.begin().key()].erase("nickname");
 		for (int i = 0; i < ID.profiles.size(); ++i) {
 			json& profile_store = config[config.begin().key()]["profiles"][to_string(i)];
 			if (profile_store.contains("pages")) {
@@ -149,8 +150,7 @@ void reconfigure(id& ID) {
 			}
 		}
 		string configuration = "cfg" + config.dump();
-		sock_map[ID.ID].iSendResult = send(sock_map[ID.ID].ClientSocket, configuration.c_str(), configuration.length(), 0);
-		cerr << "here: " << sock_map[ID.ID].iSendResult << "\n";
+		ID.sock.iSendResult = send(ID.sock.ClientSocket, configuration.c_str(), configuration.length(), 0);
 	}
 }
 
@@ -162,14 +162,14 @@ void clear_button(int profile, int page, int button) {
 		return;
 	}
 	nxsh_config += "\\";
-	nxsh_config += CURRENT_ID.ID;
+	nxsh_config += selected_id;
 	nxsh_config += ".json";
 	json to_remove;
 	ifstream reader(nxsh_config);
 	if (reader && reader.peek() != ifstream::traits_type::eof()) to_remove = json::parse(reader);	// FIXME: no if (reader
 	reader.close();
-	if (to_remove[CURRENT_ID.ID]["profiles"][to_string(profile)]["pages"][to_string(page)]["buttons"].contains(to_string(button))) {
-		to_remove[CURRENT_ID.ID]["profiles"][to_string(profile)]["pages"][to_string(page)]["buttons"].erase(to_string(button));
+	if (to_remove[selected_id]["profiles"][to_string(profile)]["pages"][to_string(page)]["buttons"].contains(to_string(button))) {
+		to_remove[selected_id]["profiles"][to_string(profile)]["pages"][to_string(page)]["buttons"].erase(to_string(button));
 		ofstream writer(nxsh_config);
 		writer << to_remove.dump(4);
 		writer.close();