- Use unsorted view for autoload entry.

emukidid · Dec 10, 2024 · e1d2a59 · e1d2a59
1 parent 4f96f21
commit e1d2a59
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/cube/swiss/include/files.h b/cube/swiss/include/files.h
@@ -13,6 +13,7 @@ file_handle** getSortedDirEntries();
 file_handle* getCurrentDirEntries();
 int getSortedDirEntryCount();
 int getCurrentDirEntryCount();
+int getSortedDirEntryIndex(file_handle* file);
 u64 getCurrentDirSize();
 size_t concat_path(char *pathName, const char *dirName, const char *baseName);
 size_t concatf_path(char *pathName, const char *dirName, const char *baseName, ...);

diff --git a/cube/swiss/source/files.c b/cube/swiss/source/files.c
@@ -39,14 +39,14 @@ int sortFiles(file_handle* dir, int numFiles, file_handle*** sortedDir)
 	if(*sortedDir) {
 		for(int j = 0; j < numFiles; j++) {
 			switch(dir[j].fileType) {
-				case IS_SPECIAL:
-					break;
 				case IS_FILE:
 					if(!checkExtension(dir[j].name, devices[DEVICE_CUR]->extraExtensions))
 						continue;
-				default:
+				case IS_DIR:
 					if(!swissSettings.showHiddenFiles && ((dir[j].fileAttrib & ATTRIB_HIDDEN) || *getRelativeName(dir[j].name) == '.'))
 						continue;
+				default:
+					break;
 			}
 			(*sortedDir)[i++] = &dir[j];
 		}
@@ -58,6 +58,7 @@ int sortFiles(file_handle* dir, int numFiles, file_handle*** sortedDir)
 void freeFiles() {
 	free(sortedDirEntries);
 	sortedDirEntries = NULL;
+	sortedDirEntryCount = 0;
 	if(curDirEntries) {
 		for(int i = 0; i < curDirEntryCount; i++) {
 			if(curDirEntries[i].meta) {
@@ -120,6 +121,15 @@ int getCurrentDirEntryCount() {
 	return curDirEntryCount;
 }
 
+int getSortedDirEntryIndex(file_handle* file) {
+	for(int i = 0; i < sortedDirEntryCount; i++) {
+		if(file == sortedDirEntries[i]) {
+			return i;
+		}
+	}
+	return 0;
+}
+
 u64 getCurrentDirSize() {
 	u64 curDirSize = 0LL;
 	for(int i = 0; i < curDirEntryCount; i++) {

diff --git a/cube/swiss/source/util.c b/cube/swiss/source/util.c
@@ -296,20 +296,20 @@ int find_existing_entry(char *entry, bool load) {
 			needsRefresh = 0;
 
 			// Finally, read the actual file
-			file_handle **dirEntries = getSortedDirEntries();
-			int dirEntryCount = getSortedDirEntryCount();
+			file_handle *dirEntries = getCurrentDirEntries();
+			int dirEntryCount = getCurrentDirEntryCount();
 			for(int i = 0; i < dirEntryCount; i++) {
-				if(!strcmp(entry, dirEntries[i]->name)
-				|| !fnmatch(entry, dirEntries[i]->name, FNM_PATHNAME)) {
-					curSelection = i;
-					if(dirEntries[i]->fileType == IS_FILE && load) {
-						populate_meta(dirEntries[i]);
-						memcpy(&curFile, dirEntries[i], sizeof(file_handle));
+				if(!strcmp(entry, dirEntries[i].name)
+				|| !fnmatch(entry, dirEntries[i].name, FNM_PATHNAME)) {
+					curSelection = getSortedDirEntryIndex(&dirEntries[i]);
+					if(dirEntries[i].fileType == IS_FILE && load) {
+						populate_meta(&dirEntries[i]);
+						memcpy(&curFile, &dirEntries[i], sizeof(file_handle));
 						load_file();
-						memcpy(dirEntries[i], &curFile, sizeof(file_handle));
+						memcpy(&dirEntries[i], &curFile, sizeof(file_handle));
 					}
-					else if(dirEntries[i]->fileType == IS_DIR) {
-						memcpy(&curDir, dirEntries[i], sizeof(file_handle));
+					else if(dirEntries[i].fileType == IS_DIR) {
+						memcpy(&curDir, &dirEntries[i], sizeof(file_handle));
 						needsRefresh = 1;
 					}
 					return 0;