Minor

rampaa · Jul 20, 2024 · 340f917 · 340f917
1 parent 3b83356
commit 340f917
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanLoader.cs b/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanLoader.cs
@@ -14,7 +14,9 @@ public static async Task Load(Dict dict)
             return;
         }
 
-        IEnumerable<string> jsonFiles = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly);
+        IEnumerable<string> jsonFiles = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly)
+            .Where(static s => s.StartsWith("term", StringComparison.Ordinal) || s.StartsWith("kanji", StringComparison.Ordinal));
+
         foreach (string jsonFile in jsonFiles)
         {
             List<List<JsonElement>>? jsonElementLists;

diff --git a/JL.Core/Freqs/FrequencyYomichan/FrequencyYomichanLoader.cs b/JL.Core/Freqs/FrequencyYomichan/FrequencyYomichanLoader.cs
@@ -15,7 +15,9 @@ public static async Task Load(Freq freq)
             return;
         }
 
-        IEnumerable<string> jsonFiles = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly);
+        IEnumerable<string> jsonFiles = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly)
+            .Where(static s => s.StartsWith("term", StringComparison.Ordinal) || s.StartsWith("kanji", StringComparison.Ordinal));
+
         foreach (string jsonFile in jsonFiles)
         {
             List<List<JsonElement>>? frequencyJson;

diff --git a/JL.Windows/GUI/AddDictionaryWindow.xaml.cs b/JL.Windows/GUI/AddDictionaryWindow.xaml.cs
@@ -79,7 +79,9 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                bool validPath = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly).Any();
+                bool validPath = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly)
+                    .Any(static s => s.StartsWith("term", StringComparison.Ordinal) || s.StartsWith("kanji", StringComparison.Ordinal));
+
                 if (!validPath)
                 {
                     TextBlockPath.BorderBrush = Brushes.Red;

diff --git a/JL.Windows/GUI/AddFrequencyWindow.xaml.cs b/JL.Windows/GUI/AddFrequencyWindow.xaml.cs
@@ -65,7 +65,9 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
         FreqType type = typeString!.GetEnum<FreqType>();
         if (type is FreqType.Yomichan or FreqType.YomichanKanji)
         {
-            bool validPath = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly).Any();
+            bool validPath = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly)
+                .Any(static s => s.StartsWith("term", StringComparison.Ordinal) || s.StartsWith("kanji", StringComparison.Ordinal));
+
             if (!validPath)
             {
                 TextBlockPath.BorderBrush = Brushes.Red;

diff --git a/JL.Windows/GUI/EditDictionaryWindow.xaml.cs b/JL.Windows/GUI/EditDictionaryWindow.xaml.cs
@@ -79,7 +79,9 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
                 }
                 else
                 {
-                    bool validPath = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly).Any();
+                    bool validPath = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly)
+                        .Any(static s => s.StartsWith("term", StringComparison.Ordinal) || s.StartsWith("kanji", StringComparison.Ordinal));
+
                     if (!validPath)
                     {
                         TextBlockPath.BorderBrush = Brushes.Red;

diff --git a/JL.Windows/GUI/EditFrequencyWindow.xaml.cs b/JL.Windows/GUI/EditFrequencyWindow.xaml.cs
@@ -66,7 +66,9 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
         {
             if (_freq.Type is FreqType.Yomichan or FreqType.YomichanKanji)
             {
-                bool hasValidFiles = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly).Any();
+                bool hasValidFiles = Directory.EnumerateFiles(fullPath, "*_bank_*.json", SearchOption.TopDirectoryOnly)
+                    .Any(static s => s.StartsWith("term", StringComparison.Ordinal) || s.StartsWith("kanji", StringComparison.Ordinal));
+
                 if (!hasValidFiles)
                 {
                     TextBlockPath.BorderBrush = Brushes.Red;