changed mind, added helpers to derive pausedTime without a global

src2/server.c

@@ -12,7 +12,6 @@
 #define NS_PER_S 1000000000
 
 struct timespec finish, delta;
-int pausedTime = 0;
 bool timerActive = false;
 bool paused = false;
 bool alive = true;
@@ -25,6 +24,7 @@ enum event_type {
 	SKIP,
 	PAUSE,
 	RESUME,
+	RESET,
 	STOP
 };
 struct run_event {
@@ -38,8 +38,8 @@ struct segment {
 };
 struct route {
 	char *name;
-	struct segment *segments;
 	int segment_count;
+	struct segment *segments;
 };
 
 struct run_event *run;
@@ -53,7 +53,7 @@ char *default_file_name = "untitled.quest";
 int run_count = 0;
 int files = 0;
 char **filePaths = NULL;
-char **names, **values;
+char **meta_keys, **meta_values;
 int valuecount;
 struct segment *segments;
 int segment_count = 0;
@@ -75,9 +75,10 @@ void addFile(char *path);
 void sendInt(int sock, int value);
 void sendValue(int sock, char* name);
 void sendString(int sock, char* str);
-void doprocessing (int sock);
+void process_socket_input(int sock);
-void addPauseTime();
+void set_metadata(char *key, char *value);
-void subtractPauseTime();
+void save_metadata_to_file(char *token, char *token2);
+void reset_timer();
 int current_ms();
 
 //basic timer commands
@@ -89,9 +90,11 @@ void undo();
 void redo();
 void pause_timer();
 void resume();
+void reset();
 
 //convenient combination commands
 void start_split_stop();
+void start_reset();
 void start_split();
 void split_stop();
 void start_stop();
@@ -181,6 +184,16 @@ void stop()
 	runUnsaved = true;
 }
 
+//Identical function to stop() but with a RESET event
+void reset()
+{
+	if (!timerActive) return;
+	timerActive = false;
+	add_event(RESET);
+	finish = run[runMarker - 1].time;
+	runUnsaved = true;
+}
+
 void start_split_stop()
 {
 	if (!timerActive) {
@@ -212,6 +225,12 @@ void start_stop()
 	else stop();
 }
 
+void start_reset()
+{
+	if (!timerActive) start();
+	else reset();
+}
+
 void split()
 {
 	if (!timerActive) return;
@@ -224,32 +243,6 @@ void skip()
 	add_event(SKIP);
 }
 
-void addPauseTime()
-{
-	int pauseEvent = 0;
-	for (int i = runMarker - 2; i >= 1; i--) {
-		if (run[i].type == PAUSE) {
-			pauseEvent = i;
-			break;
-		}
-	}
-	sub_timespec(run[pauseEvent].time, run[runMarker - 1].time, &delta);
-	pausedTime += timespecToMS(delta);
-}
-
-void subtractPauseTime()
-{
-	int pauseEvent = 0;
-	for (int i = runMarker - 1; i >= i; i--) {
-		if (run[i].type == PAUSE) {
-			pauseEvent = i;
-			break;
-		}
-	}
-	sub_timespec(run[pauseEvent].time, run[runMarker].time, &delta);
-	pausedTime -= timespecToMS(delta);
-}
-
 void undo()
 {
 	if (runMarker > 0) {
@@ -264,7 +257,6 @@ void undo()
 			paused = false;
 		if (run[runMarker].type == RESUME) {
 			paused = true;
-			subtractPauseTime();
 		}
 		hasUndoneAtLeastOnce = true;
 	}
@@ -286,7 +278,6 @@ void redo()
 			paused = true;
 		if (run[runMarker - 1].type == RESUME) {
 			paused = false;
-			addPauseTime();
 		}
 	}
 	if (runMarker == runMarker2) {
@@ -316,7 +307,6 @@ void resume()
 	if (paused) {
 		add_event(RESUME);
 		paused = false;
-		addPauseTime();
 	}
 }
 
@@ -366,6 +356,9 @@ void appendRunToFile()
 			case RESUME:
 				fprintf(fp, "\t%s\n", "Resume");
 				break;
+			case RESET:
+				fprintf(fp, "\t%s\n", "Reset");
+				break;
 			case STOP:
 				fprintf(fp, "\t%s\n", "Stop");
 				break;
@@ -449,17 +442,9 @@ void loadFiles()
 			if (!fgets(buff2, 255, fp))
 				break;
 			if (buff2[0] == '\t') {
-				valuecount++;
+				buff[strlen(buff) - 1] = '\0';
-				
+				buff2[strlen(buff2) - 1] = '\0';
-				names = realloc(names, sizeof(char*) * valuecount);
+				set_metadata(buff, buff2 + 1);
-				names[valuecount - 1] = malloc(strlen(buff));
-				strncpy(names[valuecount - 1], buff, strlen(buff) - 1);
-				names[valuecount - 1][strlen(buff)] = '\0';
-
-				values = realloc(values, sizeof(char*) * valuecount);
-				values[valuecount - 1] = malloc(strlen(buff2) - 1);
-				strncpy(values[valuecount - 1], buff2 + 1, strlen(buff2) - 1);
-				values[valuecount - 1][strlen(buff2)] = '\0';
 			}
 		}
 
@@ -489,12 +474,12 @@ int current_ms()
 {
 	if (timerActive)
 		clock_gettime(CLOCK_REALTIME, &finish);
-	if (paused) {
+	//if (paused) {
-		sub_timespec(run[0].time, run[runMarker - 1].time, &delta);
+	//	sub_timespec(run[0].time, run[runMarker - 1].time, &delta);
-	} else {
+	//} else {
 		sub_timespec(run[0].time, finish, &delta);
-	}
+	//}
-	return timespecToMS(delta) - pausedTime;	
+	return timespecToMS(delta);	
 }
 
 void sendInt(int sock, int value)
@@ -513,16 +498,20 @@ void sendValue(int sock, char* name)
 	char buffer[256];
 	int n, x;
 	bool namefound = false;
+	if (name == NULL) {
+		strcpy(buffer, "DATA NOT PRESENT");
+	} else {
 		for(int i = 0; i < valuecount; i++) {
-		if (!strcmp(names[i], name)) {
+			if (!strcmp(meta_keys[i], name)) {
 				x = i;
 				namefound = true;
 			}
 		}
 		if (namefound)
-		strcpy(buffer, values[x]);
+			strcpy(buffer, meta_values[x]);
 		else
 			strcpy(buffer, "DATA NOT PRESENT");
+	}
 	n = write(sock, &buffer, 256);
 	if (n < 0) {
 		perror("ERROR writing to socket");
@@ -541,22 +530,64 @@ void sendString(int sock, char* str)
 	}
 }
 
-void doprocessing (int sock)
+void set_metadata(char *key, char *value)
+{
+	char key_pos = -1;
+	for (int i = 0; i < valuecount; i++)
+		if (!strcmp(meta_keys[i], key))
+			key_pos = i;
+	if (key_pos > -1) {
+		meta_values[key_pos] = realloc(meta_values[key_pos], strlen(value));
+		strncpy(meta_values[key_pos], value, strlen(value));
+		meta_values[key_pos][strlen(value)] = '\0';
+	} else {
+		valuecount++;
+				
+		meta_keys = realloc(meta_keys, sizeof(char*) * valuecount);
+		meta_keys[valuecount - 1] = malloc(strlen(key));
+		strncpy(meta_keys[valuecount - 1], key, strlen(key));
+		meta_keys[valuecount - 1][strlen(key)] = '\0';
+
+		meta_values = realloc(meta_values, sizeof(char*) * valuecount);
+		meta_values[valuecount - 1] = malloc(strlen(value));
+		strncpy(meta_values[valuecount - 1], value, strlen(value));
+		meta_values[valuecount - 1][strlen(value)] = '\0';
+	}
+}
+
+void save_metadata_to_file(char *token, char *token2)
+{
+	char* save_path = NULL;
+	if (files <= 0)
+		save_path = default_file_name;
+	else
+		save_path = filePaths[0];
+	FILE* fp;
+
+	fp = fopen(save_path, "r+");
+	fprintf(fp, "%s\n", token);
+	fprintf(fp, "\t%s\n\n", token2);
+	fclose(fp);
+}
+
+void process_socket_input(int sock)
 {
 	int n;
 	char buffer[256];
 	n = read(sock, &buffer, 256);
-	char *token = strtok(buffer, " ");
 	if (n < 0) {
 		perror("ERROR reading from socket");
 		exit(1);
 	}
-	if (!strcmp(token, "current_time")) {
+	char *token = strtok(buffer, " ");
-		sendInt(sock, current_ms());
+
-	} else if (!strcmp(token, "start")) {
+	//Imperative commands
+	if (!strcmp(token, "start")) {
 		start();
 	} else if (!strcmp(token, "stop")) {
 		stop();
+	} else if (!strcmp(token, "reset")) {
+		reset();
 	} else if (!strcmp(token, "kill")) {
 		alive = false;
 	} else if (!strcmp(token, "split")) {
@@ -573,31 +604,167 @@ void doprocessing (int sock)
 		redo();
 	} else if (!strcmp(token, "save")) {
 		appendRunToFile();
-	} else if (!strcmp(token, "run_count")) {
-		sendInt(sock, run_count);
-	} else if (!strcmp(token, "segment_count")) {
-		sendInt(sock, segment_count);
 	} else if (!strcmp(token, "start-split-stop")) {
 		start_split_stop();
 	} else if (!strcmp(token, "pause-resume")) {
 		pause_resume();
 	} else if (!strcmp(token, "start-stop")) {
 		start_stop();
+	} else if (!strcmp(token, "start-reset")) {
+		start_reset();
 	} else if (!strcmp(token, "start-split")) {
 		start_split();
 	} else if (!strcmp(token, "split-stop")) {
 		split_stop();
 	} else if (!strcmp(token, "undo-redo")) {
 		undo_redo();
-	} else if (!strcmp(token, "segment_name")) {
+	
+	//Getters
+	} else if (!strcmp(token, "get")) {
+		token = strtok(NULL, " ");
+		if (!strcmp(token, "current_time")) {
+			sendInt(sock, current_ms());
+		} else if (!strcmp(token, "current_time_with_pause")) {
+			int running_pause = 0;
+			struct timespec p, r;
+			bool tracking_pause = false;
+			for (int i = 0; i < runMarker; i++) {
+				if (run[i].type == PAUSE) {
+					sub_timespec(run[0].time, run[i].time, &p);
+					tracking_pause = true;
+				}
+				if (run[i].type == RESUME) {
+					sub_timespec(run[0].time, run[i].time, &r);
+					running_pause += timespecToMS(r) - timespecToMS(p);
+					tracking_pause = false;
+				} else if (i == runMarker - 1 && tracking_pause) {
+					running_pause += current_ms() - timespecToMS(p);
+				}
+			}
+			sendInt(sock, current_ms() - running_pause);
+		} else if (!strcmp(token, "run_count")) {
+			sendInt(sock, run_count);
+		} else if (!strcmp(token, "segment_count")) {
+			sendInt(sock, segment_count);
+		} else if (!strcmp(token, "route_count")) {
+			sendInt(sock, route_count);
+		} else if (!strcmp(token, "event_count")) {
+			sendInt(sock, runMarker);
+		} else if (!strcmp(token, "segment_shortname")) {
 			token = strtok(NULL, " ");
 			int x = atoi(token);
 			sendString(sock, segments[x].shortname);
+		} else if (!strcmp(token, "segment_longname")) {
+			token = strtok(NULL, " ");
+			int x = atoi(token);
+			sendString(sock, segments[x].longname);
+		} else if (!strcmp(token, "segment_description")) {
+			token = strtok(NULL, " ");
+			int x = atoi(token);
+			sendString(sock, segments[x].description);
+		} else if (!strcmp(token, "route_name")) {
+			token = strtok(NULL, " ");
+			int x = atoi(token);
+			sendString(sock, routes[x].name);
+		} else if (!strcmp(token, "route_segment_count")) {
+			token = strtok(NULL, " ");
+			int x = atoi(token);
+			sendInt(sock, routes[x].segment_count);
+		} else if (!strcmp(token, "route_segment_shortname")) {
+			token = strtok(NULL, " ");
+			int x = atoi(token);
+			token = strtok(NULL, " ");
+			int y = atoi(token);
+			sendString(sock, routes[x].segments[y].shortname);
+		} else if (!strcmp(token, "event_time")) {
+			token = strtok(NULL, " ");
+			int x;
+			if (!strcmp(token, "last"))
+				x = runMarker - 1;
+			else if (!strcmp(token, "first"))
+				x = 0;
+			else
+				x = atoi(token);
+			struct timespec t;
+			sub_timespec(run[0].time, run[x].time, &t);
+			sendInt(sock, timespecToMS(t));
+		} else if (!strcmp(token, "event_time_with_pause")) {
+			token = strtok(NULL, " ");
+			int x;
+			if (!strcmp(token, "last"))
+				x = runMarker - 1;
+			else if (!strcmp(token, "first"))
+				x = 0;
+			else
+				x = atoi(token);
+			int running_pause = 0;
+			struct timespec p, r;
+			bool tracking_pause = false;
+			for (int i = 0; i < x; i++) {
+				if (run[i].type == PAUSE) {
+					sub_timespec(run[0].time, run[i].time, &p);
+					tracking_pause = true;
+				}
+				if (run[i].type == RESUME) {
+					sub_timespec(run[0].time, run[i].time, &r);
+					running_pause += timespecToMS(r) - timespecToMS(p);
+					tracking_pause = false;
+				} else if (i == x - 1 && tracking_pause) {
+					sub_timespec(run[0].time, run[x].time, &r);
+					running_pause += timespecToMS(r) - timespecToMS(p);
+				}
+			}
+			struct timespec t;
+			sub_timespec(run[0].time, run[x].time, &t);
+			sendInt(sock, timespecToMS(t) - running_pause);
+		} else if (!strcmp(token, "event_type")) {
+			token = strtok(NULL, " ");
+			int x;
+			if (!strcmp(token, "last"))
+				x = runMarker - 1;
+			else if (!strcmp(token, "first"))
+				x = 0;
+			else
+				x = atoi(token);
+			char *reply;
+			switch (run[x].type) {
+				case START:
+					reply = "START";
+					break;
+				case SPLIT:
+					reply = "SPLIT";
+					break;
+				case SKIP:
+					reply = "SKIP";
+					break;
+				case PAUSE:
+					reply = "PAUSE";
+					break;
+				case RESUME:
+					reply = "RESUME";
+					break;
+				case RESET:
+					reply = "RESET";
+					break;
+				case STOP:
+					reply = "STOP";
+					break;
+			}
+			sendString(sock, reply);
 		} else if (!strcmp(token, "meta")) {
 			token = strtok(NULL, " ");
 			sendValue(sock, token);
-	} else {
+		}
-		printf("Recieved invalid command, ignoring...\n");
+	
+	//Setters
+	} else if (!strcmp(token, "set")) {
+		token = strtok(NULL, " ");
+		if (!strcmp(token, "meta")) {
+			token = strtok(NULL, " ");
+			char *token2 = strtok(NULL, " ");
+			set_metadata(token, token2);
+			save_metadata_to_file(token, token2);
+		}
 	}
 }
 
@@ -644,7 +811,7 @@ int main(int argc, char *argv[])
 			perror("ERROR on accept");
 			exit(1);
 		}
-		doprocessing(newsockfd);
+		process_socket_input(newsockfd);
 		close(newsockfd);
 	}
 	free(run);