Skip to content

fix filter .cfg files only on preset selection #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ro8inmorgan merged 1 commit into from
May 14, 2025
Merged

fix filter .cfg files only on preset selection #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions workspace/all/minarch/minarch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@ static void Config_syncFrontend(char* key, int value) {
option->value = value;
}

char** list_files_in_folder(const char* folderPath, int* fileCount) {
char** list_files_in_folder(const char* folderPath, int* fileCount, const char* extensionFilter) {
DIR* dir = opendir(folderPath);
if (!dir) {
perror("opendir");
Expand All @@ -1875,10 +1875,16 @@ char** list_files_in_folder(const char* folderPath, int* fileCount) {
snprintf(fullPath, sizeof(fullPath), "%s/%s", folderPath, entry->d_name);

if (stat(fullPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode)) {
char** temp = realloc(fileList, sizeof(char*) * (*fileCount + 2)); // +1 for new file, +1 for NULL
if (extensionFilter) {
const char* ext = strrchr(entry->d_name, '.');
if (!ext || strcmp(ext, extensionFilter) != 0) {
continue;
}
}

char** temp = realloc(fileList, sizeof(char*) * (*fileCount + 2));
if (!temp) {
perror("realloc");
// free previously allocated strings
for (int i = 0; i < *fileCount; ++i) {
free(fileList[i]);
}
Expand All @@ -1888,14 +1894,14 @@ char** list_files_in_folder(const char* folderPath, int* fileCount) {
}
fileList = temp;
fileList[*fileCount] = strdup(entry->d_name);
fileList[*fileCount + 1] = NULL; // maintain NULL-termination
fileList[*fileCount + 1] = NULL;
(*fileCount)++;
}
}

closedir(dir);

// Inline alphabetical sort
// Alphabetical sort
for (int i = 0; i < *fileCount - 1; ++i) {
for (int j = i + 1; j < *fileCount; ++j) {
if (strcmp(fileList[i], fileList[j]) > 0) {
Expand Down Expand Up @@ -1990,9 +1996,9 @@ static void Config_init(void) {

// populate shader options
int filecount;
char** filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount);
char** filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount,NULL);
int preset_filecount;
char** preset_filelist = list_files_in_folder(SHADERS_FOLDER, &preset_filecount);
char** preset_filelist = list_files_in_folder(SHADERS_FOLDER, &preset_filecount,".cfg");

config.shaders.options[SH_SHADER1].values = filelist;
config.shaders.options[SH_SHADER2].values = filelist;
Expand All @@ -2011,7 +2017,7 @@ static void Config_init(void) {

char overlaypath[255];
snprintf(overlaypath, sizeof(overlaypath), "%s/%s", OVERLAYS_FOLDER, core.tag);
char** overlaylist = list_files_in_folder(overlaypath, &filecount);
char** overlaylist = list_files_in_folder(overlaypath, &filecount,NULL);

if (overlaylist) {
int newcount = filecount + 1;
Expand Down Expand Up @@ -5321,7 +5327,7 @@ static int OptionShaders_openMenu(MenuList* list, int i) {


int filecount;
char** filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount);
char** filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount,NULL);

// Check if folder read failed or no files found
if (!filelist || filecount == 0) {
Expand Down