OmniNX/hekate
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdk: dirlist: use flags instead of arguments

Browse Source 
A new flag was also added that forces an ASCII ordering instead of Alphabetical one.
This commit is contained in:
CTCaer
2025-08-27 15:18:41 +03:00
parent 9368a780cd
commit 9309b53054
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bdk/utils/dirlist.c
View File

@@ -22,12 +22,15 @@
#include <mem/heap.h> #include <mem/heap.h>
#include <utils/types.h> #include <utils/types.h>
dirlist_t *dirlist(const char *directory, const char *pattern, bool includeHiddenFiles, bool parse_dirs) dirlist_t *dirlist(const char *directory, const char *pattern, u32 flags)
{ {
int res = 0; int res = 0;
u32 k = 0; u32 k = 0;
DIR dir; DIR dir;
FILINFO fno; FILINFO fno;
bool show_hidden = !!(flags & DIR_SHOW_HIDDEN);
bool show_dirs = !!(flags & DIR_SHOW_DIRS);
bool ascii_order = !!(flags & DIR_ASCII_ORDER);
dirlist_t *dir_entries = (dirlist_t *)malloc(sizeof(dirlist_t)); dirlist_t *dir_entries = (dirlist_t *)malloc(sizeof(dirlist_t));
@@ -43,11 +46,11 @@ dirlist_t *dirlist(const char *directory, const char *pattern, bool includeHidde
if (res || !fno.fname[0]) if (res || !fno.fname[0])
break; break;
bool curr_parse = parse_dirs ? (fno.fattrib & AM_DIR) : !(fno.fattrib & AM_DIR); bool curr_parse = show_dirs ? (fno.fattrib & AM_DIR) : !(fno.fattrib & AM_DIR);
if (curr_parse) if (curr_parse)
{ {
if ((fno.fname[0] != '.') && (includeHiddenFiles || !(fno.fattrib & AM_HID))) if ((fno.fname[0] != '.') && (show_hidden || !(fno.fattrib & AM_HID)))
{ {
strcpy(&dir_entries->data[k * 256], fno.fname); strcpy(&dir_entries->data[k * 256], fno.fname);
if (++k >= DIR_MAX_ENTRIES) if (++k >= DIR_MAX_ENTRIES)
@@ -61,7 +64,7 @@ dirlist_t *dirlist(const char *directory, const char *pattern, bool includeHidde
{ {
do do
{ {
if (!(fno.fattrib & AM_DIR) && (fno.fname[0] != '.') && (includeHiddenFiles || !(fno.fattrib & AM_HID))) if (!(fno.fattrib & AM_DIR) && (fno.fname[0] != '.') && (show_hidden || !(fno.fattrib & AM_HID)))
{ {
strcpy(&dir_entries->data[k * 256], fno.fname); strcpy(&dir_entries->data[k * 256], fno.fname);
if (++k >= DIR_MAX_ENTRIES) if (++k >= DIR_MAX_ENTRIES)
@@ -82,12 +85,15 @@ dirlist_t *dirlist(const char *directory, const char *pattern, bool includeHidde
// Terminate name list. // Terminate name list.
dir_entries->name[k] = NULL; dir_entries->name[k] = NULL;
// Choose list ordering.
int (*strcmpex)(const char* str1, const char* str2) = ascii_order ? strcmp : strcasecmp;
// Reorder ini files Alphabetically. // Reorder ini files Alphabetically.
for (u32 i = 0; i < k - 1 ; i++) for (u32 i = 0; i < k - 1 ; i++)
{ {
for (u32 j = i + 1; j < k; j++) for (u32 j = i + 1; j < k; j++)
{ {
if (strcasecmp(dir_entries->name[i], dir_entries->name[j]) > 0) if (strcmpex(dir_entries->name[i], dir_entries->name[j]) > 0)
{ {
char *tmp = dir_entries->name[i]; char *tmp = dir_entries->name[i];
dir_entries->name[i] = dir_entries->name[j]; dir_entries->name[i] = dir_entries->name[j];

8
bdk/utils/dirlist.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2024 CTCaer * Copyright (c) 2018-2025 CTCaer
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -18,10 +18,14 @@
#define DIR_MAX_ENTRIES 64 #define DIR_MAX_ENTRIES 64
#define DIR_SHOW_HIDDEN BIT(0)
#define DIR_SHOW_DIRS BIT(1)
#define DIR_ASCII_ORDER BIT(2)
typedef struct _dirlist_t typedef struct _dirlist_t
{ {
char *name[DIR_MAX_ENTRIES]; char *name[DIR_MAX_ENTRIES];
char data[DIR_MAX_ENTRIES * 256]; char data[DIR_MAX_ENTRIES * 256];
} dirlist_t; } dirlist_t;
dirlist_t *dirlist(const char *directory, const char *pattern, bool includeHiddenFiles, bool parse_dirs); dirlist_t *dirlist(const char *directory, const char *pattern, u32 flags);