diff --git a/Botanist/Botanist.cs b/Botanist/Botanist.cs index c70de78..72750e3 100644 --- a/Botanist/Botanist.cs +++ b/Botanist/Botanist.cs @@ -1,4 +1,5 @@ -using System.Collections.ObjectModel; +namespace Botanist; + using Observatory.Framework; using Observatory.Framework.Files.Journal; using Observatory.Framework.Files.Journal.Exploration; @@ -8,7 +9,6 @@ using Observatory.Framework.Files.Journal.Startup; using Observatory.Framework.Files.Journal.Travel; using Observatory.Framework.Files.ParameterTypes; -namespace Botanist; public class Botanist : IObservatoryWorker { @@ -77,8 +77,6 @@ public class Botanist : IObservatoryWorker private const int DEFAULT_COLONY_DISTANCE = 100; - ObservableCollection GridCollection; - private PluginUI pluginUI; private Guid? samplerStatusNotification; private BotanistSettings botanistSettings = new() @@ -93,8 +91,6 @@ public class Botanist : IObservatoryWorker public string Version => typeof(Botanist).Assembly.GetName().Version.ToString(); - public PluginUI PluginUI => pluginUI; - public object Settings { get => botanistSettings; @@ -246,12 +242,6 @@ public class Botanist : IObservatoryWorker public void Load(IObservatoryCore observatoryCore) { - GridCollection = new(); - BotanistGrid uiObject = new(); - - GridCollection.Add(uiObject); - pluginUI = new PluginUI(GridCollection); - BioPlanets = new(); Core = observatoryCore; diff --git a/ObservatoryFramework/Files/Journal/JournalBase.cs b/ObservatoryFramework/Files/Journal/JournalBase.cs index ba975c0..be1885f 100644 --- a/ObservatoryFramework/Files/Journal/JournalBase.cs +++ b/ObservatoryFramework/Files/Journal/JournalBase.cs @@ -1,17 +1,18 @@ -using System.Text.Json.Serialization; -using Observatory.Framework.Files.Journal.Combat; -using Observatory.Framework.Files.Journal.Exploration; -using Observatory.Framework.Files.Journal.FleetCarrier; -using Observatory.Framework.Files.Journal.Odyssey; -using Observatory.Framework.Files.Journal.Other; -using Observatory.Framework.Files.Journal.Powerplay; -using Observatory.Framework.Files.Journal.Squadron; -using Observatory.Framework.Files.Journal.Startup; -using Observatory.Framework.Files.Journal.StationServices; -using Observatory.Framework.Files.Journal.Trade; -using Observatory.Framework.Files.Journal.Travel; +namespace Observatory.Framework.Files.Journal; + +using System.Text.Json.Serialization; +using Combat; +using Exploration; +using FleetCarrier; +using Odyssey; +using Other; +using Powerplay; +using Squadron; +using Startup; +using StationServices; +using Trade; +using Travel; -namespace Observatory.Framework.Files.Journal; [JsonDerivedType(typeof(BackpackFile))] [JsonDerivedType(typeof(CargoFile))] [JsonDerivedType(typeof(FCMaterialsFile))] diff --git a/ObservatoryFramework/Interfaces.cs b/ObservatoryFramework/Interfaces.cs index 9f4c11d..63bd7de 100644 --- a/ObservatoryFramework/Interfaces.cs +++ b/ObservatoryFramework/Interfaces.cs @@ -33,11 +33,6 @@ public interface IObservatoryPlugin /// public string Version { get; } - /// - /// Reference to plugin UI to display within its tab. - /// - public PluginUI PluginUI { get; } - /// /// Receives data sent by other plugins. /// diff --git a/ObservatoryFramework/PluginUI.cs b/ObservatoryFramework/PluginUI.cs deleted file mode 100644 index 6203f60..0000000 --- a/ObservatoryFramework/PluginUI.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System.Collections.ObjectModel; - -namespace Observatory.Framework; - -/// -/// Class permitting plugins to provide their UI, if any, to Observatory Core. -/// -public class PluginUI -{ - /// - /// Type of UI used by plugin. - /// - public readonly UIType PluginUIType; - - /// - /// UI object used by plugins with UIType.Panel. - /// - public object UI; - - /// - /// Collection bound to DataGrid used by plugins with UIType.Basic. - /// Objects in collection should be of a class defined within the plugin consisting of string properties.
Each object is a single row, and the property names are used as column headers. - /// - public ObservableCollection DataGrid; - - /// - /// Instantiate PluginUI of UIType.Basic. - /// - /// - /// Collection bound to DataGrid used by plugins with UIType.Basic. - /// Objects in collection should be of a class defined within the plugin consisting of string properties.
Each object is a single row, and the property names are used as column headers. - /// - public PluginUI(ObservableCollection DataGrid) - { - PluginUIType = UIType.Basic; - this.DataGrid = DataGrid; - } - - /// - /// Instantiate PluginUI of specified UIType. - /// (Untested/not implemented) - /// - /// UIType for plugin. - /// Avalonia control to place in plugin tab. - public PluginUI(UIType uiType, object UI) - { - PluginUIType = uiType; - this.UI = UI; - } - - /// - /// Options for plugin UI types. - /// - public enum UIType - { - /// - /// No UI. Tab will not be added to list. - /// - None = 0, - /// - /// Simple listview, to which items can be added or removed. - /// - Basic = 1, - /// - /// Panel control which is placed in plugin tab. - /// - Panel = 2, - /// - /// UI used by Observatory Core settings tab.
- /// Not intended for use by plugins. - /// - Core = 3 - } -} \ No newline at end of file diff --git a/Pulsar/Features/EventsHub.cs b/Pulsar/Features/EventsHub.cs new file mode 100644 index 0000000..6121b1e --- /dev/null +++ b/Pulsar/Features/EventsHub.cs @@ -0,0 +1,51 @@ +namespace Pulsar.Features; + +using Observatory.Framework.Files; +using Observatory.Framework.Files.Journal; +using Microsoft.AspNetCore.SignalR; + +public class EventsHub : Hub +{ + public async Task StatusUpdated(Observatory.Framework.Files.Status status) => await Clients.All.StatusUpdated(status); + + public async Task OutfittingUpdated(OutfittingFile outfitting) => await Clients.All.OutfittingUpdated(outfitting); + + public async Task ShipyardUpdated(ShipyardFile shipyard) => await Clients.All.ShipyardUpdated(shipyard); + + public async Task NavRouteUpdated(NavRouteFile navRoute) => await Clients.All.NavRouteUpdated(navRoute); + + public async Task MarketUpdated(MarketFile market) => await Clients.All.MarketUpdated(market); + + public async Task JournalUpdated(IReadOnlyCollection journals) => await Clients.All.JournalUpdated(journals); + + public async Task ModuleInfoUpdated(ModuleInfoFile moduleInfo) => await Clients.All.ModuleInfoUpdated(moduleInfo); + + public async Task FleetCarrierUpdated(FCMaterialsFile fleetCarrier) => await Clients.All.FleetCarrierUpdated(fleetCarrier); + + public async Task CargoUpdated(CargoFile cargo) => await Clients.All.CargoUpdated(cargo); + + public async Task BackpackUpdated(BackpackFile backpack) => await Clients.All.BackpackUpdated(backpack); +} + +public interface IEventHub +{ + Task StatusUpdated(Observatory.Framework.Files.Status status); + + Task OutfittingUpdated(OutfittingFile outfitting); + + Task ShipyardUpdated(ShipyardFile shipyard); + + Task NavRouteUpdated(NavRouteFile navRoute); + + Task MarketUpdated(MarketFile market); + + Task JournalUpdated(IReadOnlyCollection journals); + + Task ModuleInfoUpdated(ModuleInfoFile moduleInfo); + + Task FleetCarrierUpdated(FCMaterialsFile fleetCarrier); + + Task CargoUpdated(CargoFile cargo); + + Task BackpackUpdated(BackpackFile backpack); +} \ No newline at end of file diff --git a/Pulsar/Features/Status/StatusController.cs b/Pulsar/Features/Status/StatusController.cs new file mode 100644 index 0000000..20487c3 --- /dev/null +++ b/Pulsar/Features/Status/StatusController.cs @@ -0,0 +1,12 @@ +namespace Pulsar.Features.Status; + +[ApiController] +[Route("api/status")] +public class StatusController : Controller +{ + [HttpGet] + public IActionResult Get() + { + return Ok(); + } +} \ No newline at end of file diff --git a/Pulsar/Global.Usings.cs b/Pulsar/Global.Usings.cs index e289899..cc04e2d 100644 --- a/Pulsar/Global.Usings.cs +++ b/Pulsar/Global.Usings.cs @@ -3,4 +3,5 @@ global using Pulsar.Utils; global using System.Text; global using System.Text.Json; global using System.Text.Json.Nodes; -global using System.Text.Json.Serialization; \ No newline at end of file +global using System.Text.Json.Serialization; +global using Microsoft.AspNetCore.Mvc; diff --git a/Pulsar/Program.cs b/Pulsar/Program.cs index 4ff2411..6565583 100644 --- a/Pulsar/Program.cs +++ b/Pulsar/Program.cs @@ -1,21 +1,18 @@ -if (args.Length > 0 && File.Exists(args[0])) -{ - var fileInfo = new FileInfo(args[0]); - if (fileInfo.Extension is ".eop" or ".zip") - File.Copy(fileInfo.FullName, Path.Join(AppDomain.CurrentDomain.BaseDirectory, "plugins", fileInfo.Name)); -} +using Lamar.Microsoft.DependencyInjection; -try +var builder = WebApplication.CreateBuilder(args); + +builder.Services.AddLamar(); +builder.Services.AddControllers(); +builder.Services.AddSignalR(); +builder.Services.AddDbContext(); +builder.Services.Configure(builder.Configuration.GetSection(nameof(Pulsar))); + +var app = builder.Build(); + +await app.RunAsync(); + +public class PulsarConfiguration { - WebApplicationBuilder builder = WebApplication.CreateSlimBuilder(args); - - var app = builder.Build(); - - SettingsManager.Load(); - - await app.RunAsync(); -} -catch (Exception ex) -{ - LoggingUtils.LogError(ex, ""); + public string JournalDirectory { get; set; } } \ No newline at end of file diff --git a/Pulsar/Pulsar.csproj b/Pulsar/Pulsar.csproj index d21ab34..b1ec4de 100644 --- a/Pulsar/Pulsar.csproj +++ b/Pulsar/Pulsar.csproj @@ -12,5 +12,13 @@ + + + + + + + + \ No newline at end of file diff --git a/Pulsar/PulsarContext.cs b/Pulsar/PulsarContext.cs new file mode 100644 index 0000000..e2e250f --- /dev/null +++ b/Pulsar/PulsarContext.cs @@ -0,0 +1,8 @@ +using Microsoft.EntityFrameworkCore; + +/// +/// An in-memory database context for Pulsar. +/// +public class PulsarContext : DbContext +{ +} \ No newline at end of file diff --git a/Pulsar/Utils/JournalReader.cs b/Pulsar/Utils/JournalReader.cs index 588f3df..0185f3c 100644 --- a/Pulsar/Utils/JournalReader.cs +++ b/Pulsar/Utils/JournalReader.cs @@ -3,7 +3,7 @@ using Observatory.Framework.Files.Journal.Exploration; namespace Pulsar.Utils; -public class JournalReader +public static class JournalReader { public static TJournal ObservatoryDeserializer(string json) where TJournal : JournalBase { diff --git a/Pulsar/Utils/SettingsManager.cs b/Pulsar/Utils/SettingsManager.cs deleted file mode 100644 index ab9c0fd..0000000 --- a/Pulsar/Utils/SettingsManager.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Pulsar.Utils; - -internal static class SettingsManager -{ - internal static void Save() - { - throw new NotImplementedException(); - } - - internal static void Load() - { - throw new NotImplementedException(); - } -} \ No newline at end of file diff --git a/Pulsar/appSettings.json b/Pulsar/appSettings.json new file mode 100644 index 0000000..1441e6e --- /dev/null +++ b/Pulsar/appSettings.json @@ -0,0 +1,6 @@ +{ + "Pulsar": { + // C:\Users\User Name\Saved Games\Frontier Developments\Elite Dangerous\ + "JournalDirectory": "/home/minijack/Games/lutris/elite-dangerous/drive_c/users/minijack/Saved Games/Frontier Developments/Elite Dangerous/", + } +} \ No newline at end of file