From c0494ae43253582481f3028078692fb9a7c7de54 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 23 Mar 2022 11:28:16 +0800 Subject: [PATCH] mgrLM // Allow in-place writing to UserExclPhraseData. --- Source/Modules/LangModelRelated/mgrLangModel.h | 2 +- Source/Modules/LangModelRelated/mgrLangModel.mm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Modules/LangModelRelated/mgrLangModel.h b/Source/Modules/LangModelRelated/mgrLangModel.h index cfa533dd..ded1aa4e 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.h +++ b/Source/Modules/LangModelRelated/mgrLangModel.h @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN + (BOOL)checkIfUserDataFolderExists; + (BOOL)checkIfUserPhraseExist:(NSString *)userPhrase inputMode:(InputMode)mode key:(NSString *)key NS_SWIFT_NAME(checkIfUserPhraseExist(userPhrase:mode:key:)); -+ (BOOL)writeUserPhrase:(NSString *)userPhrase inputMode:(InputMode)mode areWeDuplicating:(BOOL)areWeDuplicating; ++ (BOOL)writeUserPhrase:(NSString *)userPhrase inputMode:(InputMode)mode areWeDuplicating:(BOOL)areWeDuplicating areWeDeleting:(BOOL)areWeDeleting; + (void)setPhraseReplacementEnabled:(BOOL)phraseReplacementEnabled; + (void)setCNSEnabled:(BOOL)cnsEnabled; + (void)setSymbolEnabled:(BOOL)symbolEnabled; diff --git a/Source/Modules/LangModelRelated/mgrLangModel.mm b/Source/Modules/LangModelRelated/mgrLangModel.mm index 53c83ddc..da5eb3bc 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.mm +++ b/Source/Modules/LangModelRelated/mgrLangModel.mm @@ -235,14 +235,14 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, vChewing return NO; } -+ (BOOL)writeUserPhrase:(NSString *)userPhrase inputMode:(InputMode)mode areWeDuplicating:(BOOL)areWeDuplicating ++ (BOOL)writeUserPhrase:(NSString *)userPhrase inputMode:(InputMode)mode areWeDuplicating:(BOOL)areWeDuplicating areWeDeleting:(BOOL)areWeDeleting { if (![self checkIfUserLanguageModelFilesExist]) { return NO; } // BOOL addLineBreakAtFront = NO; - NSString *path = [self userPhrasesDataPath:mode]; + NSString *path = areWeDeleting ? [self excludedPhrasesDataPath:mode] : [self userPhrasesDataPath:mode]; // if ([[NSFileManager defaultManager] fileExistsAtPath:path]) { // NSError *error = nil; @@ -267,7 +267,7 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, vChewing // [currentMarkedPhrase appendString:@"\n"]; // } [currentMarkedPhrase appendString:userPhrase]; - if (areWeDuplicating) { + if (areWeDuplicating && !areWeDeleting) { // Do not use ASCII characters to comment here. // Otherwise, it will be scrambled by HYPY2BPMF module shipped in the vChewing Phrase Editor. [currentMarkedPhrase appendString:@"\t#π™ΎπšŸπšŽπš›πš›πš’πšπšŽ"];