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

mgrLM // Use Swiftified LMConsolidator instead.

This commit is contained in:
ShikiSuen 2022-04-26 09:34:02 +08:00
parent 309c6f04d1
commit d06a39572e
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Modules/FileHandlers/LMConsolidator.swift
View File

@ -33,8 +33,8 @@ extension vChewing {
let fileHandle = FileHandle(forReadingAtPath: path)! let fileHandle = FileHandle(forReadingAtPath: path)!
do { do {
let lineReader = try LineReader(file: fileHandle) let lineReader = try LineReader(file: fileHandle)
IME.prtDebugIntel("Header Seen ||\(lineReader)")
for strLine in lineReader { // 不需要 i=0，因為第一遍迴圈就出結果。 for strLine in lineReader { // 不需要 i=0，因為第一遍迴圈就出結果。
IME.prtDebugIntel("Header Seen ||\(strLine)")
if strLine != kPragmaHeader { if strLine != kPragmaHeader {
IME.prtDebugIntel("Header Mismatch, Starting In-Place Consolidation.") IME.prtDebugIntel("Header Mismatch, Starting In-Place Consolidation.")
return false return false
@ -68,7 +68,7 @@ extension vChewing {
IME.prtDebugIntel("EOF Fix Failed w/ Error: \(error).") IME.prtDebugIntel("EOF Fix Failed w/ Error: \(error).")
return false return false
} }
IME.prtDebugIntel("Either EOF Fix Successful Or No-Need-To-Fix.") IME.prtDebugIntel("EOF Successfully Ensured (with possible autofixes performed).")
return true return true
} }
IME.prtDebugIntel("EOF Fix Failed: File Missing at \(path).") IME.prtDebugIntel("EOF Fix Failed: File Missing at \(path).")

1
Source/Modules/LangModelRelated/mgrLangModel.h
View File

@ -39,7 +39,6 @@ NS_ASSUME_NONNULL_BEGIN
+ (BOOL)checkIfUserPhraseExist:(NSString *)userPhrase + (BOOL)checkIfUserPhraseExist:(NSString *)userPhrase
inputMode:(InputMode)mode inputMode:(InputMode)mode
key:(NSString *)key NS_SWIFT_NAME(checkIfUserPhraseExist(userPhrase:mode:key:)); key:(NSString *)key NS_SWIFT_NAME(checkIfUserPhraseExist(userPhrase:mode:key:));
+ (void)consolidateGivenFile:(NSString *)path shouldCheckPragma:(BOOL)shouldCheckPragma;
+ (void)setPhraseReplacementEnabled:(BOOL)phraseReplacementEnabled; + (void)setPhraseReplacementEnabled:(BOOL)phraseReplacementEnabled;
+ (void)setCNSEnabled:(BOOL)cnsEnabled; + (void)setCNSEnabled:(BOOL)cnsEnabled;
+ (void)setSymbolEnabled:(BOOL)symbolEnabled; + (void)setSymbolEnabled:(BOOL)symbolEnabled;

6
Source/Modules/LangModelRelated/mgrLangModel.mm
View File

@ -141,12 +141,6 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, vChewing
return NO; return NO;
} }
// 這個函數無法遷移至 Swift
+ (void)consolidateGivenFile:(NSString *)path shouldCheckPragma:(BOOL)shouldCheckPragma
{
vChewing::LMConsolidator::ConsolidateContent([path UTF8String], shouldCheckPragma);
}
// 這個函數無法遷移至 Swift // 這個函數無法遷移至 Swift
+ (vChewing::LMInstantiator *)lmCHT + (vChewing::LMInstantiator *)lmCHT
{ {

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

@ -233,7 +233,9 @@ import Cocoa
// We enforce the format consolidation here, since the pragma header // We enforce the format consolidation here, since the pragma header
// will let the UserPhraseLM bypasses the consolidating process on load. // will let the UserPhraseLM bypasses the consolidating process on load.
consolidate(givenFile: path, shouldCheckPragma: false) if !vChewing.LMConsolidator.consolidate(path: path, pragma: false) {
return false
}
// We use FSEventStream to monitor possible changes of the user phrase folder, hence the // We use FSEventStream to monitor possible changes of the user phrase folder, hence the
// lack of the needs of manually load data here unless FSEventStream is disabled by user. // lack of the needs of manually load data here unless FSEventStream is disabled by user.