EDPlayerJournal/BGS/IncompleteTransaction.cs

@@ -1,6 +1,4 @@
-using EDPlayerJournal.Entries;
+namespace EDPlayerJournal.BGS;
-
-namespace EDPlayerJournal.BGS;
 
 public class IncompleteTransaction : Transaction {
     public Transaction? UnderlyingTransaction { get; set; } = null;
@@ -8,9 +6,8 @@ public class IncompleteTransaction : Transaction {
 
     public IncompleteTransaction() { }
 
-    public IncompleteTransaction(Transaction? underlying, string reason, Entry entry) {
+    public IncompleteTransaction(Transaction? underlying, string reason) {
         UnderlyingTransaction = underlying;
         Reason = reason;
-        Entries.Add(entry);
     }
 }

EDPlayerJournal/BGS/TransactionParser.cs

@@ -123,7 +123,7 @@ internal class TransactionParserContext {
             // Still unknown
             grade = null;
         } else {
-            transactions.AddIncomplete(new CombatZone(), "Failed to discern combat zone type", e);
+            transactions.AddIncomplete(new CombatZone(), "Failed to discern combat zone type");
             return;
         }
 
@@ -209,8 +209,8 @@ internal class TransactionParserContext {
 }
 
 public class TransactionList : List<Transaction> {
-    public void AddIncomplete(Transaction underlying, string reason, Entry entry) {
+    public void AddIncomplete(Transaction underlying, string reason) {
-        Add(new IncompleteTransaction(underlying, reason, entry));
+        Add(new IncompleteTransaction(underlying, reason));
     }
 }
 
@@ -394,7 +394,7 @@ internal class CommitCrimeParser : TransactionParserPart {
             if (entry.Faction == null) {
                 transactions.AddIncomplete(
                     new FoulMurder(),
-                    "On foot murder victim did not have a faction", e
+                    "On foot murder victim did not have a faction"
                     );
                 return;
             }
@@ -405,7 +405,7 @@ internal class CommitCrimeParser : TransactionParserPart {
             if (!context.NPCFaction.ContainsKey(victim)) {
                 transactions.AddIncomplete(
                     new FoulMurder(),
-                    "Crime victim was not properly scanned.", e
+                    "Crime victim was not properly scanned."
                     );
                 return;
             }
@@ -429,8 +429,7 @@ internal class MissionAcceptedParser : TransactionParserPart {
 
         if (context.CurrentSystem == null || context.CurrentSystemAddress == null) {
             transactions.AddIncomplete(new MissionCompleted(),
-                "Could not determine current location on mission acceptance.",
+                "Could not determine current location on mission acceptance."
-                e
                 );
             return;
         }
@@ -439,8 +438,7 @@ internal class MissionAcceptedParser : TransactionParserPart {
             context.MissionAccepted(entry);
         } catch (Exception exception) {
             transactions.AddIncomplete(new MissionCompleted(),
-                exception.Message,
+                exception.Message
-                e
                 );
         }
     }
@@ -462,14 +460,14 @@ internal class MissionCompletedParser : TransactionParserPart {
         if (!context.AcceptedMissions.TryGetValue(entry.Mission.MissionID, out accepted)) {
             transactions.AddIncomplete(new MissionCompleted(),
                 String.Format("Mission acceptance for mission id {0} was not found",
-                entry.Mission.MissionID), e);
+                entry.Mission.MissionID));
             return;
         }
 
         if (!context.AcceptedMissionLocation.TryGetValue(entry.Mission.MissionID, out accepted_location)) {
             transactions.AddIncomplete(new MissionCompleted(),
                 String.Format("Location for acceptance for mission id {0} was not found",
-                entry.Mission.MissionID), e);
+                entry.Mission.MissionID));
             return;
         }
 
@@ -517,8 +515,7 @@ internal class MissionCompletedParser : TransactionParserPart {
 
                 if (!context.SystemsByID.TryGetValue(system_address, out system)) {
                     transactions.AddIncomplete(new MissionCompleted(),
-                        string.Format("Unknown system {0}, unable to assign that mission a target", system_address),
+                        string.Format("Unknown system {0}, unable to assign that mission a target", system_address)
-                        e
                         );
                     continue;
                 }
@@ -574,21 +571,21 @@ internal class MissionFailedParser : TransactionParserPart {
 
         if (!context.AcceptedMissions.TryGetValue(entry.Mission.MissionID, out accepted)) {
             transactions.AddIncomplete(new MissionFailed(),
-                "Mission acceptance was not found", e
+                "Mission acceptance was not found"
                 );
             return;
         }
 
         if (!context.AcceptedMissionLocation.TryGetValue(entry.Mission.MissionID, out accepted_location)) {
             transactions.AddIncomplete(new MissionFailed(),
-                "Unable to figure out where failed mission was accepted", e
+                "Unable to figure out where failed mission was accepted"
                 );
             return;
         }
 
         if (!context.SystemsByID.TryGetValue(accepted_location.SystemAddress, out accepted_system)) {
             transactions.AddIncomplete(new MissionFailed(),
-                "Unable to figure out in which system failed mission was accepted", e
+                "Unable to figure out in which system failed mission was accepted"
                 );
             return;
         }
@@ -662,7 +659,7 @@ internal class RedeemVoucherParser : TransactionParserPart {
 
         if (context.CurrentSystem == null) {
             transactions.AddIncomplete(new Vouchers(),
-                "Could not find out where the vouchers were redeemed", e
+                "Could not find out where the vouchers were redeemed"
                 );
             return;
         }
@@ -670,7 +667,7 @@ internal class RedeemVoucherParser : TransactionParserPart {
         List<Faction>? current_factions = context.GetFactions(context.CurrentSystem);
         if (current_factions == null) {
             transactions.AddIncomplete(new Vouchers(),
-                "Current system factions are unknown, so vouchers were ineffective", e);
+                "Current system factions are unknown, so vouchers were ineffective");
         }
 
         foreach (string faction in entry.Factions) {
@@ -691,8 +688,8 @@ internal class RedeemVoucherParser : TransactionParserPart {
                     relevantBond = true;
                 } else {
                     transactions.AddIncomplete(new Vouchers(),
-                        string.Format("Vouchers for \"{0}\" had no effect in \"{1}\" since said " +
+                        string.Format("Vouchers for {0} had no effect in {1} since said " +
-                        "faction is not present there", faction, context.CurrentSystem), e
+                        "faction is not present here", faction, context.CurrentSystem)
                     );
                 }
             }

EliteBGS/EliteBGS.csproj

@@ -18,8 +18,6 @@
     <Copyright>Copyright 2019 by Florian Stinglmayr</Copyright>
     <RepositoryUrl>https://git.aror.org/florian/EDBGS</RepositoryUrl>
     <PackageTags>ED;Elite Dangerous;BGS</PackageTags>
-    <PackageProjectUrl>https://bgs.n0la.org</PackageProjectUrl>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>
     <Resource Include="main-page.png">
@@ -27,8 +25,6 @@
     </Resource>
     <None Update="README.md">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
     </None>
     <None Update="docs\CHANGELOG.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

EliteBGS/NonaDiscordLog.cs

@@ -10,7 +10,7 @@ public class NonaDiscordLog : DiscordLogGenerator {
     private string FormatDate() {
         CultureInfo cultureInfo = CultureInfo.InvariantCulture;
         StringBuilder date = new StringBuilder();
-        DateTime today = DateTime.UtcNow;
+        DateTime today = DateTime.Now;
         string suffix;
 
         if (today.Day == 1 || today.Day == 21 || today.Day == 31) {

EliteBGS/docs/CHANGELOG.md

@@ -1,13 +1,11 @@
 # EliteBGS changelog
 
-## 0.2.4 on 18.12.2022
+## 0.2.4 on ??.??.202?
 
 * Fixed bug with organic data.
 * Fixed bug in mission format.
 * You can now select also a time when filtering transactions.
 * Added a button to toggle all children on and off at once.
-* Date in Nova Navy discord log is now UTC.
-* Added a divider so you can rescale the objectives and the log to a preferred aspect ratio.
 
 ## 0.2.3 on 11.12.2022
 

EliteBGS/docs/index.md

@@ -20,9 +20,9 @@ command line:
 winget install Microsoft.DotNet.DesktopRuntime.7
 ```
 
-You can download the **latest** version **0.2.4** here:
+You can download the **latest** version **0.2.3** here:
 
-* [https://bgs.n0la.org/elitebgs-0.2.4.zip](https://bgs.n0la.org/elitebgs-0.2.4.zip)
+* [https://bgs.n0la.org/elitebgs-0.2.3.zip](https://bgs.n0la.org/elitebgs-0.2.3.zip)
 
 ## Old Versions