Improve versification handling and stop crashing on Debug.Assert (#1397)

paranext · Dec 13, 2024 · 029c502 · 029c502
1 parent d795f89
commit 029c502
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/c-sharp/JsonUtils/VerseRefConverter.cs b/c-sharp/JsonUtils/VerseRefConverter.cs
@@ -104,7 +104,7 @@ JsonSerializerOptions options
                 bookName,
                 chapterNum.Value.ToString(),
                 verse ?? verseNum!.Value.ToString(),
-                new ScrVers(versification)
+                string.IsNullOrEmpty(versification) ? null : new ScrVers(versification)
             );
     }
 

diff --git a/c-sharp/Program.cs b/c-sharp/Program.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Paranext.DataProvider.Checks;
 using Paranext.DataProvider.NetworkObjects;
 using Paranext.DataProvider.Projects;
@@ -16,13 +17,12 @@ public static async Task Main()
         Console.WriteLine("Paranext data provider starting up");
         Thread.CurrentThread.Name = "Main";
 
-        // Turn on additional logging to help diagnose failures on macOS
-        if (OperatingSystem.IsMacOS())
-        {
-            System.Diagnostics.Trace.Listeners.Add(new System.Diagnostics.ConsoleTraceListener());
-            System.Diagnostics.Trace.AutoFlush = true;
-            System.Diagnostics.Trace.WriteLine("Trace logging enabled");
-        }
+        var listener = new ConsoleTraceListener { TraceOutputOptions = TraceOptions.DateTime };
+        // Clear the default listeners to stop Debug.Assert from crashing the app
+        Trace.Listeners.Clear();
+        // Log all trace messages to the console
+        Trace.Listeners.Add(listener);
+        Trace.AutoFlush = true;
 
         using PapiClient papi = new();
         try

diff --git a/c-sharp/Projects/ParatextProjectDataProvider.cs b/c-sharp/Projects/ParatextProjectDataProvider.cs
@@ -606,6 +606,8 @@ Func<ScrText, VerseRef, string> getTextFromScrText
         try
         {
             var scrText = LocalParatextProjects.GetParatextProject(ProjectDetails.Metadata.Id);
+            if (verseRef.Versification == null)
+                verseRef.Versification = scrText.Settings.Versification;
             return getTextFromScrText(scrText, verseRef);
         }
         catch (Exception e) when (e is ArgumentException or ProjectNotFoundException)