floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IME & mgrLM // Disable DispatchQueue.

This commit is contained in:
ShikiSuen 2022-05-07 23:02:04 +08:00
parent 183b9dc335
commit a4085b2377
2 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Modules/IMEModules/IME.swift
View File

@ -64,14 +64,12 @@ public class IME: NSObject {
// MARK: - Initializing Language Models. // MARK: - Initializing Language Models.
static func initLangModels(userOnly: Bool) { static func initLangModels(userOnly: Bool) {
DispatchQueue.global(qos: .userInitiated).async { // mgrLangModel 的 loadUserPhrases 等函數在自動讀取 dataFolderPath 時，
// mgrLangModel 的 loadUserPhrases 等函數在自動讀取 dataFolderPath 時， // 如果發現自訂目錄不可用，則會自動抹去自訂目錄設定、改採預設目錄。
// 如果發現自訂目錄不可用，則會自動抹去自訂目錄設定、改採預設目錄。 // 所以這裡不需要特別處理。
// 所以這裡不需要特別處理。 mgrLangModel.loadUserAssociatedPhrases()
mgrLangModel.loadUserAssociatedPhrases() mgrLangModel.loadUserPhraseReplacement()
mgrLangModel.loadUserPhraseReplacement() mgrLangModel.loadUserPhrases()
mgrLangModel.loadUserPhrases()
}
if !userOnly { if !userOnly {
// mgrLangModel.loadDataModels() // mgrLangModel.loadDataModels()
} }

72
Source/Modules/LangModelRelated/mgrLangModel.swift
View File

@ -51,25 +51,23 @@ class mgrLangModel: NSObject {
} }
public static func loadDataModels() { public static func loadDataModels() {
DispatchQueue.global(qos: .userInitiated).async { if !gLangModelCHT.isCNSDataLoaded() {
if !gLangModelCHT.isCNSDataLoaded() { gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns"))
gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns")) }
} if !gLangModelCHT.isMiscDataLoaded() {
if !gLangModelCHT.isMiscDataLoaded() { gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen"))
gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) }
} if !gLangModelCHT.isSymbolDataLoaded() {
if !gLangModelCHT.isSymbolDataLoaded() { gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols"))
gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols")) }
} if !gLangModelCHS.isCNSDataLoaded() {
if !gLangModelCHS.isCNSDataLoaded() { gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns"))
gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns")) }
} if !gLangModelCHS.isMiscDataLoaded() {
if !gLangModelCHS.isMiscDataLoaded() { gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen"))
gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) }
} if !gLangModelCHS.isSymbolDataLoaded() {
if !gLangModelCHS.isSymbolDataLoaded() { gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols"))
gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols"))
}
} }
if !gLangModelCHT.isDataModelLoaded() { if !gLangModelCHT.isDataModelLoaded() {
NotifierController.notify( NotifierController.notify(
@ -101,16 +99,14 @@ class mgrLangModel: NSObject {
public static func loadDataModel(_ mode: InputMode) { public static func loadDataModel(_ mode: InputMode) {
if mode == InputMode.imeModeCHS { if mode == InputMode.imeModeCHS {
DispatchQueue.global(qos: .userInitiated).async { if !gLangModelCHS.isMiscDataLoaded() {
if !gLangModelCHS.isMiscDataLoaded() { gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen"))
gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) }
} if !gLangModelCHS.isSymbolDataLoaded() {
if !gLangModelCHS.isSymbolDataLoaded() { gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols"))
gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols")) }
} if !gLangModelCHS.isCNSDataLoaded() {
if !gLangModelCHS.isCNSDataLoaded() { gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns"))
gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns"))
}
} }
if !gLangModelCHS.isDataModelLoaded() { if !gLangModelCHS.isDataModelLoaded() {
NotifierController.notify( NotifierController.notify(
@ -126,16 +122,14 @@ class mgrLangModel: NSObject {
) )
} }
} else if mode == InputMode.imeModeCHT { } else if mode == InputMode.imeModeCHT {
DispatchQueue.global(qos: .userInitiated).async { if !gLangModelCHT.isMiscDataLoaded() {
if !gLangModelCHT.isMiscDataLoaded() { gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen"))
gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) }
} if !gLangModelCHT.isSymbolDataLoaded() {
if !gLangModelCHT.isSymbolDataLoaded() { gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols"))
gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols")) }
} if !gLangModelCHT.isCNSDataLoaded() {
if !gLangModelCHT.isCNSDataLoaded() { gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns"))
gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns"))
}
} }
if !gLangModelCHT.isDataModelLoaded() { if !gLangModelCHT.isDataModelLoaded() {
NotifierController.notify( NotifierController.notify(