From b7883f18be12d304fddb57269c5bcb123e0763b2 Mon Sep 17 00:00:00 2001
From: smallketchup82 <ketchup@smallketchup.ca>
Date: Fri, 11 Oct 2024 13:46:17 -0400
Subject: [PATCH] Add a toggle for checking overwriting

The GetFile method in AddFile has a huge overhead, given we're doing
this in a loop.

Since we clear the files in the skin, we already know there won't be any
existing files, so we can skip all of that logic
---
 osu.Game/Database/ModelManager.cs | 17 ++++++++++-------
 osu.Game/Skinning/SkinImporter.cs |  5 ++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 7a5fb5efbf..5ecf1e0080 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -81,16 +81,19 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Add a file from within an ongoing realm transaction. If the file already exists, it is overwritten.
+        /// Add a file from within an ongoing realm transaction. If the file already exists, it is overwritten so long as <paramref name="overwrite"/> is true.
         /// </summary>
-        public void AddFile(TModel item, Stream contents, string filename, Realm realm)
+        public void AddFile(TModel item, Stream contents, string filename, Realm realm, bool overwrite = true)
         {
-            var existing = item.GetFile(filename);
-
-            if (existing != null)
+            if (overwrite)
             {
-                ReplaceFile(existing, contents, realm);
-                return;
+                var existing = item.GetFile(filename);
+
+                if (existing != null)
+                {
+                    ReplaceFile(existing, contents, realm);
+                    return;
+                }
             }
 
             var file = realmFileStore.Add(contents, realm);
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index 8147287eec..aba14efb2f 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -59,6 +59,7 @@ namespace osu.Game.Skinning
 
             skinInfoLive.PerformWrite(skinInfo =>
             {
+                // Not sure if this deletes the files from the storage or just the database.
                 skinInfo.Files.Clear();
 
                 string[] filesInMountedDirectory = Directory.EnumerateFiles(task.Path, "*.*", SearchOption.AllDirectories).Select(f => Path.GetRelativePath(task.Path, f)).ToArray();
@@ -67,9 +68,7 @@ namespace osu.Game.Skinning
                 {
                     using var stream = File.OpenRead(Path.Combine(task.Path, file));
 
-                    // The GetFile call in this method is *really* expensive, and we are certain that the file does not exist in the skin yet.
-                    // Consider adding a method to add a file without checking if it already exists. Or add the file directly to the skin.
-                    modelManager.AddFile(original, stream, file);
+                    modelManager.AddFile(original, stream, file, Realm.Realm, false);
                 }
             });