Work around an FDev bug in star name casing in status.json destinatio…

…n data.
EDCD · Feb 3, 2025 · e877012 · e877012
1 parent 620ecd0
commit e877012
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/DataDefinitions/Body.cs b/DataDefinitions/Body.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.Serialization;
+using System.Text.RegularExpressions;
 using Utilities;
 
 namespace EddiDataDefinitions
@@ -30,7 +31,7 @@ public class Body : INotifyPropertyChanged
 
         /// <summary>The short name of the body</summary>
         [PublicAPI, JsonIgnore]
-        public string shortname => GetShortName(bodyname, systemname);
+        public string shortname => GetShortName(bodyname, systemname, bodyType);
 
         /// <summary>The name of the system in which the body resides</summary>
         [PublicAPI]
@@ -641,12 +642,18 @@ private long estimateBodyValue(bool isMapped, bool isMappedEfficiently)
             return null;
         }
 
-        public static string GetShortName(string bodyname, string systemname)
+        public static string GetShortName(string bodyname, string systemname, BodyType bodyType = null)
         {
             if (bodyname is null) { return null; }
-            return (systemname == null || bodyname == systemname || !bodyname.StartsWith(systemname)) 
+            var shortName = (systemname == null || bodyname == systemname || !bodyname.StartsWith(systemname)) 
                 ? bodyname 
-                : bodyname?.Replace(systemname, "").Trim();
+                : bodyname.Replace(systemname, "").Trim();
+            if ( bodyType == BodyType.Star && Regex.IsMatch( shortName.ToUpper(), @"(?<STARS>(?<=^|\s)[A-E]+)" ) )
+            {
+                // Status destinations can have incorrect casing on star names. Fix that here.
+                shortName = shortName.ToUpper();
+            }
+            return shortName;
         }
 
         public static int CompareById(Body lhs, Body rhs) => Math.Sign((lhs.bodyId - rhs.bodyId) ?? 0);

diff --git a/SpeechService/Translations.cs b/SpeechService/Translations.cs
@@ -91,7 +91,7 @@ public static string GetTranslation(string val, bool useICAO = false, string typ
         private static readonly Regex MOON = new Regex(@"^[a-z]$");
         private static readonly Regex SUBSTARS = new Regex(@"^\bA[BCDE]?[CDE]?[DE]?[E]?\b|\bB[CDE]?[DE]?[E]?\b|\bC[DE]?[E]?\b|\bD[E]?\b$");
         private static readonly Regex SYSTEMBODY = new Regex(@"^(.*?) ([A-E]+ ){0,2}(Belt(?:\s|$)|Cluster(?:\s|$)|Ring|\d{1,2}(?:\s|$)|[A-Za-z](?:\s|$)){1,12}$");
-        private static readonly Regex SHORTBODY = new Regex(@"(?=\S)(?<STARS>(?<=^|\s)A?B?C?D?E?)? ?(?<PLANET>(?<=^|\s)\d{1,2})? ?(?<MOON>(?<=^|\s)[a-z])? ?(?<SUBMOON>(?<=^|\s)[a-z])? ?(?>(?<=^|\s)(?<RINGORBELTGROUP>[A-Z]) (?<RINGORBELTTYPE>Belt|Ring))? ?(?>(?<=^|\s)(?<CLUSTER>Cluster) (?<CLUSTERNUMBER>\d*))?$");
+        private static readonly Regex SHORTBODY = new Regex(@"(?=\S)(?<STARS>(?<=^|\s)[A-E]+)? ?(?<PLANET>(?<=^|\s)\d{1,2})? ?(?<MOON>(?<=^|\s)[a-z])? ?(?<SUBMOON>(?<=^|\s)[a-z])? ?(?>(?<=^|\s)(?<RINGORBELTGROUP>[A-Z]) (?<RINGORBELTTYPE>Belt|Ring))? ?(?>(?<=^|\s)(?<CLUSTER>Cluster) (?<CLUSTERNUMBER>\d*))?$");
         private static readonly Regex PROC_GEN_SYSTEM = new Regex(@"^(?<SECTOR>[\w\s'.()-]+) (?<COORDINATES>(?<l1>[A-Za-z])(?<l2>[A-Za-z])-(?<l3>[A-Za-z]) (?<mcode>[A-Za-z])(?:(?<n1>\d+)-)?(?<n2>\d+))$");
         private static readonly Regex PROC_GEN_SYSTEM_BODY = new Regex(@"^(?<SYSTEM>(?<SECTOR>[\w\s'.()-]+) (?<COORDINATES>(?<l1>[A-Za-z])(?<l2>[A-Za-z])-(?<l3>[A-Za-z]) (?<mcode>[A-Za-z])(?:(?<n1>\d+)-)?(?<n2>\d+))) ?(?<BODY>.*)$");