From 94cfa311ea9b08bb2554417d24a954fb47a11919 Mon Sep 17 00:00:00 2001 From: rampaa Date: Sun, 10 Dec 2023 19:26:45 +0300 Subject: [PATCH] Minor --- JL.Core/Dicts/DictUtils.cs | 19 +++++++++++++------ JL.Core/Freqs/FreqUtils.cs | 6 ++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/JL.Core/Dicts/DictUtils.cs b/JL.Core/Dicts/DictUtils.cs index 1de1e3f1..ccdce662 100644 --- a/JL.Core/Dicts/DictUtils.cs +++ b/JL.Core/Dicts/DictUtils.cs @@ -567,10 +567,12 @@ public static async Task LoadDictionaries() if (loadFromDB) { JmdictDBManager.LoadFromDB(dict); + dict.Size = dict.Contents.Count; } else { await JmdictLoader.Load(dict).ConfigureAwait(false); + dict.Size = dict.Contents.Count; if (useDB && !dbExists) { @@ -581,7 +583,6 @@ public static async Task LoadDictionaries() } } - dict.Size = dict.Contents.Count; dict.Ready = true; }); @@ -672,10 +673,12 @@ public static async Task LoadDictionaries() if (loadFromDB) { KanjidicDBManager.LoadFromDB(dict); + dict.Size = dict.Contents.Count; } else { await KanjidicLoader.Load(dict).ConfigureAwait(false); + dict.Size = dict.Contents.Count; if (useDB && !dbExists) { @@ -686,7 +689,6 @@ public static async Task LoadDictionaries() } } - dict.Size = dict.Contents.Count; dict.Ready = true; })); } @@ -774,10 +776,12 @@ public static async Task LoadDictionaries() if (loadFromDB) { EpwingYomichanDBManager.LoadFromDB(dict); + dict.Size = dict.Contents.Count; } else { await EpwingYomichanLoader.Load(dict).ConfigureAwait(false); + dict.Size = dict.Contents.Count; if (useDB && !dbExists) { @@ -788,7 +792,6 @@ public static async Task LoadDictionaries() } } - dict.Size = dict.Contents.Count; dict.Ready = true; } @@ -841,10 +844,12 @@ public static async Task LoadDictionaries() if (loadFromDB) { YomichanKanjiDBManager.LoadFromDB(dict); + dict.Size = dict.Contents.Count; } else { await YomichanKanjiLoader.Load(dict).ConfigureAwait(false); + dict.Size = dict.Contents.Count; if (useDB && !dbExists) { @@ -855,7 +860,6 @@ public static async Task LoadDictionaries() } } - dict.Size = dict.Contents.Count; dict.Ready = true; } @@ -999,10 +1003,12 @@ dict.Type is DictType.CustomNameDictionary if (loadFromDB) { EpwingNazekaDBManager.LoadFromDB(dict); + dict.Size = dict.Contents.Count; } else { await EpwingNazekaLoader.Load(dict).ConfigureAwait(false); + dict.Size = dict.Contents.Count; if (useDB && !dbExists) { @@ -1013,7 +1019,6 @@ dict.Type is DictType.CustomNameDictionary } } - dict.Size = dict.Contents.Count; dict.Ready = true; } @@ -1066,10 +1071,13 @@ dict.Type is DictType.CustomNameDictionary if (loadFromDB) { EpwingYomichanDBManager.LoadFromDB(dict); + dict.Size = dict.Contents.Count; } else { await YomichanPitchAccentLoader.Load(dict).ConfigureAwait(false); + dict.Size = dict.Contents.Count; + if (useDB && !dbExists) { YomichanPitchAccentDBManager.CreateDB(dict.Name); @@ -1079,7 +1087,6 @@ dict.Type is DictType.CustomNameDictionary } } - dict.Size = dict.Contents.Count; dict.Ready = true; } diff --git a/JL.Core/Freqs/FreqUtils.cs b/JL.Core/Freqs/FreqUtils.cs index 953b31fd..68ea3f73 100644 --- a/JL.Core/Freqs/FreqUtils.cs +++ b/JL.Core/Freqs/FreqUtils.cs @@ -94,10 +94,12 @@ public static async Task LoadFrequencies() if (loadFromDB) { FreqDBManager.LoadFromDB(freq); + freq.Size = freq.Contents.Count; } else { await FrequencyNazekaLoader.Load(freq).ConfigureAwait(false); + freq.Size = freq.Contents.Count; if (useDB && !dbExists) { @@ -108,7 +110,6 @@ public static async Task LoadFrequencies() } } - freq.Size = freq.Contents.Count; freq.Ready = true; } @@ -167,10 +168,12 @@ public static async Task LoadFrequencies() if (loadFromDB) { FreqDBManager.LoadFromDB(freq); + freq.Size = freq.Contents.Count; } else { await FrequencyYomichanLoader.Load(freq).ConfigureAwait(false); + freq.Size = freq.Contents.Count; if (useDB && !dbExists) { @@ -181,7 +184,6 @@ public static async Task LoadFrequencies() } } - freq.Size = freq.Contents.Count; freq.Ready = true; }