Minor fixes

rampaa · Dec 16, 2023 · 607bc6f · 607bc6f
1 parent ab28796
commit 607bc6f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/JL.Core/Dicts/DictUtils.cs b/JL.Core/Dicts/DictUtils.cs
@@ -542,6 +542,7 @@ public static async Task LoadDictionaries()
 
             if (dbJournalExists)
             {
+                SqliteConnection.ClearAllPools();
                 File.Delete(dbJournalPath);
                 if (dbExists)
                 {
@@ -861,6 +862,7 @@ public static async Task LoadDictionaries()
 
                                 if (dbExists)
                                 {
+                                    SqliteConnection.ClearAllPools();
                                     File.Delete(dbPath);
                                 }
                             }
@@ -939,6 +941,7 @@ public static async Task LoadDictionaries()
 
                                 if (dbExists)
                                 {
+                                    SqliteConnection.ClearAllPools();
                                     File.Delete(dbPath);
                                 }
                             }
@@ -1107,6 +1110,7 @@ dict.Type is DictType.CustomNameDictionary
 
                                 if (dbExists)
                                 {
+                                    SqliteConnection.ClearAllPools();
                                     File.Delete(dbPath);
                                 }
                             }
@@ -1186,6 +1190,7 @@ dict.Type is DictType.CustomNameDictionary
 
                                 if (dbExists)
                                 {
+                                    SqliteConnection.ClearAllPools();
                                     File.Delete(dbPath);
                                 }
                             }

diff --git a/JL.Core/Dicts/EPWING/EpwingUtils.cs b/JL.Core/Dicts/EPWING/EpwingUtils.cs
@@ -79,8 +79,6 @@ public static bool IsValidEpwingResultForDictType(string primarySpelling, string
                     }
                 }
 
-                definitions = definitions.Select(static def => def.Replace("┏", "", StringComparison.Ordinal)).ToArray();
-
                 break;
 
             case DictType.Daijisen:

diff --git a/JL.Core/Dicts/EPWING/Nazeka/EpwingNazekaLoader.cs b/JL.Core/Dicts/EPWING/Nazeka/EpwingNazekaLoader.cs
@@ -51,7 +51,7 @@ public static async Task Load(Dict dict)
                 string? definition = definitionJsonElement.GetString();
                 if (!string.IsNullOrWhiteSpace(definition))
                 {
-                    if (dict.Type is DictType.Kenkyuusha)
+                    if (dict.Type is DictType.KenkyuushaNazeka)
                     {
                         definition = definition.Replace("┏", "", StringComparison.Ordinal);
                     }

diff --git a/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanLoader.cs b/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanLoader.cs
@@ -109,7 +109,9 @@ private static void AddToDictionary(IEpwingRecord yomichanRecord, Dict dict)
             dict.Contents[hiraganaExpression] = new List<IDictRecord> { yomichanRecord };
         }
 
-        if (dict.Type is not DictType.NonspecificNameYomichan and not DictType.NonspecificKanjiWithWordSchemaYomichan and not DictType.KanjigenYomichan
+        if (dict.Type is not DictType.NonspecificNameYomichan
+            and not DictType.NonspecificKanjiWithWordSchemaYomichan
+            and not DictType.KanjigenYomichan
             && !string.IsNullOrEmpty(yomichanRecord.Reading))
         {
             string hiraganaReading = JapaneseUtils.KatakanaToHiragana(yomichanRecord.Reading);

diff --git a/JL.Core/Freqs/FreqUtils.cs b/JL.Core/Freqs/FreqUtils.cs
@@ -68,6 +68,7 @@ public static async Task LoadFrequencies()
 
             if (dbJournalExists)
             {
+                SqliteConnection.ClearAllPools();
                 File.Delete(dbJournalPath);
                 if (dbExists)
                 {
@@ -123,6 +124,7 @@ public static async Task LoadFrequencies()
 
                                 if (dbExists)
                                 {
+                                    SqliteConnection.ClearAllPools();
                                     File.Delete(dbPath);
                                 }
                             }
@@ -198,6 +200,7 @@ public static async Task LoadFrequencies()
 
                                 if (dbExists)
                                 {
+                                    SqliteConnection.ClearAllPools();
                                     File.Delete(dbPath);
                                 }
                             }

diff --git a/JL.Windows/GUI/ManageDictionariesWindow.xaml.cs b/JL.Windows/GUI/ManageDictionariesWindow.xaml.cs
@@ -296,7 +296,7 @@ and not DictType.Kanjidic
                     dict.Contents.TrimExcess();
                     _ = DictUtils.Dicts.Remove(dict.Name);
 
-                    string dbPath = DictUtils.GetDBPath(dict.Path);
+                    string dbPath = DictUtils.GetDBPath(dict.Name);
                     if (File.Exists(dbPath))
                     {
                         SqliteConnection.ClearAllPools();

diff --git a/JL.Windows/GUI/ManageFrequenciesWindow.xaml.cs b/JL.Windows/GUI/ManageFrequenciesWindow.xaml.cs
@@ -200,7 +200,7 @@ private void UpdateFreqsDisplay()
                     freq.Contents.TrimExcess();
                     _ = FreqUtils.FreqDicts.Remove(freq.Name);
 
-                    string dbPath = FreqUtils.GetDBPath(freq.Path);
+                    string dbPath = FreqUtils.GetDBPath(freq.Name);
                     if (File.Exists(dbPath))
                     {
                         SqliteConnection.ClearAllPools();
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
-                    definitions = definitions.Select(static def => def.Replace("┏", "", StringComparison.Ordinal)).ToArray();
                     break;
                 case DictType.Daijisen:
@@ Expand Down @@