Skip to content

Commit

Permalink
Minor
Browse files Browse the repository at this point in the history
  • Loading branch information
@rampaa
rampaa committed Dec 15, 2023
1 parent 6c77468 commit f309cb4
Showing 1 changed file with 92 additions and 33 deletions.
125 changes: 92 additions & 33 deletions JL.Core/Dicts/DictUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using JL.Core.Profile;
using JL.Core.Utilities;
using JL.Core.WordClass;
using Microsoft.Data.Sqlite;


namespace JL.Core.Dicts;
Expand Down Expand Up @@ -557,7 +558,7 @@ public static async Task LoadDictionaries()
dict.Ready = false;
if (dict is { Active: true, Contents.Count: 0 } && (!useDB || !dbExists))
{
Task jmdictTask = Task.Run(async () =>
tasks.Add(Task.Run(async () =>
{
// 2022/05/11: 394949, 2022/08/15: 398303, 2023/04/22: 403739
dict.Contents = dict.Size > 0
Expand All @@ -584,9 +585,7 @@ public static async Task LoadDictionaries()
}

dict.Ready = true;
});

tasks.Add(jmdictTask);
}));
}

else
Expand All @@ -595,12 +594,20 @@ public static async Task LoadDictionaries()
{
if (useDB && !dbExists)
{
JmdictDBManager.CreateDB(dict.Name);
JmdictDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
JmdictDBManager.CreateDB(dict.Name);
JmdictDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}
dict.Ready = true;
Expand Down Expand Up @@ -633,6 +640,7 @@ public static async Task LoadDictionaries()
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Ready = true;
}));
}
Expand All @@ -643,12 +651,20 @@ public static async Task LoadDictionaries()
{
if (useDB && !dbExists)
{
JmnedictDBManager.CreateDB(dict.Name);
JmnedictDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
JmnedictDBManager.CreateDB(dict.Name);
JmnedictDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}

Expand All @@ -657,6 +673,7 @@ public static async Task LoadDictionaries()
}

break;

case DictType.Kanjidic:
if (!UpdatingKanjidic)
{
Expand Down Expand Up @@ -699,12 +716,20 @@ public static async Task LoadDictionaries()
{
if (useDB && !dbExists)
{
KanjidicDBManager.CreateDB(dict.Name);
KanjidicDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
KanjidicDBManager.CreateDB(dict.Name);
KanjidicDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}

Expand Down Expand Up @@ -816,12 +841,20 @@ public static async Task LoadDictionaries()
{
if (useDB && !dbExists)
{
EpwingYomichanDBManager.CreateDB(dict.Name);
EpwingYomichanDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
EpwingYomichanDBManager.CreateDB(dict.Name);
EpwingYomichanDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}
dict.Ready = true;
Expand Down Expand Up @@ -884,12 +917,20 @@ public static async Task LoadDictionaries()
{
if (useDB && !dbExists)
{
YomichanKanjiDBManager.CreateDB(dict.Name);
YomichanKanjiDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
YomichanKanjiDBManager.CreateDB(dict.Name);
YomichanKanjiDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}
dict.Ready = true;
Expand Down Expand Up @@ -1043,12 +1084,20 @@ dict.Type is DictType.CustomNameDictionary
{
if (useDB && !dbExists)
{
EpwingNazekaDBManager.CreateDB(dict.Name);
EpwingNazekaDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
EpwingNazekaDBManager.CreateDB(dict.Name);
EpwingNazekaDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}
dict.Ready = true;
Expand Down Expand Up @@ -1112,12 +1161,20 @@ dict.Type is DictType.CustomNameDictionary
{
if (useDB && !dbExists)
{
YomichanPitchAccentDBManager.CreateDB(dict.Name);
YomichanPitchAccentDBManager.InsertRecordsToDB(dict);
tasks.Add(Task.Run(() =>
{
YomichanPitchAccentDBManager.CreateDB(dict.Name);
YomichanPitchAccentDBManager.InsertRecordsToDB(dict);
dict.Contents.Clear();
dict.Contents.TrimExcess();
}));
}
else
{
dict.Contents.Clear();
dict.Contents.TrimExcess();
}

dict.Contents.Clear();
dict.Contents.TrimExcess();
dictCleared = true;
}
dict.Ready = true;
Expand All @@ -1132,6 +1189,9 @@ dict.Type is DictType.CustomNameDictionary

if (tasks.Count > 0 || dictCleared)
{
Utils.Frontend.InvalidateDisplayCache();
SqliteConnection.ClearAllPools();

if (tasks.Count > 0)
{
await Task.WhenAll(tasks).ConfigureAwait(false);
Expand All @@ -1149,7 +1209,6 @@ dict.Type is DictType.CustomNameDictionary
}
}

Utils.Frontend.InvalidateDisplayCache();
Utils.Frontend.Alert(AlertLevel.Success, "Finished loading dictionaries");
}

Expand Down

0 comments on commit f309cb4

Please sign in to comment.