feat: merge pull request #2 from Meridiano/patch-1

refactor: Improve loader handling

Author: qudix

src/REL/IDDB.cpp

@@ -131,11 +131,11 @@ namespace REL
 			{ IDDB::Loader::OBSE, { L"versionlib" } },
 		};
 
-		std::unordered_map<IDDB::Loader, std::string> g_loaderMap{
-			{ IDDB::Loader::SKSE, "SKSE" },
-			{ IDDB::Loader::F4SE, "F4SE" },
-			{ IDDB::Loader::SFSE, "SFSE" },
-			{ IDDB::Loader::OBSE, "OBSE" },
+		std::unordered_map<IDDB::Loader, std::pair<std::string, std::wstring>> g_loaderMap{
+			{ IDDB::Loader::SKSE, { "SKSE", L"SKSE" } },
+			{ IDDB::Loader::F4SE, { "F4SE", L"F4SE" } },
+			{ IDDB::Loader::SFSE, { "SFSE", L"SFSE" } },
+			{ IDDB::Loader::OBSE, { "OBSE", L"OBSE" } },
 		};
 
 		wchar_t buffer[REX::W32::MAX_PATH];
@@ -145,15 +145,12 @@ namespace REL
 		auto loader = plugin.parent_path().parent_path();
 		auto loaderName = loader.filename().wstring();
 		std::transform(loaderName.begin(), loaderName.end(), loaderName.begin(), std::towupper);
-		if (loaderName == L"SKSE") {
-			m_loader = Loader::SKSE;
-		} else if (loaderName == L"F4SE") {
-			m_loader = Loader::F4SE;
-		} else if (loaderName == L"SFSE") {
-			m_loader = Loader::SFSE;
-		} else if (loaderName == L"OBSE") {
-			m_loader = Loader::OBSE;
-		}
+		for (auto& entry : g_loaderMap)
+			if (loaderName == entry.second.second)
+			{
+				m_loader = entry.first;
+				break;
+			}
 
 		if (m_loader == Loader::None)
 			REX::FAIL("Failed to determine Address Library loader!");
@@ -173,7 +170,7 @@ namespace REL
 		}
 
 		if (m_path.empty())
-			REX::FAIL("Failed to determine Address Library path!\nLoader: {}", g_loaderMap[m_loader]);
+			REX::FAIL("Failed to determine Address Library path!\nLoader: {}", g_loaderMap[m_loader].first);
 
 		if (m_format == Format::V0) {
 			load_v0();