diff --git a/Pulsar/Features/FileHandlerService.cs b/Pulsar/Features/FileHandlerService.cs index 47f9e68..4fdc846 100644 --- a/Pulsar/Features/FileHandlerService.cs +++ b/Pulsar/Features/FileHandlerService.cs @@ -1,3 +1,6 @@ +using Pulsar.Features.ModulesInfo; +using Pulsar.Features.ShipLocker; + namespace Pulsar.Features; public interface IFileHandler @@ -7,7 +10,11 @@ public interface IFileHandler public interface IFileHandlerService : IFileHandler; -public class FileHandlerService(ILogger logger, IStatusService statusService) : IFileHandlerService +public class FileHandlerService( + ILogger logger, + IStatusService statusService, + IShipLockerService shipLockerService, + IModulesInfoService modulesService) : IFileHandlerService { public static readonly string MarketFileName = "Market.json"; public static readonly string StatusFileName = "Status.json"; @@ -22,7 +29,7 @@ public class FileHandlerService(ILogger logger, IStatusServi public static readonly string ModulesInfoFileName = "ModulesInfo.json"; public static readonly string ShipLockerFileName = "ShipLocker.json"; public static readonly string NavRouteFileName = "NavRoute.json"; - + public static readonly string[] AllFileNames = [ MarketFileName, @@ -38,21 +45,23 @@ public class FileHandlerService(ILogger logger, IStatusServi ShipLockerFileName, NavRouteFileName ]; - + private readonly Dictionary Handlers = new() { - { StatusFileName, statusService } + { StatusFileName, statusService }, + { ModulesInfoFileName, modulesService }, + { ShipLockerFileName, shipLockerService } }; - + public async Task HandleFile(string path) { var fileInfo = new FileInfo(path); var fileName = fileInfo.Name; - + // only scan the file if we recognize it var match = AllFileNames.FirstOrDefault( f => fileName.StartsWith(f, StringComparison.InvariantCultureIgnoreCase)); - + if (string.IsNullOrWhiteSpace(match)) { logger.LogWarning("File {FileName} is not recognized", fileName); @@ -65,7 +74,7 @@ public class FileHandlerService(ILogger logger, IStatusServi await handler.HandleFile(fileInfo.Name); return; } - + logger.LogInformation("File {FileName} was not handled", fileName); } -} +} \ No newline at end of file diff --git a/Pulsar/Features/Interfaces/IJournalHandler.cs b/Pulsar/Features/Interfaces/IJournalHandler.cs index d66d19d..1997cf4 100644 --- a/Pulsar/Features/Interfaces/IJournalHandler.cs +++ b/Pulsar/Features/Interfaces/IJournalHandler.cs @@ -8,7 +8,7 @@ namespace Pulsar.Features; public interface IJournalHandler : IFileHandler { string FileName { get; } - Task HandleFile(string filePath); + public bool ValidateFile(string filePath); } @@ -20,4 +20,39 @@ public interface IJournalHandler : IJournalHandler where T: IJournal { Task Get(); +} + +public abstract class JournalHandlerBase(ILogger logger) : IJournalHandler + where T: IJournal +{ + public abstract string FileName { get; } + + public abstract Task HandleFile(string filePath); + + public bool ValidateFile(string filePath) + { + if (!File.Exists(filePath)) + { + logger.LogWarning("Journal file {JournalFile} does not exist", filePath); + return false; + } + + var fileInfo = new FileInfo(filePath); + + if (!string.Equals(fileInfo.Name, FileName, StringComparison.InvariantCultureIgnoreCase)) + { + logger.LogWarning("Journal file {JournalFile} is not a {NameOfCurrentHandler} file", filePath, nameof(T)); + return false; + } + + if (fileInfo.Length == 0) + { + logger.LogWarning("Journal file {JournalFile} is empty", filePath); + return false; + } + + return true; + } + + public abstract Task Get(); } \ No newline at end of file diff --git a/Pulsar/Features/ModulesInfo/ModulesInfoService.cs b/Pulsar/Features/ModulesInfo/ModulesInfoService.cs index 1050403..6ad9df2 100644 --- a/Pulsar/Features/ModulesInfo/ModulesInfoService.cs +++ b/Pulsar/Features/ModulesInfo/ModulesInfoService.cs @@ -4,21 +4,47 @@ using Observatory.Framework.Files; public interface IModulesInfoService : IJournalHandler; -public class ModulesInfoService : IModulesInfoService +public class ModulesInfoService( + ILogger logger, + IOptions options, + IEventHubContext hub) + : JournalHandlerBase(logger), IModulesInfoService { - public string FileName => FileHandlerService.ModulesInfoFileName; - public Task HandleFile(string filePath) + public override string FileName => FileHandlerService.ModulesInfoFileName; + + public override async Task HandleFile(string filePath) { - throw new NotImplementedException(); - } - - public bool ValidateFile(string filePath) - { - throw new NotImplementedException(); + if (!ValidateFile(filePath)) + { + return; + } + + var file = File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + var moduleInfo = await JsonSerializer.DeserializeAsync(file); + + if (moduleInfo == null) + { + logger.LogWarning("Failed to deserialize status file {FilePath}", filePath); + return; + } + + await hub.Clients.All.ModuleInfoUpdated(moduleInfo); } - public Task Get() + public override async Task Get() { - throw new NotImplementedException(); + var moduleInfoFile = Path.Combine(options.Value.JournalDirectory, FileName); + + if (!ValidateFile(moduleInfoFile)) + { + return new ModuleInfoFile(); + } + + await using var file = File.Open(moduleInfoFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + var moduleInfo = await JsonSerializer.DeserializeAsync(file); + if (moduleInfo != null) return moduleInfo; + + logger.LogWarning("Failed to deserialize module info file {ModuleInfoFile}", moduleInfoFile); + return new ModuleInfoFile(); } } \ No newline at end of file diff --git a/Pulsar/Features/ShipLocker/ShipLockerController.cs b/Pulsar/Features/ShipLocker/ShipLockerController.cs new file mode 100644 index 0000000..4056b1f --- /dev/null +++ b/Pulsar/Features/ShipLocker/ShipLockerController.cs @@ -0,0 +1,12 @@ +namespace Pulsar.Features.ShipLocker; + +[ApiController] +[Route("api/[controller]")] +public class ShipLockerController(IShipLockerService shipLockerService) : ControllerBase +{ + [HttpGet] + public async Task Get() + { + return Ok(await shipLockerService.Get()); + } +} \ No newline at end of file diff --git a/Pulsar/Features/ShipLocker/ShipLockerService.cs b/Pulsar/Features/ShipLocker/ShipLockerService.cs new file mode 100644 index 0000000..632da8d --- /dev/null +++ b/Pulsar/Features/ShipLocker/ShipLockerService.cs @@ -0,0 +1,21 @@ +namespace Pulsar.Features.ShipLocker; + +using Observatory.Framework.Files.Journal.Odyssey; + +public interface IShipLockerService : IJournalHandler; + +public class ShipLockerService(ILogger logger) + : JournalHandlerBase(logger), IShipLockerService +{ + public override string FileName => FileHandlerService.ShipLockerFileName; + + public override Task Get() + { + throw new NotImplementedException(); + } + + public override Task HandleFile(string filePath) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Pulsar/Features/Status/StatusService.cs b/Pulsar/Features/Status/StatusService.cs index 1ab3208..88fd661 100644 --- a/Pulsar/Features/Status/StatusService.cs +++ b/Pulsar/Features/Status/StatusService.cs @@ -3,58 +3,35 @@ namespace Pulsar.Features.Status; using Observatory.Framework.Files; public interface IStatusService : IJournalHandler; -public class StatusService(ILogger logger, IOptions options, IEventHubContext hub) : IStatusService + +public class StatusService(ILogger logger, IOptions options, IEventHubContext hub) + : JournalHandlerBase(logger), IStatusService { - public string FileName => FileHandlerService.StatusFileName; - - public async Task HandleFile(string filePath) + public override string FileName => FileHandlerService.StatusFileName; + + public override async Task HandleFile(string filePath) { if (!ValidateFile(filePath)) { return; } - + var file = File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - var status = await JsonSerializer.DeserializeAsync(file); - + var status = await JsonSerializer.DeserializeAsync(file); + if (status == null) { logger.LogWarning("Failed to deserialize status file {FilePath}", filePath); return; } - + await hub.Clients.All.StatusUpdated(status); } - public bool ValidateFile(string filePath) - { - if (!File.Exists(filePath)) - { - logger.LogWarning("Status file {StatusFile} does not exist", filePath); - return false; - } - - var fileInfo = new FileInfo(filePath); - - if (!string.Equals(fileInfo.Name, FileName, StringComparison.InvariantCultureIgnoreCase)) - { - logger.LogWarning("File {StatusFile} is not a status file", filePath); - return false; - } - - if (fileInfo.Length == 0) - { - logger.LogWarning("Status file {StatusFile} is empty", filePath); - return false; - } - - return true; - } - - public async Task Get() + public override async Task Get() { var statusFile = Path.Combine(options.Value.JournalDirectory, FileName); - + if (!ValidateFile(statusFile)) { return new Status(); @@ -63,9 +40,8 @@ public class StatusService(ILogger logger, IOptions(file); if (status != null) return status; - + logger.LogWarning("Failed to deserialize status file {StatusFile}", statusFile); return new Status(); } - -} +} \ No newline at end of file