nova/th
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added size metadata to dir content array

Browse Source
This commit is contained in:
nova 2025-02-27 16:31:51 +01:00
parent c927039b68
commit b9606e601a
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend.c
View File

@ -6,7 +6,6 @@
extern unsigned int settings; extern unsigned int settings;
extern unsigned long longest_name; extern unsigned long longest_name;
extern unsigned long file_count;
extern char **content_l; extern char **content_l;
extern char **content_m; extern char **content_m;
extern char **content_r; extern char **content_r;
@ -15,7 +14,7 @@ extern char *path;
void get_dir_size(char *path, unsigned long *file_count, unsigned long *longest_name){ void get_dir_size(char *path, unsigned long *file_count, unsigned long *longest_name){
DIR *dir = opendir(path); DIR *dir = opendir(path);
if (dir) { if (dir) {
unsigned long index = 0; unsigned long index = 1; //always makes the array at least 1 big, used for metadata like the amount of files
struct dirent *entry; struct dirent *entry;
while ( entry=readdir(dir) ) { while ( entry=readdir(dir) ) {
if (entry->d_name[0] != '.' && !(settings & 1)) { //bit 0 = show_hidden_files if (entry->d_name[0] != '.' && !(settings & 1)) { //bit 0 = show_hidden_files
@ -35,12 +34,12 @@ void get_dir_size(char *path, unsigned long *file_count, unsigned long *longest_
closedir(dir); closedir(dir);
} }
void get_dir_content(char *path, char **dir_content){ void get_dir_content(char *path, unsigned long file_count, unsigned long longest_name, char **dir_content){
DIR *dir = opendir(path); DIR *dir = opendir(path);
char content[file_count][longest_name]; char content[file_count][longest_name];
memset(content,0,sizeof(content)); memset(content,0,sizeof(content));
if (dir) { if (dir) {
int index = 0; int index = 1; //skip index 0 as it is used for metadata like file count
struct dirent *entry; struct dirent *entry;
while ( entry=readdir(dir) ) { while ( entry=readdir(dir) ) {
if (entry->d_name[0] != '.' && !(settings & 1)) { //bit 0 = show_hidden_files if (entry->d_name[0] != '.' && !(settings & 1)) { //bit 0 = show_hidden_files
@ -56,7 +55,7 @@ void get_dir_content(char *path, char **dir_content){
} }
void print_dir(WINDOW *win, char **dir_content){ void print_dir(WINDOW *win, char **dir_content){
for (unsigned long i = 0; i < (unsigned long)file_count; i++ ){ for (unsigned long i = 1; i < *dir_content[0]; i++ ){ //skip index 0 as it is used for metadata like file count
wprintw(win, "%s",dir_content[i]); wprintw(win, "%s",dir_content[i]);
wmove(win, i, 1); wmove(win, i, 1);
} }
@ -64,30 +63,35 @@ void print_dir(WINDOW *win, char **dir_content){
void *populate_dir(void *which){ // 0=left, 1=main, 2=right void *populate_dir(void *which){ // 0=left, 1=main, 2=right
char wh = (char)which; char wh = (char)which;
unsigned long file_count = 0;
unsigned long longest_name = 0;
if (wh) { if (wh) {
if (wh==1) { if (wh==1) {
get_dir_size(path, &file_count, &longest_name); get_dir_size(path, &file_count, &longest_name);
content_m = calloc(file_count, sizeof(*content_m)); content_m = calloc(file_count+1, sizeof(*content_m)); //index 0 is used for metadata like file count in dir
for (unsigned long i = 0; i<file_count; i++) { for (unsigned long i = 0; i<file_count+1; i++) {
content_m[i] = calloc(longest_name, sizeof(content_m[i])); content_m[i] = calloc(longest_name, sizeof(content_m[i]));
} }
get_dir_content(path, content_m); *content_m[0] = file_count;
get_dir_content(path, file_count, longest_name, content_m);
} else { } else {
get_dir_size(path, &file_count, &longest_name); get_dir_size(path, &file_count, &longest_name);
content_r = calloc(file_count, sizeof(*content_r)); content_r = calloc(file_count+1, sizeof(*content_r));
for (unsigned long i = 0; i<file_count; i++) { for (unsigned long i = 0; i<file_count+1; i++) {
content_r[i] = calloc(longest_name, sizeof(content_r[i])); content_r[i] = calloc(longest_name, sizeof(content_r[i]));
} }
get_dir_content(path, content_r); *content_r[0] = file_count;
get_dir_content(path, file_count, longest_name, content_r);
} }
} else { } else {
get_dir_size(path, &file_count, &longest_name); get_dir_size(path, &file_count, &longest_name);
content_l = calloc(file_count, sizeof(*content_l)); content_l = calloc(file_count+1, sizeof(*content_l));
for (unsigned long i = 0; i<file_count; i++) { for (unsigned long i = 0; i<file_count+1; i++) {
content_l[i] = calloc(longest_name, sizeof(content_l)); content_l[i] = calloc(longest_name, sizeof(content_l));
} }
get_dir_content(path, content_l); *content_l[0] = file_count;
get_dir_content(path, file_count, longest_name, content_l);
} }
return NULL; return NULL;

2
backend.h
View File

@ -3,6 +3,6 @@
void get_dir_size(char *path, unsigned long *file_count, unsigned long *longest_name); void get_dir_size(char *path, unsigned long *file_count, unsigned long *longest_name);
void get_dir_content(char *path, char **dir_content); void get_dir_content(char *path, unsigned long file_count, unsigned long longest_name, char **dir_content);
void print_dir(WINDOW *win, char **dir_content); void print_dir(WINDOW *win, char **dir_content);
void *populate_dir(void *dir); void *populate_dir(void *dir);

6
window.c
View File

@ -4,8 +4,6 @@
extern unsigned int terminal_height; extern unsigned int terminal_height;
extern unsigned int terminal_width; extern unsigned int terminal_width;
extern unsigned long longest_name;
extern unsigned long file_count;
@ -16,8 +14,6 @@ void window_main(WINDOW *win, unsigned int start_y, unsigned int start_x, char *
//WINDOW *win = (window_data)window_data.win; //WINDOW *win = (window_data)window_data.win;
unsigned int local_width; unsigned int local_width;
unsigned int local_height; unsigned int local_height;
unsigned long file_count = 0;
unsigned long longest_name = 0;
//{{{ size & positioning //{{{ size & positioning
wresize(win, terminal_height, terminal_width/3); wresize(win, terminal_height, terminal_width/3);
@ -39,8 +35,6 @@ void window_left(WINDOW *win, unsigned int start_y, unsigned int start_x, char *
unsigned int local_width; unsigned int local_width;
unsigned int local_height; unsigned int local_height;
unsigned long file_count = 0;
unsigned long longest_name = 0;
//{{{ size & positioning //{{{ size & positioning
wresize(win, terminal_height, terminal_width/3); wresize(win, terminal_height, terminal_width/3);