Merge pull request #532 from LogExperts/515-the-trusted-pluginsjson-is-written-to-and-loaded-from-appdatalogexpert-in-portable-mode

515 the trusted pluginsjson is written to and loaded from appdatalogexpert in portable mode

Author: Hirogen

src/LogExpert.Configuration/ConfigManager.cs

@@ -45,7 +45,7 @@ public FilterStarter (ColumnizerCallback callback, int minThreads)
         ThreadCount = Environment.ProcessorCount * 4;
         ThreadCount = minThreads;
         ThreadPool.GetMinThreads(out _, out var completion);
-        ThreadPool.SetMinThreads(minThreads, completion);
+        _ = ThreadPool.SetMinThreads(minThreads, completion);
         ThreadPool.GetMaxThreads(out _, out _);
     }
 
@@ -65,7 +65,7 @@ public FilterStarter (ColumnizerCallback callback, int minThreads)
 
     #region Public methods
 
-    public async void DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)
+    public async Task DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)
     {
         FilterResultLines.Clear();
         LastFilterLinesList.Clear();
@@ -85,8 +85,11 @@ public async void DoFilter (FilterParams filterParams, int startLine, int maxCou
         }
 
         var workStartLine = startLine;
+
         _progressLineCount = 0;
         _progressCallback = progressCallback;
+
+        var tasks = new List<Task>();
         while (workStartLine < startLine + maxCount)
         {
             if (workStartLine + interval > maxCount)
@@ -100,11 +103,14 @@ public async void DoFilter (FilterParams filterParams, int startLine, int maxCou
 
             _logger.Info(CultureInfo.InvariantCulture, "FilterStarter starts worker for line {0}, lineCount {1}", workStartLine, interval);
 
-            var filter = await Task.Run(() => DoWork(filterParams, workStartLine, interval, ThreadProgressCallback)).ConfigureAwait(false);
-            FilterDoneCallback(filter);
+            var capturedStartLine = workStartLine;
+            var capturedInterval = interval;
+
+            tasks.Add(Task.Run(() => DoWork(filterParams, capturedStartLine, capturedInterval, ThreadProgressCallback)));
             workStartLine += interval;
         }
 
+        await Task.WhenAll(tasks).ConfigureAwait(false);
         MergeResults();
     }
 
@@ -162,14 +168,6 @@ private Filter DoWork (FilterParams filterParams, int startLine, int maxCount, P
         return filter;
     }
 
-    private void FilterDoneCallback (Filter filter)
-    {
-        lock (_filterReadyList)
-        {
-            _filterReadyList.Add(filter);
-        }
-    }
-
     private void MergeResults ()
     {
         _logger.Info(CultureInfo.InvariantCulture, "Merging filter results.");

src/LogExpert.Core/Classes/Filter/FilterStarter.cs

@@ -2,6 +2,7 @@
 
 using LogExpert.Core.Classes.JsonConverters;
 using LogExpert.Core.Config;
+using LogExpert.Core.Interface;
 
 using Newtonsoft.Json;
 
@@ -47,13 +48,13 @@ public static class Persister
     /// <param name="preferences">The user preferences that determine the save location and other settings. This parameter cannot be <see
     /// langword="null"/>.</param>
     /// <returns>The full path of the file where the persistence data was saved.</returns>
-    public static string SavePersistenceData (string logFileName, PersistenceData persistenceData, Preferences preferences, string applicationStartupPath)
+    public static string SavePersistenceData (string logFileName, PersistenceData persistenceData, Preferences preferences, string sessionBaseDirectory)
     {
         ArgumentNullException.ThrowIfNull(preferences);
         ArgumentNullException.ThrowIfNull(persistenceData);
-        ArgumentException.ThrowIfNullOrWhiteSpace(applicationStartupPath);
+        ArgumentException.ThrowIfNullOrWhiteSpace(sessionBaseDirectory);
 
-        var fileName = persistenceData.SessionFileName ?? BuildPersisterFileName(logFileName, preferences, applicationStartupPath);
+        var fileName = persistenceData.SessionFileName ?? BuildPersisterFileName(logFileName, preferences, sessionBaseDirectory);
 
         if (preferences.SaveLocation == SessionSaveLocation.SameDir)
         {
@@ -84,12 +85,12 @@ public static string SavePersistenceDataWithFixedName (string persistenceFileNam
     /// <param name="logFileName">The name of the log file to load persistence data from. This value cannot be null.</param>
     /// <param name="preferences">The preferences used to determine the file path and loading behaviour. This value cannot be null.</param>
     /// <returns>The loaded <see cref="PersistenceData"/> object containing the persistence information.</returns>
-    public static PersistenceData LoadPersistenceData (string logFileName, Preferences preferences, string applicationStartupPath)
+    public static PersistenceData LoadPersistenceData (string logFileName, Preferences preferences, string sessionBaseDirectory)
     {
         ArgumentNullException.ThrowIfNull(preferences);
-        ArgumentNullException.ThrowIfNull(applicationStartupPath);
+        ArgumentNullException.ThrowIfNull(sessionBaseDirectory);
 
-        var fileName = BuildPersisterFileName(logFileName, preferences, applicationStartupPath);
+        var fileName = BuildPersisterFileName(logFileName, preferences, sessionBaseDirectory);
         return LoadInternal(fileName);
     }
 
@@ -99,12 +100,12 @@ public static PersistenceData LoadPersistenceData (string logFileName, Preferenc
     /// <param name="logFileName">The name of the log file used to determine the persistence data file.</param>
     /// <param name="preferences">The preferences that influence the file name generation. Cannot be <see langword="null"/>.</param>
     /// <returns>A <see cref="PersistenceData"/> object containing the loaded data.</returns>
-    public static PersistenceData LoadPersistenceDataOptionsOnly (string logFileName, Preferences preferences, string applicationStartupPath)
+    public static PersistenceData LoadPersistenceDataOptionsOnly (string logFileName, Preferences preferences, string sessionBaseDirectory)
     {
         ArgumentNullException.ThrowIfNull(preferences);
-        ArgumentNullException.ThrowIfNull(applicationStartupPath);
+        ArgumentNullException.ThrowIfNull(sessionBaseDirectory);
 
-        var fileName = BuildPersisterFileName(logFileName, preferences, applicationStartupPath);
+        var fileName = BuildPersisterFileName(logFileName, preferences, sessionBaseDirectory);
         return LoadInternal(fileName);
     }
 
@@ -138,6 +139,7 @@ public static PersistenceData LoadPersistenceDataFromFixedFile (string persisten
     /// <returns>A <see cref="PersistenceData"/> object representing the data loaded from the file.</returns>
     public static PersistenceData Load (string fileName)
     {
+        //Dont Call ActiveConfigDir here
         return LoadInternal(fileName);
     }
 
@@ -155,7 +157,7 @@ public static PersistenceData Load (string fileName)
     /// <param name="preferences">The preferences that determine the save location and directory structure for the persister file.</param>
     /// <returns>The full file path of the persister file, including the directory and file name, based on the specified log file
     /// name and preferences.</returns>
-    private static string BuildPersisterFileName (string logFileName, Preferences preferences, string applicationStartupPath)
+    private static string BuildPersisterFileName (string logFileName, Preferences preferences, string sessionBaseDirectory)
     {
         string dir;
         string file;
@@ -186,7 +188,7 @@ private static string BuildPersisterFileName (string logFileName, Preferences pr
                 }
             case SessionSaveLocation.ApplicationStartupDir:
                 {
-                    dir = Path.Join(applicationStartupPath, "sessionFiles");
+                    dir = sessionBaseDirectory;
                     file = dir + Path.DirectorySeparatorChar + BuildSessionFileNameFromPath(logFileName);
                     break;
                 }

src/LogExpert.Core/Classes/Persister/Persister.cs

@@ -1,3 +1,5 @@
+using System.Security;
+
 using LogExpert.Core.Interface;
 
 namespace LogExpert.Core.Classes.Persister;
@@ -30,6 +32,9 @@ public static ProjectValidationResult ValidateProject (ProjectData projectData,
 
         var result = new ProjectValidationResult();
 
+        // Cache drive letters once to avoid repeated expensive DriveInfo.GetDrives() calls
+        var cachedDriveLetters = GetFixedDriveLetters();
+
         foreach (var fileName in projectData.FileNames)
         {
             var normalizedPath = NormalizeFilePath(fileName);
@@ -55,7 +60,7 @@ public static ProjectValidationResult ValidateProject (ProjectData projectData,
             {
                 result.MissingFiles.Add(fileName);
 
-                var alternativePaths = FindAlternativePaths(fileName, projectData.ProjectFilePath);
+                var alternativePaths = FindAlternativePaths(fileName, projectData.ProjectFilePath, cachedDriveLetters);
                 result.PossibleAlternatives[fileName] = alternativePaths;
             }
         }
@@ -99,6 +104,29 @@ private static bool IsUri (string fileName)
                !uri.Scheme.Equals("file", StringComparison.OrdinalIgnoreCase);
     }
 
+    /// <summary>
+    /// Gets the list of fixed drive letters that are ready.
+    /// Extracted to avoid repeated expensive DriveInfo.GetDrives() calls.
+    /// </summary>
+    private static List<char> GetFixedDriveLetters ()
+    {
+        try
+        {
+            return [.. DriveInfo.GetDrives()
+                .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)
+                .Select(d => d.Name[0])];
+        }
+        catch(Exception ex) when (
+             ex is IOException
+             or UnauthorizedAccessException
+             or SecurityException
+             or DriveNotFoundException
+             or ArgumentNullException)
+        {
+            return [];
+        }
+    }
+
     /// <summary>
     /// Searches for alternative file paths that may correspond to the specified file name, considering common locations
     /// such as the project directory, its subdirectories, the user's Documents/LogExpert folder, alternate drive
@@ -112,9 +140,10 @@ private static bool IsUri (string fileName)
     /// whitespace.</param>
     /// <param name="projectFilePath">The full path to the project file used as a reference for searching related directories. Can be null or empty if
     /// project context is not available.</param>
+    /// <param name="cachedDriveLetters">Pre-computed list of fixed drive letters to avoid repeated DriveInfo.GetDrives() calls.</param>
     /// <returns>A list of strings containing the full paths of files found that match the specified file name in alternative
     /// locations. The list will be empty if no matching files are found.</returns>
-    private static List<string> FindAlternativePaths (string fileName, string projectFilePath)
+    private static List<string> FindAlternativePaths (string fileName, string projectFilePath, List<char> cachedDriveLetters)
     {
         var alternatives = new List<string>();
 
@@ -191,15 +220,10 @@ UnauthorizedAccessException or
         {
             try
             {
-                var driveLetters = DriveInfo.GetDrives()
-                    .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)
-                    .Select(d => d.Name[0])
-                    .ToList();
-
                 var originalDrive = Path.GetPathRoot(fileName)?[0];
                 var pathWithoutDrive = fileName.Length > 3 ? fileName[3..] : string.Empty;
 
-                foreach (var drive in driveLetters.Where(drive => drive != originalDrive && !string.IsNullOrEmpty(pathWithoutDrive)))
+                foreach (var drive in cachedDriveLetters.Where(drive => drive != originalDrive && !string.IsNullOrEmpty(pathWithoutDrive)))
                 {
                     var alternatePath = $"{drive}:\\{pathWithoutDrive}";
                     if (File.Exists(alternatePath) && !alternatives.Contains(alternatePath))

src/LogExpert.Core/Classes/Persister/ProjectFileValidator.cs

@@ -34,8 +34,18 @@ public interface IConfigManager
     /// Returns the application startup path combined with "portable" subdirectory.
     /// When a portableMode.json file exists in this directory, the application runs in portable mode.
     /// </remarks>
+    [Obsolete("Use PortableConfigDir instead. This property is misnamed and may cause confusion. It will be removed in a future version.")]
     string PortableModeDir { get; }
 
+    /// <summary>
+    /// Gets the directory path for portable mode settings.
+    /// </summary>
+    /// <remarks>
+    /// Returns the application startup path combined with "portable" subdirectory.
+    /// When a portableMode.json file exists in this directory, the application runs in portable mode.
+    /// </remarks>
+    string PortableConfigDir { get; }
+
     /// <summary>
     /// Gets the standard configuration directory path.
     /// </summary>
@@ -51,6 +61,20 @@ public interface IConfigManager
     /// <value>Returns "portableMode.json"</value>
     string PortableModeSettingsFileName { get; }
 
+    /// <summary>
+    /// {ApplicationStartupPath}/configuration/sessions/<br></br>
+    /// Used for session file storage in portable mode.
+    /// </summary>
+    string PortableSessionDir { get; }
+
+    /// <summary>
+    /// Gets the directory path where the current session's data is stored.
+    /// </summary>
+    /// <remarks>This property is useful for accessing files or configurations that are specific to the active
+    /// session. The returned path may vary between sessions and should not be assumed to be persistent across
+    /// application restarts.</remarks>
+    string ActiveSessionDir { get; }
+
     /// <summary>
     /// Initializes the ConfigManager with application-specific paths and screen information.
     /// This method must be called once before accessing Settings or other configuration.
@@ -164,6 +188,26 @@ public interface IConfigManager
     /// <remarks>Call this method to remove all entries from the recent files list, typically to reset user
     /// history or in response to a privacy-related action. After calling this method, the list of last open files will
     /// be empty until new files are opened.</remarks>
-
     void ClearLastOpenFilesList ();
+
+    /// <summary>
+    /// Returns the active configuration directory based on the current mode.
+    /// In portable mode: {AppDir}/configuration/
+    /// In normal mode: %APPDATA%/LogExpert/
+    /// </summary>
+    string ActiveConfigDir { get; }
+
+    /// <summary>
+    /// Copies configuration files from normal mode location (%APPDATA%/LogExpert/)
+    /// to the portable configuration directory ({AppDir}/configuration/).
+    /// Called when portable mode is activated and user confirms copy.
+    /// </summary>
+    void CopyConfigToPortable ();
+
+    /// <summary>
+    /// Moves configuration files from the portable directory ({AppDir}/configuration/)
+    /// back to normal mode locations (%APPDATA%/LogExpert/).
+    /// Called when portable mode is deactivated and user confirms migration.
+    /// </summary>
+    void MoveConfigFromPortable ();
 }