Added some extra safety in the float handling code

Kareadita · Nov 26, 2024 · b2ef89c · b2ef89c
1 parent 9a00ade
commit b2ef89c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/API.Tests/Parsing/ParsingTests.cs b/API.Tests/Parsing/ParsingTests.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Xunit;
 using static API.Services.Tasks.Scanner.Parser.Parser;
 
@@ -15,6 +16,16 @@ public void ShouldWork()
         Assert.Equal(6.5f, a);
     }
 
+    // [Theory]
+    // [InlineData("de-DE")]
+    // [InlineData("en-US")]
+    // public void ShouldParse(string culture)
+    // {
+    //     var s = 6.5f + "";
+    //     var a = float.Parse(s, CultureInfo.CreateSpecificCulture(culture));
+    //     Assert.Equal(6.5f, a);
+    // }
+
     [Theory]
     [InlineData("Joe Shmo, Green Blue", "Joe Shmo, Green Blue")]
     [InlineData("Shmo, Joe",  "Shmo, Joe")]

diff --git a/API/Entities/Chapter.cs b/API/Entities/Chapter.cs
@@ -205,14 +205,14 @@ public string GetNumberTitle()
 
                 if (MinNumber.Is(0f) && !float.TryParse(Range, CultureInfo.InvariantCulture, out _))
                 {
-                    return $"{Range}";
+                    return $"{Range.ToString(CultureInfo.InvariantCulture)}";
                 }
 
-                return $"{MinNumber}";
+                return $"{MinNumber.ToString(CultureInfo.InvariantCulture)}";
 
             }
 
-            return $"{MinNumber}-{MaxNumber}";
+            return $"{MinNumber.ToString(CultureInfo.InvariantCulture)}-{MaxNumber.ToString(CultureInfo.InvariantCulture)}";
         }
         catch (Exception)
         {

diff --git a/API/Entities/Volume.cs b/API/Entities/Volume.cs
@@ -68,11 +68,12 @@ public class Volume : IEntityDate, IHasReadTimeEstimate, IHasCoverImage
     /// <returns></returns>
     public string GetNumberTitle()
     {
-        if (MinNumber.Is(MaxNumber))
+        if (MinNumber.Equals(MaxNumber))
         {
             return MinNumber.ToString(CultureInfo.InvariantCulture);
         }
-        return $"{MinNumber}-{MaxNumber}";
+
+        return $"{MinNumber.ToString(CultureInfo.InvariantCulture)}-{MaxNumber.ToString(CultureInfo.InvariantCulture)}";
     }
 
     public void ResetColorScape()

diff --git a/API/Services/Tasks/Scanner/ParseScannedFiles.cs b/API/Services/Tasks/Scanner/ParseScannedFiles.cs
@@ -818,11 +818,11 @@ private static void UpdateSortOrder(ConcurrentDictionary<ParsedSeries, List<Pars
                     chapter.IssueOrder = counter;
 
                     // Increment for next chapter (unless the next has a similar value, then add 0.1)
-                    if (!string.IsNullOrEmpty(prevIssue) && float.TryParse(prevIssue, CultureInfo.InvariantCulture, out var prevIssueFloat) && parsedChapter.Is(prevIssueFloat))
+                    if (!string.IsNullOrEmpty(prevIssue) && float.TryParse(prevIssue, NumberStyles.Any, CultureInfo.InvariantCulture, out var prevIssueFloat) && parsedChapter.Is(prevIssueFloat))
                     {
                         counter += 0.1f; // bump if same value as the previous issue
                     }
-                    prevIssue = $"{parsedChapter}";
+                    prevIssue = $"{parsedChapter.ToString(CultureInfo.InvariantCulture)}";
                 }
                 else
                 {