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

Improve tracking of line position in files. Added JournalPoke method.

Browse Source
This commit is contained in:
Xjph 2021-06-06 10:33:38 -02:30
parent 4ff438454f
commit 23ab4f593d
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ObservatoryCore/LogMonitor.cs
View File

@ -45,6 +45,7 @@ namespace Observatory
journalWatcher.EnableRaisingEvents = true; journalWatcher.EnableRaisingEvents = true;
statusWatcher.EnableRaisingEvents = true; statusWatcher.EnableRaisingEvents = true;
monitoring = true; monitoring = true;
JournalPoke();
} }
public void Stop() public void Stop()
@ -128,7 +129,7 @@ namespace Observatory
}; };
journalWatcher.Changed += LogChangedEvent; journalWatcher.Changed += LogChangedEvent;
journalWatcher.Created += LogCreatedEvent; journalWatcher.Created += LogCreatedEvent;
statusWatcher = new FileSystemWatcher(logDirectory.FullName, "Status.json") statusWatcher = new FileSystemWatcher(logDirectory.FullName, "Status.json")
{ {
NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size | NotifyFilters.LastAccess NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size | NotifyFilters.LastAccess
@ -156,7 +157,7 @@ namespace Observatory
throw new DirectoryNotFoundException($"Directory '{path}' does not exist."); throw new DirectoryNotFoundException($"Directory '{path}' does not exist.");
} }
} }
else if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
logDirectory = new DirectoryInfo(GetSavedGamesPath() + @"\Frontier Developments\Elite Dangerous"); logDirectory = new DirectoryInfo(GetSavedGamesPath() + @"\Frontier Developments\Elite Dangerous");
} }
@ -182,7 +183,7 @@ namespace Observatory
{ {
eventType = "JournalBase"; eventType = "JournalBase";
} }
var eventClass = journalTypes[eventType]; var eventClass = journalTypes[eventType];
MethodInfo journalRead = typeof(JournalReader).GetMethod(nameof(JournalReader.ObservatoryDeserializer)); MethodInfo journalRead = typeof(JournalReader).GetMethod(nameof(JournalReader.ObservatoryDeserializer));
MethodInfo journalGeneric = journalRead.MakeGenericMethod(eventClass); MethodInfo journalGeneric = journalRead.MakeGenericMethod(eventClass);
@ -191,19 +192,19 @@ namespace Observatory
var handler = JournalEntry; var handler = JournalEntry;
handler?.Invoke(this, journalEvent); handler?.Invoke(this, journalEvent);
} }
private void LogChangedEvent(object source, FileSystemEventArgs eventArgs) private void LogChangedEvent(object source, FileSystemEventArgs eventArgs)
{ {
var fileContent = ReadAllLines(eventArgs.FullPath); var fileContent = ReadAllLines(eventArgs.FullPath);
if (currentLine[eventArgs.FullPath] == -1) if (!currentLine.ContainsKey(eventArgs.FullPath))
{ {
currentLine[eventArgs.FullPath] = fileContent.Count - 1; currentLine.Add(eventArgs.FullPath, fileContent.Count - 1);
} }
foreach(string line in fileContent.Skip(currentLine[eventArgs.FullPath])) foreach (string line in fileContent.Skip(currentLine[eventArgs.FullPath]))
{ {
DeserializeAndInvoke(line); DeserializeAndInvoke(line);
} }
@ -226,7 +227,7 @@ namespace Observatory
private void LogCreatedEvent(object source, FileSystemEventArgs eventArgs) private void LogCreatedEvent(object source, FileSystemEventArgs eventArgs)
{ {
currentLine[eventArgs.FullPath] = 0; currentLine.Add(eventArgs.FullPath, 0);
LogChangedEvent(source, eventArgs); LogChangedEvent(source, eventArgs);
} }
@ -241,6 +242,33 @@ namespace Observatory
} }
} }
/// <summary>
/// Touches most recent journal file once every 250ms while LogMonitor is monitoring.
/// Forces pending file writes to flush to disk and fires change events for new journal lines.
/// </summary>
private async void JournalPoke()
{
await System.Threading.Tasks.Task.Run(() =>
{
while (monitoring)
{
FileInfo fileToPoke = null;
foreach (var file in new DirectoryInfo(Properties.Core.Default.JournalFolder).GetFiles("Journal.????????????.??.log"))
{
if (fileToPoke == null || string.Compare(file.Name, fileToPoke.Name) > 0)
{
fileToPoke = file;
}
}
using FileStream stream = fileToPoke.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
stream.Close();
System.Threading.Thread.Sleep(250);
}
});
}
private static string GetSavedGamesPath() private static string GetSavedGamesPath()
{ {
if (Environment.OSVersion.Version.Major < 6) throw new NotSupportedException(); if (Environment.OSVersion.Version.Major < 6) throw new NotSupportedException();