Climb an entire tree for one half-ripe blackberry

FenPhoenix · Aug 20, 2023 · 4ae6dd4 · 4ae6dd4
1 parent f9e2805
commit 4ae6dd4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/AngelLoader/FMScan.cs b/AngelLoader/FMScan.cs
@@ -67,10 +67,7 @@ void ReportProgress(FMScanner.ProgressReport pr) => Core.View.SetProgressBoxStat
                       pr.FMsTotal +
                       LText.ProgressBox.ReportScanningLast))),
                 message2:
-                // @MEM: We could get really clever and not have to do this work if we cached stuff from earlier
-                pr.FMName.ExtIsArchive()
-                    ? pr.FMName.GetFileNameFast()
-                    : pr.FMName.GetDirNameFast(),
+                pr.FMName,
                 percent: pr.Percent
             );
 
@@ -162,7 +159,8 @@ static void ShowProgressBox(bool suppressShow)
                             forceFullScan: scanFullIfNew && !fm.MarkedScanned,
                             cachePath: fm.Archive.ExtIs7z()
                                 ? Path.Combine(Paths.FMsCache, fm.InstalledDir)
-                                : ""
+                                : "",
+                            fm.Archive
                         ));
                     }
                     else if (fm.Game.ConvertsToKnownAndSupported(out GameIndex gameIndex))
@@ -174,7 +172,8 @@ static void ShowProgressBox(bool suppressShow)
                             fms.Add(new FMScanner.FMToScan
                             (
                                 path: Path.Combine(fmInstalledPath, fm.InstalledDir),
-                                forceFullScan: scanFullIfNew && !fm.MarkedScanned
+                                forceFullScan: scanFullIfNew && !fm.MarkedScanned,
+                                fm.InstalledDir
                             ));
                         }
                     }

diff --git a/FMScanner/Core/FMData.cs b/FMScanner/Core/FMData.cs
@@ -242,18 +242,22 @@ public sealed class FMToScan
     /// </summary>
     public readonly string CachePath;
 
-    public FMToScan(string path, bool forceFullScan, string cachePath)
+    public readonly string DisplayName;
+
+    public FMToScan(string path, bool forceFullScan, string cachePath, string displayName)
     {
         Path = path;
         ForceFullScan = forceFullScan;
         CachePath = cachePath;
+        DisplayName = displayName;
     }
 
-    public FMToScan(string path, bool forceFullScan)
+    public FMToScan(string path, bool forceFullScan, string displayName)
     {
         Path = path;
         ForceFullScan = forceFullScan;
         CachePath = "";
+        DisplayName = displayName;
     }
 }
 

diff --git a/FMScanner/Core/Scanner.cs b/FMScanner/Core/Scanner.cs
@@ -459,7 +459,7 @@ private List<ScannedFMDataAndError>
 
             if (progress != null)
             {
-                progressReport.FMName = missions[i].Path;
+                progressReport.FMName = missions[i].DisplayName;
                 progressReport.FMNumber = i + 1;
                 progressReport.FMsTotal = missions.Count;
                 progressReport.Percent = GetPercentFromValue_Int(missions.Count == 1 ? 0 : i + 1, missions.Count);