Limit recursive search for calibration files to one folder from the root

Author: bparks13

Source/UI/NeuropixelsV1Interface.cpp

@@ -892,21 +892,17 @@ std::string NeuropixelsV1Interface::searchDirectoryForCalibrationFile(std::strin
 	if (folder == "" || sn == 0)
 		return "";
 
-	File directory = File(folder);
+	File rootDirectory = File(folder);
 
-	if (!directory.isDirectory())
+	if (!rootDirectory.isDirectory())
 	{
 		Onix1::showWarningMessageBoxAsync("Invalid Directory", "The path given for the calibration files directory is invalid. Please try setting it again.");
 		return "";
 	}
 
-	std::vector<File> calibrationFiles;
+	static constexpr int recursiveLevels = 1;
 
-	for (DirectoryEntry entry : RangedDirectoryIterator(directory, true, filename, File::findFiles, File::FollowSymlinks::no))
-	{
-		calibrationFiles.emplace_back(entry.getFile());
-		LOGD("Discovered file: ", entry.getFile().getFullPathName());
-	}
+	auto calibrationFiles = SettingsInterface::searchDirectoryForFile(rootDirectory, filename, recursiveLevels);
 
 	if (calibrationFiles.size() != 1)
 	{

Source/UI/NeuropixelsV2eProbeInterface.cpp

@@ -559,27 +559,23 @@ void NeuropixelsV2eProbeInterface::textEditorTextChanged(TextEditor& editor)
 	}
 }
 
-std::string NeuropixelsV2eProbeInterface::searchDirectoryForCalibrationFile(std::string folder, uint64_t sn)
+std::string NeuropixelsV2eProbeInterface::searchDirectoryForCalibrationFile(std::string directory, uint64_t sn)
 {
-	if (folder == "" || sn == 0)
+	if (directory == "" || sn == 0)
 		return "";
 
-	File directory = File(folder);
+	auto rootDirectory = File(directory);
 
-	if (!directory.isDirectory())
+	if (!rootDirectory.isDirectory())
 	{
 		Onix1::showWarningMessageBoxAsync("Invalid Directory", "The path given for the calibration files directory is invalid. Please try setting it again.");
 		return "";
 	}
 
-	std::vector<File> calibrationFiles;
 	std::string filename = std::to_string(sn) + GainCalibrationFilename;
+	static constexpr int recursiveLevels = 1;
 
-	for (DirectoryEntry entry : RangedDirectoryIterator(directory, true, filename, File::findFiles, File::FollowSymlinks::no))
-	{
-		calibrationFiles.emplace_back(entry.getFile());
-		LOGD("Discovered file: ", entry.getFile().getFullPathName());
-	}
+	auto calibrationFiles = SettingsInterface::searchDirectoryForFile(rootDirectory, filename, recursiveLevels);
 
 	if (calibrationFiles.size() != 1)
 	{

Source/UI/SettingsInterface.h

@@ -150,5 +150,34 @@ namespace OnixSourcePlugin
 
 			return rootElement.release();
 		}
+
+		// Given a File object defining the path to a directory, a filename to search for, and (optionally) the number of recursive levels to
+		// iterate through, return a list of all files that match the given filename in the directory (or directories for recursive searches)
+		static std::vector<File> searchDirectoryForFile(File directory, std::string filename, int recursiveLevels = 0)
+		{
+			std::vector<File> matchingFiles;
+
+			if (!directory.isDirectory())
+				return matchingFiles;
+
+			if (recursiveLevels > 0)
+			{
+				for (DirectoryEntry entry : RangedDirectoryIterator(directory, false, "*", File::findDirectories, File::FollowSymlinks::no))
+				{
+					auto files = searchDirectoryForFile(entry.getFile(), filename, recursiveLevels - 1);
+
+					if (files.size() > 0)
+						matchingFiles.insert(matchingFiles.end(), files.begin(), files.end());
+				}
+			}
+
+			for (DirectoryEntry entry : RangedDirectoryIterator(directory, false, filename, File::findFiles, File::FollowSymlinks::no))
+			{
+				matchingFiles.emplace_back(entry.getFile());
+				LOGD("Discovered file: ", entry.getFile().getFullPathName());
+			}
+
+			return matchingFiles;
+		}
 	};
 }