quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Fix file ordering assumptions which were broken by U11 (#66)

Browse Source 
* Fix file ordering assumptions which were broken by U11

With U11's new filename format for journal files, files don't sort right anymore and so the incorrect context was read during pre-reading, journals were read out-of-order during read-all or the wrong file was poked by JournalPoke for real-time. It seems that real-time still worked well enough (presumably the game client flushes journals semi reliably?)

Either way, ordering can be better guaranteed now.

* Update ObservatoryCore/LogMonitor.cs

Co-authored-by: Jonathan Miller <jmiller@xjph.net>
This commit is contained in:
F K 2022-03-16 07:20:39 -04:00 committed by GitHub
parent 1e7da8eae3
commit 7d56a2b91b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ObservatoryCore/LogMonitor.cs
View File

@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using Observatory.Framework;
using Observatory.Framework.Files;
@ -98,7 +99,7 @@ namespace Observatory
SetLogMonitorState(currentState | LogMonitorState.Batch);
DirectoryInfo logDirectory = GetJournalFolder(path);
var files = logDirectory.GetFiles("Journal.*.??.log");
var files = GetJournalFilesOrdered(logDirectory);
var readErrors = new List<(Exception ex, string file, string line)>();
foreach (var file in files)
{
@ -117,7 +118,7 @@ namespace Observatory
SetLogMonitorState(currentState | LogMonitorState.PreRead);
DirectoryInfo logDirectory = GetJournalFolder(Properties.Core.Default.JournalFolder);
var files = logDirectory.GetFiles("Journal.*.??.log");
var files = GetJournalFilesOrdered(logDirectory);
// Read at most the last two files (in case we were launched after the game and the latest
// journal is mostly empty) but keeping only the lines since the last FSDJump.
@ -425,7 +426,9 @@ namespace Observatory
{
FileInfo fileToPoke = null;
foreach (var file in journalFolder.GetFiles("Journal.*.??.log"))
// TODO: If we now have reliable file ordering guarantees, do we need this loop? Could we
// just poke file in the last slot of the array returned by GetJournalFilesOrdered?
foreach (var file in GetJournalFilesOrdered(journalFolder))
{
if (fileToPoke == null || string.Compare(file.Name, fileToPoke.Name) > 0)
{
@ -456,6 +459,13 @@ namespace Observatory
}
}
private IEnumerable<FileInfo> GetJournalFilesOrdered(DirectoryInfo journalFolder)
{
return from file in journalFolder.GetFiles("Journal.*.??.log")
orderby file.LastWriteTime
select file;
}
[DllImport("shell32.dll", CharSet = CharSet.Auto)]
private static extern int SHGetKnownFolderPath(ref Guid id, int flags, IntPtr token, out IntPtr path);