UI finished

henyxia
1 parent ae25085d
Showing 5 changed files with 117 additions and 6 deletions Show diff stats
Makefile
main.c
printx.c
ui.c
ui.h
 CC=gcc
-CC_FLAGS=-c -Wall -Werror
+CC_FLAGS=-c -Wall -Werror -std=c99 -g
 CC_LIBS=
 INCLUDES=
-SOURCES=main.c printx.c
+SOURCES=main.c printx.c ui.c
 OBJECTS=$(SOURCES:.c=.o)
 OUTPUT=tweekd
 #include <stdio.h>
 #include "printx.h"
+#include "ui.h"
 int main(void)
 {
-	initLog();
+	initUILog();
+	if(!initLog())
+	{
+		printf("Log creation failed\n");
+		return 1;
+	}
 	printx(INFO, "Tweekd starting\n");
+	displayUI();
 	closeLog();
 	return 0;
 }
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <time.h>
 #include "printx.h"
+#include "ui.h"
 #define	FILENAME_LENGTH	24
 #define	S_RESET			"\33[0m"
@@ -13,11 +14,22 @@
 FILE* logfile = NULL;
 char s_color[4][12] = {"\x1b[01;31m", "\x1b[01;33m", "\x1b[01;32m", "\x1b[01;36m"};
+void removeCharFromString(char c, char *str)
+{
+	int len = strlen(str)+1;
+
+	for(int i=0; i<len; i++)
+		if(str[i] == c)
+			strncpy(&str[i],&str[i+1],len-i);
+}
+
 bool initLog()
 {
 	char	filename[FILENAME_LENGTH];
 	time_t	now = time(NULL);
+	strftime(filename, FILENAME_LENGTH, "%F-%T:%d", localtime(&now));
+	setStartTime(filename);
 	strftime(filename, FILENAME_LENGTH, "log/%F-%T:%d", localtime(&now));
 	strcat(filename, ".log");
@@ -39,12 +51,13 @@ void closeLog()
 void printx(severity s, char* str, ...)
 {
 	char	buffer[MAX_BUFFER];
+	char	buffer2[MAX_BUFFER];
 	va_list	arglist;
 	va_start(arglist, str);
 	vsprintf(buffer, str, arglist);
 	fprintf(logfile, buffer);
-	printf(s_color[s]);
-	printf(buffer);
-	printf(S_RESET);
+	sprintf(buffer2, "%s%s%s", s_color[s], buffer, S_RESET);
+	removeCharFromString('\n', buffer2);
+	addToLog(buffer2);
 	va_end(arglist);
 }
@@ -0,0 +1,82 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+#include <time.h>
+#include "ui.h"
+
+#define	TIME_LENGTH			24
+#define	HEADER_TEXT_LENGTH	24
+#define	LOG_LINES			25
+#define	LOG_LENGTH			69
+
+char	tmpretheader[HEADER_TEXT_LENGTH+1];
+char	tmpretlog[HEADER_TEXT_LENGTH+1];
+char	uilog[LOG_LINES][LOG_LENGTH];
+char	started[TIME_LENGTH];
+char	uid[HEADER_TEXT_LENGTH];
+char	uidDate[HEADER_TEXT_LENGTH];
+
+void initUILog()
+{
+	uid[0]='\0';
+	uidDate[0]='\0';
+	for(int i=0; i<LOG_LINES; i++)
+		uilog[i][0] = '\0';
+}
+
+char* fillHeaderWithSpaces(char* text)
+{
+	strcpy(tmpretheader, text);
+	while(strlen(tmpretheader) < HEADER_TEXT_LENGTH)
+		strcat(tmpretheader, " ");
+
+	return tmpretheader;
+}
+
+void addToLog(char* newStr)
+{
+	for(int i=0; i<(LOG_LINES-1); i++)
+		strcpy(uilog[i+1], uilog[i]);
+	strcpy(uilog[0], newStr);
+}
+
+char* fillLogWithSpaces(char* text)
+{
+	strcpy(tmpretlog, text);
+	if(strlen(text) > 0)
+		while((strlen(tmpretlog)-12) < LOG_LENGTH)
+			strcat(tmpretlog, " ");
+	else
+		while(strlen(tmpretlog) < LOG_LENGTH)
+			strcat(tmpretlog, " ");
+
+	return tmpretlog;
+}
+
+
+void setStartTime(char* sT)
+{
+	strcpy(started, sT);
+}
+
+void displayUI()
+{
+	char	buffer[HEADER_TEXT_LENGTH];
+	//header
+	printf("\u250F\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2533\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2533\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2513\n");
+	printf("\u2503 %s \u2503      T H E      \u2503", fillHeaderWithSpaces("Started since"));
+   	printf(" %s \u2503\n", fillHeaderWithSpaces("No Tag Detected"));
+	printf("\u2503 %s \u2503    T W E E K    \u2503 ", fillHeaderWithSpaces(started));
+	sprintf(buffer, "%s", strlen(uidDate) > 0 ? uidDate : "Waiting for a tag");
+	printf("%s \u2503\n", fillHeaderWithSpaces(buffer));
+	sprintf(buffer, "PID %d", getpid());
+	printf("\u2503 %s \u2503  P R O J E C T  \u2503 ", fillHeaderWithSpaces(buffer));
+	sprintf(buffer, "UID : %s", strlen(uid) > 0 ? uid : "Nope");
+	printf("%s \u2503\n", fillHeaderWithSpaces(buffer));
+	printf("\u2523\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u253B\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u253B\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u252B\n");
+	//body
+	for(int i=0; i<LOG_LINES; i++)
+		printf("\u2503 %s \u2503\n", fillLogWithSpaces(uilog[i]));
+	printf("\u2517\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u251B\n");
+}
@@ -0,0 +1,9 @@
+#ifndef __UI_H__
+#define __UI_H__
+
+void initUILog();
+void addToLog(char*);
+void displayUI();
+void setStartTime(char*);
+
+#endif