From c3dddcdfc5315364d7614ca22b1a7ade53fe5404 Mon Sep 17 00:00:00 2001 From: belthesar Date: Sun, 9 Jul 2023 13:26:53 -0400 Subject: [PATCH 1/2] Update dalamudAsset cleanup routine to scan for all directories not current or dev. --- src/XIVLauncher.Common/Dalamud/AssetManager.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/XIVLauncher.Common/Dalamud/AssetManager.cs b/src/XIVLauncher.Common/Dalamud/AssetManager.cs index 0b406d2a5..37a1a592b 100644 --- a/src/XIVLauncher.Common/Dalamud/AssetManager.cs +++ b/src/XIVLauncher.Common/Dalamud/AssetManager.cs @@ -166,7 +166,7 @@ public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo targ Log.Verbose("[DASSET] Assets OK at {0}", assetsDir.FullName); - CleanUpOld(baseDir, info.Version - 1); + CleanUpOld(baseDir, info.Version); return (assetsDir, info.Version); } @@ -225,16 +225,14 @@ private static void CleanUpOld(DirectoryInfo baseDir, int version) if (GameHelpers.CheckIsGameOpen()) return; - for (int i = version; i >= version - 30; i--) + foreach (DirectoryInfo toDelete in baseDir.GetDirectories()) { - var toDelete = Path.Combine(baseDir.FullName, i.ToString()); - try { - if (Directory.Exists(toDelete)) + if (Directory.Exists(toDelete.FullName) && toDelete.Name != "dev" & toDelete.Name != version.ToString()) { - Directory.Delete(toDelete, true); - Log.Verbose("[DASSET] Cleaned out old v{Version}", i); + Directory.Delete(toDelete.FullName, true); + Log.Verbose("[DASSET] Cleaned out old v{Version}", toDelete.Name); } } catch (Exception ex) From 25f62f619b5583536b35632827ad675f161b7a0c Mon Sep 17 00:00:00 2001 From: belthesar Date: Mon, 10 Jul 2023 00:12:37 -0400 Subject: [PATCH 2/2] fix second "and" in directory check to not be a bitwise operator. --- src/XIVLauncher.Common/Dalamud/AssetManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XIVLauncher.Common/Dalamud/AssetManager.cs b/src/XIVLauncher.Common/Dalamud/AssetManager.cs index 37a1a592b..f68fccb67 100644 --- a/src/XIVLauncher.Common/Dalamud/AssetManager.cs +++ b/src/XIVLauncher.Common/Dalamud/AssetManager.cs @@ -229,7 +229,7 @@ private static void CleanUpOld(DirectoryInfo baseDir, int version) { try { - if (Directory.Exists(toDelete.FullName) && toDelete.Name != "dev" & toDelete.Name != version.ToString()) + if (Directory.Exists(toDelete.FullName) && toDelete.Name != "dev" && toDelete.Name != version.ToString()) { Directory.Delete(toDelete.FullName, true); Log.Verbose("[DASSET] Cleaned out old v{Version}", toDelete.Name);