Minor

rampaa · Dec 22, 2024 · cd7c1f4 · cd7c1f4
1 parent 84acd9a
commit cd7c1f4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/JL.Core/Freqs/Freq.cs b/JL.Core/Freqs/Freq.cs
@@ -17,12 +17,11 @@ public sealed class Freq(FreqType type, string name, string path, bool active, i
 
     // ReSharper disable once MemberCanBeInternal
     public int MaxValue { get; set; } = maxValue;
-
     [JsonIgnore] public bool Ready { get; set; } // = false;
+    public FreqOptions Options { get; set; } = options;
 
 #pragma warning disable CA2227
     [JsonIgnore] public IDictionary<string, IList<FrequencyRecord>> Contents { get; set; } = FrozenDictionary<string, IList<FrequencyRecord>>.Empty;
 #pragma warning restore CA2227
 
-    public FreqOptions Options { get; set; } = options;
 }
diff --git a/JL.Core/WordClass/JmdictWordClass.cs b/JL.Core/WordClass/JmdictWordClass.cs
@@ -2,11 +2,9 @@
 
 namespace JL.Core.WordClass;
 
-internal sealed class JmdictWordClass(string spelling, string[]? readings, string[] wordClasses)
+internal sealed class JmdictWordClass(string spelling, string[] wordClasses, string[]? readings = null)
 {
     [JsonPropertyName("S")] public string Spelling { get; set; } = spelling;
-
-    [JsonPropertyName("R")] public string[]? Readings { get; } = readings;
-
     [JsonPropertyName("C")] public string[] WordClasses { get; } = wordClasses;
+    [JsonPropertyName("R")] public string[]? Readings { get; } = readings;
 }
diff --git a/JL.Core/WordClass/JmdictWordClassUtils.cs b/JL.Core/WordClass/JmdictWordClassUtils.cs
@@ -88,13 +88,13 @@ public static Task Serialize()
                                                && ((result.Readings is not null && jmdictRecord.Readings is not null && result.Readings.SequenceEqual(jmdictRecord.Readings))
                                                    || (result.Readings is null && jmdictRecord.Readings is null))))
                     {
-                        results.Add(new JmdictWordClass(jmdictRecord.PrimarySpelling, jmdictRecord.Readings, wordClasses));
+                        results.Add(new JmdictWordClass(jmdictRecord.PrimarySpelling, wordClasses, jmdictRecord.Readings));
                     }
                 }
 
                 else
                 {
-                    jmdictWordClassDictionary[key] = [new JmdictWordClass(jmdictRecord.PrimarySpelling, jmdictRecord.Readings, wordClasses)];
+                    jmdictWordClassDictionary[key] = [new JmdictWordClass(jmdictRecord.PrimarySpelling, wordClasses, jmdictRecord.Readings)];
                 }
             }
         }