refactor: filesystem function

Author: ThisAMJ

src/Features/ConfigPlus.cpp

@@ -66,23 +66,13 @@ CON_COMMAND_F(sar_download_file, "sar_download_file <url> <filepath> [directory]
 	}
 
 	std::string filepath = args[2];
-	std::string gamedir = "";
+	std::string gamedir = args.ArgC() > 3 ? args[3] : "";
 
-	auto paths = fileSystem->GetSearchPaths();
-	if (args.ArgC() > 3 && args[3][0]) {
-		for (auto path : paths) {
-			if (strstr(path.c_str(), args[3]) == NULL) continue;
-			gamedir = path;
-			break;
-		}
-	}
-	if (gamedir == "") {
-		gamedir = std::string(engine->GetGameDirectory()) + "/";
-		for (auto path : paths) {
-			if (!std::ifstream(path + filepath).good()) continue;
-			gamedir = path;
-			break;
-		}
+	auto result = fileSystem->FindFileSomewhere(filepath, gamedir);
+	if (result.has_value()) {
+		filepath = result.value();
+	} else {
+		filepath = std::string(engine->GetGameDirectory()) + "/" + filepath;
 	}
 
 	CURL *curl = curl_easy_init();
@@ -102,13 +92,13 @@ CON_COMMAND_F(sar_download_file, "sar_download_file <url> <filepath> [directory]
 	if (res == CURLE_OK) {
 
 		// Create any intermediate directories
-		std::string dirpath = gamedir + filepath;
+		std::string dirpath = filepath;
 		std::replace(dirpath.begin(), dirpath.end(), '\\', '/');
 		dirpath = dirpath.substr(0, dirpath.rfind('/'));
 		std::filesystem::create_directories(dirpath);
 
-		std::filesystem::remove(gamedir + filepath);
-		std::filesystem::copy(temp, gamedir + filepath); // for some reason moving the file doesn't work
+		std::filesystem::remove(filepath);
+		std::filesystem::copy(temp, filepath); // for some reason moving the file doesn't work
 
 	} else {
 		console->Print("An error occurred\n");

src/Modules/FileSystem.cpp

@@ -7,7 +7,7 @@
 #include "Surface.hpp"
 #include "Console.hpp"
 #include "Command.hpp"
-#include "Engine.hpp"
+#include "Modules/Engine.hpp"
 
 #include <filesystem>
 #include <fstream>
@@ -37,11 +37,26 @@ std::vector<std::string> FileSystem::GetSearchPaths() {
 }
 
 bool FileSystem::FileExistsSomewhere(std::string filename) {
-	std::vector<std::string> paths = GetSearchPaths();
-	for (std::string path : paths) {
-		if (std::ifstream(path + "/" + filename).good()) return true;
+	return FindFileSomewhere(filename).has_value();
+}
+
+std::optional<std::string> FileSystem::FindFileSomewhere(std::string filepath, std::string gamedir /* = "" */) {
+	auto paths = fileSystem->GetSearchPaths();
+	if (gamedir.length() == 0) {
+		for (auto path : paths) {
+			if (std::ifstream(path + filepath).good()) return path + filepath;
+		}
+		
+	} else {
+		for (auto path : paths) {
+			// Fuzzy gamedir search
+			if (strstr(path.c_str(), gamedir.c_str()) == NULL) continue; 
+			if (std::ifstream(path + filepath).good()) return path + filepath;
+			break;
+		}
+		
 	}
-	return false;
+	return std::nullopt;
 }
 
 #ifdef _WIN32
@@ -79,7 +94,6 @@ bool FileSystem::MapExists(std::string name) {
 	return FileExistsSomewhere(name);
 }
 
-
 bool FileSystem::Init() {
 	g_pFullFileSystem = Interface::Create(this->Name(), "VFileSystem017", false);
 

src/Modules/FileSystem.hpp

@@ -17,6 +17,7 @@ class FileSystem : public Module {
 	bool FileExistsSomewhere(std::string filename);
 	std::string GetSaveDirectory();
 	bool MapExists(std::string name);
+	std::optional<std::string> FindFileSomewhere(std::string filepath, std::string gamedir = "");
 
 public:
 	bool Init() override;