diff --git a/Source/Modules/IMEModules/IME.swift b/Source/Modules/IMEModules/IME.swift index fbdf2f4d..09b769eb 100644 --- a/Source/Modules/IMEModules/IME.swift +++ b/Source/Modules/IMEModules/IME.swift @@ -64,14 +64,12 @@ public class IME: NSObject { // MARK: - Initializing Language Models. static func initLangModels(userOnly: Bool) { - DispatchQueue.global(qos: .userInitiated).async { - // mgrLangModel 的 loadUserPhrases 等函數在自動讀取 dataFolderPath 時, - // 如果發現自訂目錄不可用,則會自動抹去自訂目錄設定、改採預設目錄。 - // 所以這裡不需要特別處理。 - mgrLangModel.loadUserAssociatedPhrases() - mgrLangModel.loadUserPhraseReplacement() - mgrLangModel.loadUserPhrases() - } + // mgrLangModel 的 loadUserPhrases 等函數在自動讀取 dataFolderPath 時, + // 如果發現自訂目錄不可用,則會自動抹去自訂目錄設定、改採預設目錄。 + // 所以這裡不需要特別處理。 + mgrLangModel.loadUserAssociatedPhrases() + mgrLangModel.loadUserPhraseReplacement() + mgrLangModel.loadUserPhrases() if !userOnly { // mgrLangModel.loadDataModels() } diff --git a/Source/Modules/LangModelRelated/mgrLangModel.swift b/Source/Modules/LangModelRelated/mgrLangModel.swift index 8568cf62..0f941952 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.swift +++ b/Source/Modules/LangModelRelated/mgrLangModel.swift @@ -51,25 +51,23 @@ class mgrLangModel: NSObject { } public static func loadDataModels() { - DispatchQueue.global(qos: .userInitiated).async { - if !gLangModelCHT.isCNSDataLoaded() { - gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns")) - } - if !gLangModelCHT.isMiscDataLoaded() { - gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) - } - if !gLangModelCHT.isSymbolDataLoaded() { - gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols")) - } - if !gLangModelCHS.isCNSDataLoaded() { - gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns")) - } - if !gLangModelCHS.isMiscDataLoaded() { - gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) - } - if !gLangModelCHS.isSymbolDataLoaded() { - gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols")) - } + if !gLangModelCHT.isCNSDataLoaded() { + gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns")) + } + if !gLangModelCHT.isMiscDataLoaded() { + gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) + } + if !gLangModelCHT.isSymbolDataLoaded() { + gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols")) + } + if !gLangModelCHS.isCNSDataLoaded() { + gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns")) + } + if !gLangModelCHS.isMiscDataLoaded() { + gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) + } + if !gLangModelCHS.isSymbolDataLoaded() { + gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols")) } if !gLangModelCHT.isDataModelLoaded() { NotifierController.notify( @@ -101,16 +99,14 @@ class mgrLangModel: NSObject { public static func loadDataModel(_ mode: InputMode) { if mode == InputMode.imeModeCHS { - DispatchQueue.global(qos: .userInitiated).async { - if !gLangModelCHS.isMiscDataLoaded() { - gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) - } - if !gLangModelCHS.isSymbolDataLoaded() { - gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols")) - } - if !gLangModelCHS.isCNSDataLoaded() { - gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns")) - } + if !gLangModelCHS.isMiscDataLoaded() { + gLangModelCHS.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) + } + if !gLangModelCHS.isSymbolDataLoaded() { + gLangModelCHS.loadSymbolData(path: getBundleDataPath("data-symbols")) + } + if !gLangModelCHS.isCNSDataLoaded() { + gLangModelCHS.loadCNSData(path: getBundleDataPath("char-kanji-cns")) } if !gLangModelCHS.isDataModelLoaded() { NotifierController.notify( @@ -126,16 +122,14 @@ class mgrLangModel: NSObject { ) } } else if mode == InputMode.imeModeCHT { - DispatchQueue.global(qos: .userInitiated).async { - if !gLangModelCHT.isMiscDataLoaded() { - gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) - } - if !gLangModelCHT.isSymbolDataLoaded() { - gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols")) - } - if !gLangModelCHT.isCNSDataLoaded() { - gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns")) - } + if !gLangModelCHT.isMiscDataLoaded() { + gLangModelCHT.loadMiscData(path: getBundleDataPath("data-zhuyinwen")) + } + if !gLangModelCHT.isSymbolDataLoaded() { + gLangModelCHT.loadSymbolData(path: getBundleDataPath("data-symbols")) + } + if !gLangModelCHT.isCNSDataLoaded() { + gLangModelCHT.loadCNSData(path: getBundleDataPath("char-kanji-cns")) } if !gLangModelCHT.isDataModelLoaded() { NotifierController.notify(