LMInstantiator // No need to manually close LMs.

This commit is contained in:
ShikiSuen 2022-05-04 15:28:01 +08:00
parent 3260101b2f
commit 5d39a03d8d
1 changed files with 0 additions and 23 deletions

View File

@ -88,26 +88,11 @@ extension vChewing {
// //
override init() {} override init() {}
//
deinit {
// LMInstantiator
// lmCNS.close() // <--
// lmSymbols.close() // <--
lmCore.close()
lmMisc.close()
lmUserPhrases.close()
lmFiltered.close()
lmUserSymbols.close()
lmReplacements.close()
lmAssociates.close()
}
// 調 // 調
public func isDataModelLoaded() -> Bool { lmCore.isLoaded() } public func isDataModelLoaded() -> 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.close()
lmCore.open(path) lmCore.open(path)
IME.prtDebugIntel("lmCore: \(lmCore.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmCore: \(lmCore.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -119,7 +104,6 @@ extension vChewing {
public func isCNSDataLoaded() -> Bool { lmCNS.isLoaded() } public func isCNSDataLoaded() -> Bool { lmCNS.isLoaded() }
public func loadCNSData(path: String) { public func loadCNSData(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmCNS.close()
lmCNS.open(path) lmCNS.open(path)
IME.prtDebugIntel("lmCNS: \(lmCNS.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmCNS: \(lmCNS.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -131,7 +115,6 @@ extension vChewing {
public func isMiscDataLoaded() -> Bool { lmMisc.isLoaded() } public func isMiscDataLoaded() -> Bool { lmMisc.isLoaded() }
public func loadMiscData(path: String) { public func loadMiscData(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmMisc.close()
lmMisc.open(path) lmMisc.open(path)
IME.prtDebugIntel("lmMisc: \(lmMisc.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmMisc: \(lmMisc.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -143,7 +126,6 @@ extension vChewing {
public func isSymbolDataLoaded() -> Bool { lmSymbols.isLoaded() } public func isSymbolDataLoaded() -> Bool { lmSymbols.isLoaded() }
public func loadSymbolData(path: String) { public func loadSymbolData(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmSymbols.close()
lmSymbols.open(path) lmSymbols.open(path)
IME.prtDebugIntel("lmSymbol: \(lmSymbols.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmSymbol: \(lmSymbols.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -154,7 +136,6 @@ extension vChewing {
public func loadUserPhrases(path: String, filterPath: String) { public func loadUserPhrases(path: String, filterPath: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmUserPhrases.close()
lmUserPhrases.open(path) lmUserPhrases.open(path)
IME.prtDebugIntel("lmUserPhrases: \(lmUserPhrases.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmUserPhrases: \(lmUserPhrases.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -162,7 +143,6 @@ extension vChewing {
} }
} }
if FileManager.default.isReadableFile(atPath: filterPath) { if FileManager.default.isReadableFile(atPath: filterPath) {
lmFiltered.close()
lmFiltered.open(filterPath) lmFiltered.open(filterPath)
IME.prtDebugIntel("lmFiltered: \(lmFiltered.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmFiltered: \(lmFiltered.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -173,7 +153,6 @@ extension vChewing {
public func loadUserSymbolData(path: String) { public func loadUserSymbolData(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmUserSymbols.close()
lmUserSymbols.open(path) lmUserSymbols.open(path)
IME.prtDebugIntel("lmUserSymbol: \(lmUserSymbols.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmUserSymbol: \(lmUserSymbols.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -184,7 +163,6 @@ extension vChewing {
public func loadUserAssociatedPhrases(path: String) { public func loadUserAssociatedPhrases(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmAssociates.close()
lmAssociates.open(path) lmAssociates.open(path)
IME.prtDebugIntel("lmAssociates: \(lmAssociates.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmAssociates: \(lmAssociates.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {
@ -195,7 +173,6 @@ extension vChewing {
public func loadPhraseReplacementMap(path: String) { public func loadPhraseReplacementMap(path: String) {
if FileManager.default.isReadableFile(atPath: path) { if FileManager.default.isReadableFile(atPath: path) {
lmReplacements.close()
lmReplacements.open(path) lmReplacements.open(path)
IME.prtDebugIntel("lmReplacements: \(lmReplacements.count) entries of data loaded from: \(path)") IME.prtDebugIntel("lmReplacements: \(lmReplacements.count) entries of data loaded from: \(path)")
if path.contains("vChewing/") { if path.contains("vChewing/") {