Add initial API & Configuration

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<object> 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;

ObservatoryFramework/Files/Journal/JournalBase.cs

@@ -1,17 +1,18 @@
-using System.Text.Json.Serialization;
+namespace Observatory.Framework.Files.Journal;
-using Observatory.Framework.Files.Journal.Combat;
+
-using Observatory.Framework.Files.Journal.Exploration;
+using System.Text.Json.Serialization;
-using Observatory.Framework.Files.Journal.FleetCarrier;
+using Combat;
-using Observatory.Framework.Files.Journal.Odyssey;
+using Exploration;
-using Observatory.Framework.Files.Journal.Other;
+using FleetCarrier;
-using Observatory.Framework.Files.Journal.Powerplay;
+using Odyssey;
-using Observatory.Framework.Files.Journal.Squadron;
+using Other;
-using Observatory.Framework.Files.Journal.Startup;
+using Powerplay;
-using Observatory.Framework.Files.Journal.StationServices;
+using Squadron;
-using Observatory.Framework.Files.Journal.Trade;
+using Startup;
-using Observatory.Framework.Files.Journal.Travel;
+using StationServices;
+using Trade;
+using Travel;
 
-namespace Observatory.Framework.Files.Journal;
 [JsonDerivedType(typeof(BackpackFile))]
 [JsonDerivedType(typeof(CargoFile))]
 [JsonDerivedType(typeof(FCMaterialsFile))]

ObservatoryFramework/Interfaces.cs

@@ -33,11 +33,6 @@ public interface IObservatoryPlugin
     /// </summary>
     public string Version { get; }
 
-    /// <summary>
-    /// Reference to plugin UI to display within its tab.
-    /// </summary>
-    public PluginUI PluginUI { get; }
-
     /// <summary>
     /// Receives data sent by other plugins.
     /// </summary>

ObservatoryFramework/PluginUI.cs

@@ -1,74 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace Observatory.Framework;
-
-/// <summary>
-/// Class permitting plugins to provide their UI, if any, to Observatory Core.
-/// </summary>
-public class PluginUI
-{
-    /// <summary>
-    /// Type of UI used by plugin.
-    /// </summary>
-    public readonly UIType PluginUIType;
-
-    /// <summary>
-    /// <para>UI object used by plugins with UIType.Panel.</para>
-    /// </summary>
-    public object UI;
-
-    /// <summary>
-    /// <para>Collection bound to DataGrid used by plugins with UIType.Basic.</para>
-    /// <para>Objects in collection should be of a class defined within the plugin consisting of string properties.<br/>Each object is a single row, and the property names are used as column headers.</para>
-    /// </summary>
-    public ObservableCollection<object> DataGrid;
-
-    /// <summary>
-    /// Instantiate PluginUI of UIType.Basic.
-    /// </summary>
-    /// <param name="DataGrid">
-    /// <para>Collection bound to DataGrid used by plugins with UIType.Basic.</para>
-    /// <para>Objects in collection should be of a class defined within the plugin consisting of string properties.<br/>Each object is a single row, and the property names are used as column headers.</para>
-    /// </param>
-    public PluginUI(ObservableCollection<object> DataGrid)
-    {
-        PluginUIType = UIType.Basic;
-        this.DataGrid = DataGrid;
-    }
-
-    /// <summary>
-    /// Instantiate PluginUI of specified UIType.
-    /// <para>(Untested/not implemented)</para>
-    /// </summary>
-    /// <param name="uiType">UIType for plugin.</param>
-    /// <param name="UI">Avalonia control to place in plugin tab.</param>
-    public PluginUI(UIType uiType, object UI)
-    {
-        PluginUIType = uiType;
-        this.UI = UI;
-    }
-
-    /// <summary>
-    /// Options for plugin UI types.
-    /// </summary>
-    public enum UIType
-    {
-        /// <summary>
-        /// No UI. Tab will not be added to list.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// Simple listview, to which items can be added or removed.
-        /// </summary>
-        Basic = 1,
-        /// <summary>
-        /// Panel control which is placed in plugin tab.
-        /// </summary>
-        Panel = 2,
-        /// <summary>
-        /// UI used by Observatory Core settings tab.<br/>
-        /// Not intended for use by plugins.
-        /// </summary>
-        Core = 3
-    }
-}

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<IEventHub>
+{
+    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<JournalBase> 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<JournalBase> journals);
+    
+    Task ModuleInfoUpdated(ModuleInfoFile moduleInfo);
+    
+    Task FleetCarrierUpdated(FCMaterialsFile fleetCarrier);
+    
+    Task CargoUpdated(CargoFile cargo);
+    
+    Task BackpackUpdated(BackpackFile backpack);
+}

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();
+    }
+}

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;
+global using System.Text.Json.Serialization;
+global using Microsoft.AspNetCore.Mvc;

Pulsar/Program.cs

@@ -1,21 +1,18 @@
-if (args.Length > 0 && File.Exists(args[0]))
+using Lamar.Microsoft.DependencyInjection;
-{
-    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));
-}
 
-try
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddLamar();
+builder.Services.AddControllers();
+builder.Services.AddSignalR();
+builder.Services.AddDbContext<PulsarContext>();
+builder.Services.Configure<PulsarConfiguration>(builder.Configuration.GetSection(nameof(Pulsar)));
+
+var app = builder.Build();
+
+await app.RunAsync();
+
+public class PulsarConfiguration
 {
-    WebApplicationBuilder builder = WebApplication.CreateSlimBuilder(args);
+    public string JournalDirectory { get; set; }
-    
-    var app = builder.Build();
-    
-    SettingsManager.Load();
-    
-    await app.RunAsync();
-}
-catch (Exception ex)
-{
-    LoggingUtils.LogError(ex, "");
 }

Pulsar/Pulsar.csproj

@@ -12,5 +12,13 @@
     <ItemGroup>
       <ProjectReference Include="..\ObservatoryFramework\ObservatoryFramework.csproj" />
     </ItemGroup>
+   
+    <ItemGroup>
+      <PackageReference Include="Lamar" Version="13.0.3" />
+      <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="13.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
+      <PackageReference Include="Scrutor" Version="4.2.2" />
+    </ItemGroup>
 
 </Project>

Pulsar/PulsarContext.cs

@@ -0,0 +1,8 @@
+using Microsoft.EntityFrameworkCore;
+
+/// <summary>
+/// An in-memory database context for Pulsar.
+/// </summary>
+public class PulsarContext : DbContext
+{
+}

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<TJournal>(string json) where TJournal : JournalBase
     {

Pulsar/Utils/SettingsManager.cs

@@ -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();
-        }
-}

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/",
+  }
+}