Skip to content

Commit 6ed1491

Browse files
authored
Merge branch 'Development' into rename-project-to-session
2 parents 843a3a3 + 7347827 commit 6ed1491

9 files changed

Lines changed: 52 additions & 472 deletions

File tree

src/Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageVersion Include="NUnit.ConsoleRunner" Version="3.20.1" />
2424
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
2525
<PackageVersion Include="SSH.NET" Version="2025.1.0" />
26+
<PackageVersion Include="System.CommandLine" Version="2.0.8" />
2627
<PackageVersion Include="System.Drawing.Common" Version="10.0.7" />
2728
<PackageVersion Include="System.Resources.Extensions" Version="10.0.7" />
2829
<PackageVersion Include="Vanara.Library" Version="5.0.4" />

src/LogExpert.UI/Services/FileOperationService/FileOperationService.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,19 @@ public LogWindow AddTempFileTab (string fileName, string title)
182182
return null;
183183
}
184184

185+
// Session files (.lxj) aren't logs — dispatch them to the project loader and
186+
// continue with only the log files. Without this, the .lxj would be treated as
187+
// a raw log line in the multi-file tab.
188+
if (fileNames.Any(f => f.EndsWith(".lxj", StringComparison.OrdinalIgnoreCase)))
189+
{
190+
foreach (var sessionFile in fileNames.Where(f => f.EndsWith(".lxj", StringComparison.OrdinalIgnoreCase)))
191+
{
192+
_projectFileCallback(sessionFile, false);
193+
}
194+
var logs = fileNames.Where(f => !f.EndsWith(".lxj", StringComparison.OrdinalIgnoreCase)).ToArray();
195+
return logs.Length > 0 ? AddMultiFileTab(logs) : null;
196+
}
197+
185198
EncodingOptions encodingOptions = new();
186199
FillDefaultEncodingFromSettings(encodingOptions);
187200

src/LogExpert/Classes/CommandLine/CmdLine.cs

Lines changed: 0 additions & 199 deletions
This file was deleted.

src/LogExpert/Classes/CommandLine/CmdLineException.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/LogExpert/Classes/CommandLine/CmdLineInt.cs

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)