Minor

rampaa · Dec 28, 2024 · eba0fed · eba0fed
1 parent 1ec4dc4
commit eba0fed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/JL.Core.Tests/LookupTests.cs b/JL.Core.Tests/LookupTests.cs
@@ -61,7 +61,7 @@ public void LookupText_始まる()
                 deconjugatedMatchedText: "始まる",
                 readings: ["はじまる"],
                 formattedDefinitions: "(v5r, vi) (1) to begin; to start; to commence；(v5r, vi) (2) to happen (again); to begin (anew)；(v5r, vi) (3) to date (from); to originate (in)",
-                edictId: 1307500
+                entryId: 1307500
             )
         ];
 

diff --git a/JL.Core/Lookup/LookupResult.cs b/JL.Core/Lookup/LookupResult.cs
@@ -13,7 +13,7 @@ public sealed class LookupResult
     public List<LookupFrequencyResult>? Frequencies { get; }
 
     // JMdict, JMnedict, KANJIDIC2
-    internal int EdictId { get; }
+    internal int EntryId { get; }
 
     // Word dictionaries
     public string DeconjugatedMatchedText { get; }
@@ -57,7 +57,7 @@ internal LookupResult(
         string? deconjugationProcess = null,
         string? kanjiComposition = null,
         string? kanjiStats = null,
-        int edictId = 0,
+        int entryId = 0,
         byte strokeCount = 0,
         byte kanjiGrade = byte.MaxValue,
         IDictionary<string, IList<IDictRecord>>? pitchAccentDict = null
@@ -70,7 +70,7 @@ internal LookupResult(
         PrimarySpelling = primarySpelling;
         Readings = readings;
         FormattedDefinitions = formattedDefinitions;
-        EdictId = edictId;
+        EntryId = entryId;
         AlternativeSpellings = alternativeSpellings;
         DeconjugationProcess = deconjugationProcess;
         PrimarySpellingOrthographyInfoList = primarySpellingOrthographyInfoList;

diff --git a/JL.Core/Lookup/LookupUtils.cs b/JL.Core/Lookup/LookupUtils.cs
@@ -427,6 +427,7 @@ private static LookupResult[] SortLookupResults(IEnumerable<LookupResult> lookup
                     ? index
                     : int.MaxValue;
             })
+            .ThenBy(static lookupResult => lookupResult.EntryId)
             .ToArray();
     }
 
@@ -963,7 +964,7 @@ private static List<LookupResult> BuildJmdictResult(
                         readings: jmdictResult.Readings,
                         matchedText: wordResult.MatchedText,
                         deconjugatedMatchedText: wordResult.DeconjugatedMatchedText,
-                        edictId: jmdictResult.Id,
+                        entryId: jmdictResult.Id,
                         alternativeSpellings: jmdictResult.AlternativeSpellings,
                         deconjugationProcess: LookupResultUtils.DeconjugationProcessesToText(wordResult.Processes?[i]),
                         frequencies: GetWordFrequencies(jmdictResult, wordFreqs, frequencyDicts),
@@ -1008,7 +1009,7 @@ private static List<LookupResult> BuildJmnedictResult(
 
                     LookupResult result = new
                     (
-                        edictId: jmnedictRecord.Id,
+                        entryId: jmnedictRecord.Id,
                         primarySpelling: jmnedictRecord.PrimarySpelling,
                         alternativeSpellings: jmnedictRecord.AlternativeSpellings,
                         readings: jmnedictRecord.Readings,

diff --git a/JL.Core/Mining/MiningUtils.cs b/JL.Core/Mining/MiningUtils.cs
@@ -196,8 +196,8 @@ public static class MiningUtils
                     : null;
 
             case JLField.EdictId:
-                return lookupResult.EdictId > 0
-                    ? lookupResult.EdictId.ToString(CultureInfo.InvariantCulture)
+                return lookupResult.EntryId > 0
+                    ? lookupResult.EntryId.ToString(CultureInfo.InvariantCulture)
                     : null;
 
             case JLField.DeconjugationProcess:
@@ -481,9 +481,9 @@ private static Dictionary<JLField, string> GetMiningParameters(LookupResult look
                 : selectedDefinitions;
         }
 
-        if (lookupResult.EdictId > 0)
+        if (lookupResult.EntryId > 0)
         {
-            miningParams[JLField.EdictId] = lookupResult.EdictId.ToString(CultureInfo.InvariantCulture);
+            miningParams[JLField.EdictId] = lookupResult.EntryId.ToString(CultureInfo.InvariantCulture);
         }
 
         if (lookupResult.DeconjugationProcess is not null)