From 6b2a439aa51b652a29f051a6664fcef9341b10b5 Mon Sep 17 00:00:00 2001
From: sukibaby <163092272+sukibaby@users.noreply.github.com>
Date: Mon, 12 Aug 2024 06:15:32 -0700
Subject: [PATCH] Clean up Windows filesystem mount code

---
 src/arch/ArchHooks/ArchHooks_Win32Static.cpp | 87 ++++++++------------
 1 file changed, 33 insertions(+), 54 deletions(-)

diff --git a/src/arch/ArchHooks/ArchHooks_Win32Static.cpp b/src/arch/ArchHooks/ArchHooks_Win32Static.cpp
index ddecddc4c3..c59e6398fc 100644
--- a/src/arch/ArchHooks/ArchHooks_Win32Static.cpp
+++ b/src/arch/ArchHooks/ArchHooks_Win32Static.cpp
@@ -65,65 +65,44 @@ static RString GetMountDir( const RString &sDirOfExecutable )
 	return sDir;
 }
 
-void ArchHooks::MountInitialFilesystems( const RString &sDirOfExecutable )
-{
-	RString sDir = GetMountDir( sDirOfExecutable );
-	FILEMAN->Mount("dirro", sDir, "/");
+void MountDirectories(const RString& baseDir) {
+	const std::vector<RString> winDirectoryStructureITGm = {
+		"/Announcers",
+		"/BGAnimations",
+		"/BackgroundEffects",
+		"/BackgroundTransitions",
+		"/Cache",
+		"/CDTitles",
+		"/Characters",
+		"/Courses",
+		"/Downloads",
+		"/Logs",
+		"/NoteSkins",
+		"/Packages",
+		"/Save",
+		"/Screenshots",
+		"/Songs",
+		"/RandomMovies",
+		"/Themes"
+	};
 
-	bool portable = DoesFileExist("/Portable.ini");
-	if (portable)
-	{
-		FILEMAN->Mount("dir", sDir + "/Announcers", "/Announcers");
-		FILEMAN->Mount("dir", sDir + "/BGAnimations", "/BGAnimations");
-		FILEMAN->Mount("dir", sDir + "/BackgroundEffects", "/BackgroundEffects");
-		FILEMAN->Mount("dir", sDir + "/BackgroundTransitions", "/BackgroundTransitions");
-		FILEMAN->Mount("dir", sDir + "/Cache", "/Cache");
-		FILEMAN->Mount("dir", sDir + "/CDTitles", "/CDTitles");
-		FILEMAN->Mount("dir", sDir + "/Characters", "/Characters");
-		FILEMAN->Mount("dir", sDir + "/Courses", "/Courses");
-		FILEMAN->Mount("dir", sDir + "/Downloads", "/Downloads");
-		FILEMAN->Mount("dir", sDir + "/Logs", "/Logs");
-		FILEMAN->Mount("dir", sDir + "/NoteSkins", "/NoteSkins");
-		FILEMAN->Mount("dir", sDir + "/Packages", "/Packages");
-		FILEMAN->Mount("dir", sDir + "/Save", "/Save");
-		FILEMAN->Mount("dir", sDir + "/Screenshots", "/Screenshots");
-		FILEMAN->Mount("dir", sDir + "/Songs", "/Songs");
-		FILEMAN->Mount("dir", sDir + "/RandomMovies", "/RandomMovies");
-		FILEMAN->Mount("dir", sDir + "/Themes", "/Themes");
+	for (const RString& dir : winDirectoryStructureITGm) {
+		FILEMAN->Mount("dir", baseDir + dir, dir);
 	}
 }
 
-void ArchHooks::MountUserFilesystems( const RString &sDirOfExecutable )
-{
-	/*
-	 * Look, I know what you're thinking: "Hey, let's put all this stuff into
-	 * their respective 'proper' places on the filesystem!" Stop. Now.
-	 * This was done before and it was the most ungodly confusing thing to ever
-	 * happen. Just don't do it, seriously. Keep them in one place.
-	 * - Colby
-	 */
-	RString sAppDataDir = SpecialDirs::GetAppDataDir() + PRODUCT_ID;
-	//RString sCommonAppDataDir = SpecialDirs::GetCommonAppDataDir() + PRODUCT_ID;
-	//RString sLocalAppDataDir = SpecialDirs::GetLocalAppDataDir() + PRODUCT_ID;
-	//RString sPicturesDir = SpecialDirs::GetPicturesDir() + PRODUCT_ID;
+void ArchHooks::MountInitialFilesystems(const RString& sDirOfExecutable) {
+	RString sDir = GetMountDir(sDirOfExecutable);
+	FILEMAN->Mount("dirro", sDir, "/");
 
-	FILEMAN->Mount( "dir", sAppDataDir + "/Announcers", "/Announcers" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/BGAnimations", "/BGAnimations" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/BackgroundEffects", "/BackgroundEffects" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/BackgroundTransitions", "/BackgroundTransitions" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Cache", "/Cache" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/CDTitles", "/CDTitles" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Characters", "/Characters" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Courses", "/Courses" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Downloads", "/Downloads" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Logs", "/Logs" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/NoteSkins", "/NoteSkins" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Packages", "/Packages" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Save", "/Save" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Screenshots", "/Screenshots" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Songs", "/Songs" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/RandomMovies", "/RandomMovies" );
-	FILEMAN->Mount( "dir", sAppDataDir + "/Themes", "/Themes" );
+	if (DoesFileExist("/Portable.ini")) {
+		MountDirectories(sDir);
+	}
+}
+
+void ArchHooks::MountUserFilesystems(const RString& sDirOfExecutable) {
+	RString sAppDataDir = SpecialDirs::GetAppDataDir() + PRODUCT_ID;
+	MountDirectories(sAppDataDir);
 }
 
 static RString LangIdToString( LANGID l )