Minor tweaks to analyser performance

Author: Iridium-IO

.gitignore

@@ -9,6 +9,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+CompactGUI.TestingGround/
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

CompactGUI.Core/Analyser.cs

@@ -31,9 +31,8 @@ public Analyser(string folder)
                 .AsParallel()
                 .WithCancellation(cancellationToken)
                 .Select(AnalyseFile)
-                .Where(details => details != null)
-                .Cast<AnalysedFileDetails>()
-                .ToList<AnalysedFileDetails>();
+                .OfType<AnalysedFileDetails>()
+                .ToList();
 
             CompressedBytes = fileDetails.Sum(f => f.CompressedSize);
             UncompressedBytes = fileDetails.Sum(f => f.UncompressedSize);

CompactGUI.Core/CompactGUI.Core.csproj

@@ -12,6 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="ZLinq" Version="1.4.10" />
   </ItemGroup>
 
 </Project>

CompactGUI.Core/SharedMethods.cs

@@ -94,8 +94,8 @@ static bool IsOneDriveFolder(string folderPath)
     public static void PreventSleep()
     {
         PInvoke.SetThreadExecutionState(
-            EXECUTION_STATE.ES_CONTINUOUS | 
-            EXECUTION_STATE.ES_SYSTEM_REQUIRED | 
+            EXECUTION_STATE.ES_CONTINUOUS |
+            EXECUTION_STATE.ES_SYSTEM_REQUIRED |
             EXECUTION_STATE.ES_DISPLAY_REQUIRED);
     }
 
@@ -116,31 +116,35 @@ public static void RestoreSleep()
 
 
 
-    public static List<string> AsShortPathNames(this IEnumerable<string> filesList)
+    public static IEnumerable<string> AsShortPathNames(this IEnumerable<string> filesList)
     {
-        return filesList
-            .Select(file => (file.Length >= 255 ? GetShortPath(file) ?? file : file))
-            .ToList();
+        return filesList.Select(file => (file.Length >= 255 ? GetShortPath(file) ?? file : file));
     }
 
 
-    private static string? GetShortPath(string filePath)
+    private static string GetShortPath(string filePath)
     {
-        if (string.IsNullOrWhiteSpace(filePath)) return null;
+        const string LongPathPrefix = @"\\?\";
+        ReadOnlySpan<char> longPathPrefixSpan = LongPathPrefix;
 
-        bool addPrefix = filePath.Length >= 255 && !filePath.StartsWith(@"\\?\");
-        if (addPrefix) filePath = @"\\?\" + filePath;
+        if (string.IsNullOrWhiteSpace(filePath)) return filePath;
+        ReadOnlySpan<char> filePathSpan = filePath;
 
-        Span<char> shortPath = stackalloc char[1024];
-        uint res = PInvoke.GetShortPathName(filePath, shortPath);
-        if (res == 0) return null;
+        bool addPrefix = filePathSpan.Length >= 255 && !filePathSpan.StartsWith(longPathPrefixSpan, StringComparison.Ordinal);
+        string pathToUse = addPrefix ? LongPathPrefix + filePath : filePath;
 
-        var result = new string(shortPath.Slice(0, (int)res));
-        return addPrefix && result.StartsWith(@"\\?\") ? result[4..] : result;
+        Span<char> shortPath = stackalloc char[1024];
+        uint res = PInvoke.GetShortPathName(pathToUse, shortPath);
+        if (res == 0) return filePath;
 
+        ReadOnlySpan<char> resultSpan = shortPath[..(int)res];
+        return addPrefix && resultSpan.StartsWith(longPathPrefixSpan, StringComparison.Ordinal)
+            ? resultSpan[longPathPrefixSpan.Length..].ToString()
+            : resultSpan.ToString();
     }
 
 
+
     public static unsafe uint GetClusterSize(string folderPath)
     {
         UInt32 lpSectorsPerCluster;
@@ -163,7 +167,7 @@ public static unsafe long GetFileSizeOnDisk(string file)
     {
         uint highOrder;
         uint lowOrder = PInvoke.GetCompressedFileSize(file, &highOrder);
-        if (lowOrder == 0xFFFFFFFF && (Marshal.GetLastWin32Error() != 0)) return -1;    
+        if (lowOrder == 0xFFFFFFFF && (Marshal.GetLastWin32Error() != 0)) return -1;
         return ((long)highOrder << 32) | lowOrder;
     }
 
@@ -204,7 +208,7 @@ public static bool HasDirectoryWritePermission(string folderName)
             return writeAllowed && !writeDenied;
 
         }
-        catch (UnauthorizedAccessException) { return false;}
+        catch (UnauthorizedAccessException) { return false; }
     }
 
 

CompactGUI.slnx

@@ -8,6 +8,7 @@
   </Configurations>
   <Project Path="CompactGUI.Core/CompactGUI.Core.csproj" />
   <Project Path="CompactGUI.CoreVB/CompactGUI.CoreVB.vbproj" />
+  <Project Path="CompactGUI.TestingGround/CompactGUI.TestingGround.csproj" Id="279814db-5112-4c5f-b013-df80d73bcf37" />
   <Project Path="CompactGUI.Watcher/CompactGUI.Watcher.vbproj">
     <BuildDependency Project="CompactGUI.CoreVB/CompactGUI.CoreVB.vbproj" />
   </Project>