night0721/ccc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sort dirs first, then files

Browse source
This commit is contained in:
Palanix 2024-04-06 19:40:42 +02:00
parent c2e6709430
commit 7b11d5735f
No known key found for this signature in database
GPG key ID: 439CD6BD9905FAC5
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ccc.c
View file

@ -55,6 +55,8 @@ char *p_cwd; /* previous cwd */
int half_width; int half_width;
ArrayList *files; ArrayList *files;
ArrayList *marked; ArrayList *marked;
ArrayList *tmp1;
ArrayList *tmp2;
WINDOW *directory_border; WINDOW *directory_border;
WINDOW *directory_content; WINDOW *directory_content;
WINDOW *preview_border; WINDOW *preview_border;
@ -128,7 +130,6 @@ int main(int argc, char** argv)
init_pair(8, COLOR_WHITE, -1); /* REG */ init_pair(8, COLOR_WHITE, -1); /* REG */
/* init files and marked arrays */ /* init files and marked arrays */
files = arraylist_init(100);
marked = arraylist_init(100); marked = arraylist_init(100);
hashtable_init(); hashtable_init();
@ -457,7 +458,6 @@ void change_dir(const char *buf, int selection, int ftype)
strcpy(cwd, buf_dup); strcpy(cwd, buf_dup);
if (ftype != 2) { if (ftype != 2) {
arraylist_free(files); arraylist_free(files);
files = arraylist_init(100);
} }
current_selection = selection; current_selection = selection;
populate_files(cwd, ftype); populate_files(cwd, ftype);
@ -524,6 +524,10 @@ void populate_files(const char *path, int ftype)
if ((dp = opendir(path)) != NULL) { if ((dp = opendir(path)) != NULL) {
/* clear directory window to ready for printing */ /* clear directory window to ready for printing */
wclear(directory_content); wclear(directory_content);
if (ftype == 0) {
tmp1 = arraylist_init(10);
tmp2 = arraylist_init(10);
}
while ((ep = readdir(dp)) != NULL) { while ((ep = readdir(dp)) != NULL) {
char *path = memalloc(PATH_MAX * sizeof(char)); char *path = memalloc(PATH_MAX * sizeof(char));
@ -543,6 +547,14 @@ void populate_files(const char *path, int ftype)
free(filename); free(filename);
free(path); free(path);
} }
if (ftype == 0) {
files = arraylist_init(tmp1->length + tmp2->length);
files->length = tmp1->length + tmp2->length;
memcpy(files->items, tmp1->items, tmp1->length * sizeof(file));
memcpy(files->items + tmp1->length, tmp2->items, tmp2->length * sizeof(file));
free(tmp1->items);
free(tmp2->items);
}
closedir(dp); closedir(dp);
wrefresh(directory_content); wrefresh(directory_content);
highlight_current_line(); highlight_current_line();
@ -675,14 +687,14 @@ void add_file_stat(char *filename, char *path, int ftype)
char *total_stat = memalloc(stat_size); char *total_stat = memalloc(stat_size);
snprintf(total_stat, stat_size, "%s %s %-*s", mode_str, time, size_size, size); snprintf(total_stat, stat_size, "%s %s %-*s", mode_str, time, size_size, size);
arraylist_add(files, filename, path, total_stat, type, icon_str, color, false, false); if (color == 5)
arraylist_add(tmp1, filename, path, total_stat, type, icon_str, color, false, false);
else
arraylist_add(tmp2, filename, path, total_stat, type, icon_str, color, false, false);
free(time); free(time);
free(size); free(size);
free(total_stat);
free(type);
free(mode_str); free(mode_str);
free(icon_str);
} }
/* /*