From 1c69f60037418a10b27d248d5acd7b7b012b5e03 Mon Sep 17 00:00:00 2001
From: nova <email@nova.gay>
Date: Sat, 1 Mar 2025 13:13:16 +0100
Subject: [PATCH] refactoring via defines.h

---
 backend.c      | 25 ++++++++++---------------
 interactions.c | 10 +++++-----
 main.c         | 15 ++++++++-------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/backend.c b/backend.c
index ed85022..949fed5 100644
--- a/backend.c
+++ b/backend.c
@@ -3,9 +3,9 @@
 #include <dirent.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "defines.h"
 
 extern unsigned int settings;
-extern unsigned long longest_name;
 extern char **content_l;
 extern char **content_m;
 extern char **content_r;
@@ -13,24 +13,19 @@ extern char *path;
 
 void get_dir_size(char *path, unsigned long *file_count, unsigned long *longest_name){
 	DIR *dir = opendir(path);
+	*longest_name = 256; //magic number originates out of readdir(), unless i implement my own name size function, thisll do
+	unsigned long index = 1; //always makes the array at least 1 big, used for metadata like the amount of files
 	if (dir) {
-		unsigned long index = 1; //always makes the array at least 1 big, used for metadata like the amount of files
 		struct dirent *entry;
-		while ( entry=readdir(dir) ) {
-			if (entry->d_name[0] != '.' && !(settings & 1)) { //bit 0 = show_hidden_files
+		while ( (entry=readdir(dir)) ) {
+			if (entry->d_name[0] != '.' && !(settings & SETTINGS_HIDDEN_FILES)) {
 				index++;
-				if ((unsigned long)sizeof(entry->d_name) > *longest_name) {
-					*longest_name = sizeof(entry->d_name);
-				}
-			} else if (settings & 1){ //bit 0 = show_hidden_files
+			} else if (settings & SETTINGS_HIDDEN_FILES){
 				index++;
-				if ((unsigned long*)sizeof(entry->d_name) > (unsigned long*)longest_name) {
-					longest_name = (unsigned long*)sizeof(entry->d_name);
-				}
 			}
 		}
-		*file_count = index;
 	}	
+	*file_count = index;
 	closedir(dir);
 }
 
@@ -41,11 +36,11 @@ void get_dir_content(char *path, unsigned long file_count, unsigned long longest
 	if (dir) {
 		int index = 1; //skip index 0 as it is used for metadata like file count
 		struct dirent *entry;
-		while ( entry=readdir(dir) ) { 
-			if (entry->d_name[0] != '.' && !(settings & 1)) { //bit 0 = show_hidden_files
+		while ( (entry=readdir(dir)) ) { 
+			if (entry->d_name[0] != '.' && !(settings & SETTINGS_HIDDEN_FILES)) {
 				strcpy(dir_content[index], entry->d_name);
 				index++;
-			} else if (settings & 1){ //bit 0 = show_hidden_files
+			} else if (settings & SETTINGS_HIDDEN_FILES) {
 				strcpy(dir_content[index], entry->d_name);
 				index++;
 			}
diff --git a/interactions.c b/interactions.c
index 111fb8d..1a0a9b1 100644
--- a/interactions.c
+++ b/interactions.c
@@ -1,17 +1,17 @@
 #include <curses.h>
 #include <dirent.h>
 #include <unistd.h>
-
+#include "defines.h"
 
 void user_interactions(char *input, unsigned int *status, unsigned int *settings) {
 	if (*input == 'q') {
-		*status ^= 1;
+		*status ^= STATUS_QUIT_PROGRAM;
 	} else if (*input == *"KEY_BACKSPACE") {
-		*settings ^= 1;
+		*settings ^= SETTINGS_HIDDEN_FILES;
 	} else if (*input == 'a') {
-		*settings ^= 1;
+		*settings ^= SETTINGS_HIDDEN_FILES;
 	}
 	else {
 	}
-	*status ^= 2;
+	*status ^= STATUS_RUN_BACKEND;
 }
diff --git a/main.c b/main.c
index 0f54ce3..c2174a4 100644
--- a/main.c
+++ b/main.c
@@ -4,12 +4,13 @@
 #include <stdlib.h>
 #include "window.h"
 #include "interactions.h"
+#include "defines.h"
 
 unsigned int terminal_height;
 unsigned int terminal_width;
 unsigned int temp_heigth = 0; //used for screen refresh
 unsigned int temp_width = 0; 
-unsigned int settings = 1;
+unsigned int settings ;
 unsigned int status; //bit 0 = enable 
 char **content_l; //content of parent dir, used in left window
 char **content_m; //content of current dir, used in main window
@@ -26,18 +27,18 @@ int main() {
 	WINDOW *winl = newwin(terminal_height, terminal_width/3, terminal_height, (terminal_width/3));
 	WINDOW *winm = newwin(terminal_height, terminal_width/3, 0, 0);
 	WINDOW *winr = newwin(terminal_height, terminal_width/3, terminal_height, ((terminal_width/3)*2));
-	settings ^= 1; //bit 0 = show_hidden_files
-	status ^= 2; //update ui bit
+	settings ^= SETTINGS_HIDDEN_FILES;
+	status ^= STATUS_RUN_BACKEND; 
 	char input = 0;
 
 	content_l = calloc(1, sizeof(*content_l)); //allocation in order to allow a more streamlined backend
 	content_m = calloc(1, sizeof(*content_m));
 	content_r = calloc(1, sizeof(*content_r));
 
-	while(!(status & 1)){
+	while(!(status & STATUS_QUIT_PROGRAM)){
 		getmaxyx(stdscr, temp_heigth, temp_width);
 
-		if (status & 2) {
+		if (status & STATUS_RUN_BACKEND) {
 			pthread_t populate_l;
 			pthread_t populate_m;
 			pthread_t populate_r;
@@ -55,13 +56,13 @@ int main() {
 		getmaxyx(stdscr, terminal_height, terminal_width);
 		temp_heigth -= terminal_height;
 		temp_width -= terminal_width;
-		if (!temp_heigth || !temp_width || (status & 2)) { //updates screen
+		if (!temp_heigth || !temp_width || (status & STATUS_RUN_BACKEND)) { //updates screen
 			window_left(winl, 0, 0, content_l);
 			window_main(winm, 0, terminal_width/3, content_m);
 			window_right(winr, 0, (terminal_width/3)*2, content_r);
 			wmove(stdscr,0,0);
 
-			status ^= 2;
+			status ^= STATUS_RUN_BACKEND;
 		}