From db42ccae717f175106491f7ff360ea6a0090d32b Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Sat, 25 May 2024 11:12:31 +1000
Subject: fix Assets filesByExtension storing duplicate asset paths

slipped in with the asset load scripts - this caused rare duplication errors when the Databases parse assets by extension and an asset path is indexed with more than one capitalization
#66
---
 source/base/StarAssets.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source/base/StarAssets.cpp')

diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp
index 7475a04..1519e86 100644
--- a/source/base/StarAssets.cpp
+++ b/source/base/StarAssets.cpp
@@ -371,7 +371,7 @@ StringList Assets::scan(String const& suffix) const {
 StringList Assets::scan(String const& prefix, String const& suffix) const {
   StringList result;
   if (suffix.beginsWith(".") && !suffix.substr(1).hasChar('.')) {
-    StringSet filesWithExtension = scanExtension(suffix);
+    auto& filesWithExtension = scanExtension(suffix);
     for (auto const& file : filesWithExtension) {
       if (file.beginsWith(prefix, String::CaseInsensitive))
         result.append(file);
@@ -386,11 +386,11 @@ StringList Assets::scan(String const& prefix, String const& suffix) const {
   return result;
 }
 
-const StringSet NullStringSet;
+const CaseInsensitiveStringSet NullExtensionScan;
 
-StringSet const& Assets::scanExtension(String const& extension) const {
+CaseInsensitiveStringSet const& Assets::scanExtension(String const& extension) const {
   auto find = m_filesByExtension.find(extension.beginsWith(".") ? extension.substr(1) : extension);
-  return find != m_filesByExtension.end() ? find->second : NullStringSet;
+  return find != m_filesByExtension.end() ? find->second : NullExtensionScan;
 }
 
 Json Assets::json(String const& path) const {
@@ -416,7 +416,7 @@ void Assets::queueJsons(StringList const& paths) const {
   }));
 }
 
-void Assets::queueJsons(StringSet const& paths) const {
+void Assets::queueJsons(CaseInsensitiveStringSet const& paths) const {
   MutexLocker assetsLocker(m_assetsMutex);
   for (String const& path : paths) {
     auto components = AssetPath::split(path);
@@ -439,7 +439,7 @@ void Assets::queueImages(StringList const& paths) const {
   }));
 }
 
-void Assets::queueImages(StringSet const& paths) const {
+void Assets::queueImages(CaseInsensitiveStringSet const& paths) const {
   MutexLocker assetsLocker(m_assetsMutex);
   for (String const& path : paths) {
     auto components = AssetPath::split(path);
@@ -482,7 +482,7 @@ void Assets::queueAudios(StringList const& paths) const {
   }));
 }
 
-void Assets::queueAudios(StringSet const& paths) const {
+void Assets::queueAudios(CaseInsensitiveStringSet const& paths) const {
   MutexLocker assetsLocker(m_assetsMutex);
   for (String const& path : paths) {
     auto components = AssetPath::split(path);
-- 
cgit v1.2.3