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

LMAssembly // Remove duplicated symbols.

This commit is contained in:
ShikiSuen 2022-12-11 19:49:43 +08:00
parent 83801eee1b
commit c1350bccc3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift
View File

@ -92,7 +92,7 @@ extension vChewingLM {
// MARK: - 工具函式 // MARK: - 工具函式
public var isLanguageModelLoaded: Bool { lmCore.isLoaded } public var isCoreLMLoaded: Bool { lmCore.isLoaded }
public func loadLanguageModel(path: String) { public func loadLanguageModel(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmCore.open(path) lmCore.open(path)
@ -219,8 +219,6 @@ extension vChewingLM {
// MARK: - 核心函式（對外） // MARK: - 核心函式（對外）
public var isCoreLoaded: Bool { lmCore.isLoaded }
public func hasAssociatedPhrasesFor(pair: Megrez.Compositor.KeyValuePaired) -> Bool { public func hasAssociatedPhrasesFor(pair: Megrez.Compositor.KeyValuePaired) -> Bool {
lmAssociates.hasValuesFor(pair: pair) lmAssociates.hasValuesFor(pair: pair)
} }

8
Source/Modules/LMMgr.swift
View File

@ -95,7 +95,7 @@ public class LMMgr {
} }
group.leave() group.leave()
} }
if !Self.lmCHT.isLanguageModelLoaded { if !Self.lmCHT.isCoreLMLoaded {
showFinishNotification = true showFinishNotification = true
Notifier.notify( Notifier.notify(
message: NSLocalizedString("Loading CHT Core Dict...", comment: "") message: NSLocalizedString("Loading CHT Core Dict...", comment: "")
@ -106,7 +106,7 @@ public class LMMgr {
group.leave() group.leave()
} }
} }
if !Self.lmCHS.isLanguageModelLoaded { if !Self.lmCHS.isCoreLMLoaded {
showFinishNotification = true showFinishNotification = true
Notifier.notify( Notifier.notify(
message: NSLocalizedString("Loading CHS Core Dict...", comment: "") message: NSLocalizedString("Loading CHS Core Dict...", comment: "")
@ -159,7 +159,7 @@ public class LMMgr {
} }
switch mode { switch mode {
case .imeModeCHS: case .imeModeCHS:
if !Self.lmCHS.isLanguageModelLoaded { if !Self.lmCHS.isCoreLMLoaded {
showFinishNotification = true showFinishNotification = true
Notifier.notify( Notifier.notify(
message: NSLocalizedString("Loading CHS Core Dict...", comment: "") message: NSLocalizedString("Loading CHS Core Dict...", comment: "")
@ -171,7 +171,7 @@ public class LMMgr {
} }
} }
case .imeModeCHT: case .imeModeCHT:
if !Self.lmCHT.isLanguageModelLoaded { if !Self.lmCHT.isCoreLMLoaded {
showFinishNotification = true showFinishNotification = true
Notifier.notify( Notifier.notify(
message: NSLocalizedString("Loading CHT Core Dict...", comment: "") message: NSLocalizedString("Loading CHT Core Dict...", comment: "")

2
Source/Modules/SessionCtl_HandleEvent.swift
View File

@ -104,7 +104,7 @@ extension SessionCtl {
guard let inputHandler = inputHandler, client() != nil else { return false } guard let inputHandler = inputHandler, client() != nil else { return false }
/// 除非核心辭典有載入，否則一律蜂鳴。 /// 除非核心辭典有載入，否則一律蜂鳴。
if !LMMgr.currentLM.isCoreLoaded { if !LMMgr.currentLM.isCoreLMLoaded {
if (event as InputSignalProtocol).isReservedKey { return false } if (event as InputSignalProtocol).isReservedKey { return false }
var newState: IMEStateProtocol = IMEState.ofEmpty() var newState: IMEStateProtocol = IMEState.ofEmpty()
newState.tooltip = NSLocalizedString("Factory dictionary not loaded yet.", comment: "") + "　　" newState.tooltip = NSLocalizedString("Factory dictionary not loaded yet.", comment: "") + "　　"