Skip to content

fixes missing ApplicationStartup.Path, moved Persister to own Test Pr… #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hirogen merged 5 commits into from
Dec 3, 2025
Merged

fixes missing ApplicationStartup.Path, moved Persister to own Test Pr… #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a438e8
fixes missing ApplicationStartup.Path, moved Persister to own Test Pr…
Dec 3, 2025
7027bcb
chore: update plugin hashes [skip ci]
github-actions[bot] Dec 3, 2025
a089d33
path.join.. never combine
Dec 3, 2025
9b54d38
Merge branch '505-tail-following-stops-working-after-a-while-for-logs…
Dec 3, 2025
795820f
chore: update plugin hashes [skip ci]
github-actions[bot] Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/LogExpert.Core/Classes/Persister/Persister.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

namespace LogExpert.Core.Classes.Persister;

//Todo Move Persister to its own assembly LogExpert.Persister
public static class Persister
{
#region Fields
Expand Down Expand Up @@ -46,12 +47,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)
public static string SavePersistenceData (string logFileName, PersistenceData persistenceData, Preferences preferences, string applicationStartupPath)
{
ArgumentNullException.ThrowIfNull(preferences);
ArgumentNullException.ThrowIfNull(persistenceData);
ArgumentException.ThrowIfNullOrWhiteSpace(applicationStartupPath);

var fileName = persistenceData.SessionFileName ?? BuildPersisterFileName(logFileName, preferences);
var fileName = persistenceData.SessionFileName ?? BuildPersisterFileName(logFileName, preferences, applicationStartupPath);

if (preferences.SaveLocation == SessionSaveLocation.SameDir)
{
Expand Down Expand Up @@ -82,10 +84,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)
public static PersistenceData LoadPersistenceData (string logFileName, Preferences preferences, string applicationStartupPath)
{
ArgumentNullException.ThrowIfNull(preferences);
var fileName = BuildPersisterFileName(logFileName, preferences);
ArgumentNullException.ThrowIfNull(applicationStartupPath);

var fileName = BuildPersisterFileName(logFileName, preferences, applicationStartupPath);
return LoadInternal(fileName);
}

Expand All @@ -95,10 +99,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)
public static PersistenceData LoadPersistenceDataOptionsOnly (string logFileName, Preferences preferences, string applicationStartupPath)
{
ArgumentNullException.ThrowIfNull(preferences);
var fileName = BuildPersisterFileName(logFileName, preferences);
ArgumentNullException.ThrowIfNull(applicationStartupPath);

var fileName = BuildPersisterFileName(logFileName, preferences, applicationStartupPath);
return LoadInternal(fileName);
}

Expand Down Expand Up @@ -149,7 +155,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)
private static string BuildPersisterFileName (string logFileName, Preferences preferences, string applicationStartupPath)
{
string dir;
string file;
Expand Down Expand Up @@ -180,8 +186,7 @@ private static string BuildPersisterFileName (string logFileName, Preferences pr
}
case SessionSaveLocation.ApplicationStartupDir:
{
//TODO Add Application.StartupPath as Variable
dir = string.Empty;// Application.StartupPath + Path.DirectorySeparatorChar + "sessionfiles";
dir = Path.Join(applicationStartupPath, "sessionFiles");
file = dir + Path.DirectorySeparatorChar + BuildSessionFileNameFromPath(logFileName);
break;
}
Expand Down Expand Up @@ -213,12 +218,13 @@ PathTooLongException or
/// underscores, and the file name is appended with the ".lxp" extension.</returns>
private static string BuildSessionFileNameFromPath (string logFileName)
{
var result = logFileName;
result = result.Replace(Path.DirectorySeparatorChar, '_');
result = result.Replace(Path.AltDirectorySeparatorChar, '_');
result = result.Replace(Path.VolumeSeparatorChar, '_');
result += ".lxp";
return result;
var result = new StringBuilder();
_ = result.Append(logFileName);
_ = result.Replace(Path.DirectorySeparatorChar, '_');
_ = result.Replace(Path.AltDirectorySeparatorChar, '_');
_ = result.Replace(Path.VolumeSeparatorChar, '_');
_ = result.Append(".lxp");
return result.ToString();
}

/// <summary>
Expand Down
26 changes: 26 additions & 0 deletions src/LogExpert.Persister.Tests/LogExpert.Persister.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<IsTestProject>true</IsTestProject>
<AssemblyTitle>LogExpert.Persister.Tests</AssemblyTitle>
<RootNamespace>LogExpert.Persister.Tests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Moq" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\LogExpert.Core\LogExpert.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Using Include="NUnit.Framework" />
</ItemGroup>

</Project>
Loading