staticDIR to FatFS

Author: stellar-aria

src/deluge/gui/ui/browser/browser.cpp

@@ -18,6 +18,7 @@
 #include "gui/ui/browser/browser.h"
 #include "definitions_cxx.hpp"
 #include "extern.h"
+#include "fatfs.hpp"
 #include "gui/context_menu/delete_file.h"
 #include "gui/l10n/l10n.h"
 #include "gui/ui_timer_manager.h"
@@ -35,6 +36,7 @@
 #include "storage/file_item.h"
 #include "storage/storage_manager.h"
 #include "util/functions.h"
+#include "util/try.h"
 #include <cstring>
 #include <new>
 
@@ -269,18 +271,8 @@ Error Browser::readFileItemsForFolder(char const* filePrefixHere, bool allowFold
 		return error;
 	}
 
-	FRESULT result = f_opendir(&staticDIR, currentDir.get());
-	if (result) {
-		return fresultToDelugeErrorCode(result);
-	}
-
-	/*
-	error = fileItems.allocateMemory(FILE_ITEMS_MAX_NUM_ELEMENTS, false);
-	if (error != Error::NONE) {
-	    f_closedir(&staticDIR);
-	    return error;
-	}
-	*/
+	staticDIR =
+	    D_TRY_CATCH(FatFS::Directory::open(currentDir.get()), error, { return fatfsErrorToDelugeError(error); });
 
 	numFileItemsDeletedAtStart = 0;
 	numFileItemsDeletedAtEnd = 0;
@@ -304,10 +296,12 @@ Error Browser::readFileItemsForFolder(char const* filePrefixHere, bool allowFold
 		audioFileManager.loadAnyEnqueuedClusters();
 		FilePointer thisFilePointer;
 
-		result = f_readdir_get_filepointer(&staticDIR, &staticFNO, &thisFilePointer); /* Read a directory item */
+		std::tie(staticFNO, thisFilePointer) = D_TRY_CATCH(staticDIR.read_and_get_filepointer(), error, {
+			break; // Break on error
+		});
 
-		if (result != FR_OK || staticFNO.fname[0] == 0) {
-			break; /* Break on error or end of dir */
+		if (staticFNO.fname[0] == 0) {
+			break; /* Break on end of dir */
 		}
 		if (staticFNO.fname[0] == '.') {
 			continue; /* Ignore dot entry */
@@ -387,8 +381,7 @@ Error Browser::readFileItemsForFolder(char const* filePrefixHere, bool allowFold
 			thisItem->displayName = storedFilenameChars;
 		}
 	}
-
-	f_closedir(&staticDIR);
+	staticDIR.close();
 
 	if (error != Error::NONE) {
 		emptyFileItems();

src/deluge/gui/ui/browser/sample_browser.cpp

@@ -16,8 +16,10 @@
  */
 
 #include "definitions_cxx.hpp"
+#include "fatfs.hpp"
 #include "hid/button.h"
 #include "model/sample/sample.h"
+#include "util/try.h"
 #include <ranges>
 #undef __GNU_VISIBLE
 #define __GNU_VISIBLE 1 // Makes strcasestr visible. Might already be the reason for the define above
@@ -1191,11 +1193,10 @@ bool SampleBrowser::loadAllSamplesInFolder(bool detectPitch, int32_t* getNumSamp
 		previouslyViewedFilename = currentFileItem->filename.get();
 	}
 
-	FRESULT result = f_opendir(&staticDIR, dirToLoad.get());
-	if (result != FR_OK) {
+	staticDIR = D_TRY_CATCH(FatFS::Directory::open(dirToLoad.get()), error, {
 		display->displayError(Error::SD_CARD);
 		return false;
-	}
+	});
 
 	int32_t numSamples = 0;
 
@@ -1240,10 +1241,13 @@ bool SampleBrowser::loadAllSamplesInFolder(bool detectPitch, int32_t* getNumSamp
 		audioFileManager.loadAnyEnqueuedClusters();
 		FilePointer thisFilePointer;
 
-		result = f_readdir_get_filepointer(&staticDIR, &staticFNO, &thisFilePointer); /* Read a directory item */
+		/* Read a directory item */
+		std::tie(staticFNO, thisFilePointer) = D_TRY_CATCH(staticDIR.read_and_get_filepointer(), error, {
+			break; // break on error
+		});
 
-		if (result != FR_OK || staticFNO.fname[0] == 0) {
-			break; // Break on error or end of dir
+		if (staticFNO.fname[0] == 0) {
+			break; // Break on end of dir
 		}
 		if (staticFNO.fname[0] == '.') {
 			continue; // Ignore dot entry
@@ -1278,7 +1282,7 @@ bool SampleBrowser::loadAllSamplesInFolder(bool detectPitch, int32_t* getNumSamp
 
 		if (!maybeNewSample.has_value() || maybeNewSample.value() == nullptr) {
 			error = maybeNewSample.error_or(Error::NONE);
-			f_closedir(&staticDIR);
+			staticDIR.close();
 			goto removeReasonsFromSamplesAndGetOut;
 		}
 
@@ -1301,7 +1305,7 @@ bool SampleBrowser::loadAllSamplesInFolder(bool detectPitch, int32_t* getNumSamp
 
 		numSamples++;
 	}
-	f_closedir(&staticDIR);
+	staticDIR.close();
 
 	if (getPrefixAndDirLength) {
 		// If just one file, there's no prefix.
@@ -1872,7 +1876,7 @@ bool SampleBrowser::importFolderAsKit() {
 				range = source->getOrCreateFirstRange();
 				if (!range) {
 getOut:
-					f_closedir(&staticDIR);
+					staticDIR.close();
 					display->displayError(Error::INSUFFICIENT_RAM);
 					goto doReturnFalse;
 				}

src/deluge/gui/ui/browser/slot_browser.cpp

@@ -43,11 +43,6 @@ Error SlotBrowser::beginSlotSession(bool shouldDrawKeys, bool allowIfNoFolder) {
 
 	// But we won't try to open the folder yet, because we don't yet know what it should be.
 
-	/*
-	FRESULT result = f_opendir(&staticDIR, currentDir.get());
-	if (result != FR_OK && !allowIfNoFolder) return false;
-*/
-
 	bool success = Browser::opened();
 	if (!success) {
 		return Error::UNSPECIFIED;

src/deluge/gui/views/instrument_clip_view.cpp

@@ -18,6 +18,7 @@
 #include "gui/views/instrument_clip_view.h"
 #include "definitions_cxx.hpp"
 #include "extern.h"
+#include "fatfs.hpp"
 #include "gui/colour/colour.h"
 #include "gui/l10n/l10n.h"
 #include "gui/menu_item/colour.h"
@@ -93,6 +94,7 @@
 #include "util/cfunctions.h"
 #include "util/functions.h"
 #include "util/lookuptables/lookuptables.h"
+#include "util/try.h"
 #include <limits>
 #include <new>
 #include <stdint.h>
@@ -1562,17 +1564,16 @@ ActionResult InstrumentClipView::padAction(int32_t x, int32_t y, int32_t velocit
 
 				// Open directory of current audio file
 				*slashAddress = 0;
-				FRESULT result = f_opendir(&staticDIR, path);
-				*slashAddress = '/';
-				if (result != FR_OK) {
-
+				staticDIR = D_TRY_CATCH(FatFS::Directory::open(path), error, {
+					*slashAddress = '/';
 					display->displayError(Error::SD_CARD);
 					return ActionResult::DEALT_WITH;
-				}
+				});
+				*slashAddress = '/';
 
 				// Select random audio file from directory
 				int32_t fileCount = 0;
-				while (f_readdir(&staticDIR, &staticFNO) == FR_OK && staticFNO.fname[0] != 0) {
+				while (f_readdir(&staticDIR.inner(), &staticFNO) == FR_OK && staticFNO.fname[0] != 0) {
 					audioFileManager.loadAnyEnqueuedClusters();
 					if (staticFNO.fattrib & AM_DIR || !isAudioFilename(staticFNO.fname)) {
 						continue;

src/deluge/storage/audio/audio_file_manager.cpp

@@ -235,18 +235,19 @@ Error AudioFileManager::getUnusedAudioRecordingFilePath(String& filePath, String
 	// recordings will be much smaller
 	if (highestUsedAudioRecordingNumberNeedsReChecking[folderID]) {
 
-		FRESULT result = f_opendir(&staticDIR, audioRecordingFolderNames[folderID]);
-		if (result == FR_OK) {
+		auto maybeDIR = staticDIR.open(audioRecordingFolderNames[folderID]);
+		if (maybeDIR) {
+			staticDIR = *maybeDIR;
 
 			while (true) {
 				loadAnyEnqueuedClusters();
-				FRESULT result = f_readdir(&staticDIR, &staticFNO); /* Read a directory item */
-				if (__builtin_expect(result != FR_OK, 0)) {
-					return Error::SD_CARD;
-				}
+				/* Read a directory item */
+				staticFNO = D_TRY_CATCH(staticDIR.read(), error, {
+					return Error::SD_CARD; // error if invalid
+				});
 
-				if (__builtin_expect((*(uint32_t*)staticFNO.altname & 0x00FFFFFF) == 0x00434552, 1)) { // "REC"
-					if (*(uint32_t*)&staticFNO.altname[8] == 0x5641572E) {                             // ".WAV"
+				if ((*(uint32_t*)staticFNO.altname & 0x00FFFFFF) == 0x00434552) [[likely]] { // "REC"
+					if (*(uint32_t*)&staticFNO.altname[8] == 0x5641572E) {                   // ".WAV"
 
 						int32_t thisSlot = memToUIntOrError(&staticFNO.altname[3], &staticFNO.altname[8]);
 						if (thisSlot == -1) {

src/deluge/storage/storage_manager.cpp

@@ -59,7 +59,7 @@ void routineForSD(void);
 
 FirmwareVersion song_firmware_version = FirmwareVersion::current();
 FILINFO staticFNO;
-DIR staticDIR;
+FatFS::Directory staticDIR;
 XMLSerializer smSerializer;
 XMLDeserializer smDeserializer;
 JsonSerializer smJsonSerializer;

src/deluge/storage/storage_manager.h

@@ -399,7 +399,7 @@ Error openInstrumentFile(OutputType outputType, FilePointer* filePointer);
 
 extern FirmwareVersion song_firmware_version;
 extern FILINFO staticFNO;
-extern DIR staticDIR;
+extern FatFS::Directory staticDIR;
 extern const bool writeJsonFlag;
 
 inline bool isCardReady() {

src/fatfs/fatfs.hpp

@@ -126,8 +126,6 @@ using FileInfo = FILINFO;
 
 class Directory {
 public:
-  Directory(Directory &) = default;  // Copy constructor
-  Directory(Directory &&) = default; // Move constructor
   ~Directory() { f_closedir(&dir_); }
 
   /* Open a directory */
@@ -161,7 +159,7 @@ class Directory {
   constexpr DIR &inner() { return dir_; }
 
 private:
-  Directory() = default;
+  //Directory() = default;
 
   DIR dir_;