From b84fe50964d9640c3fcfe2ebe3662a927950baf9 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sat, 21 May 2022 14:55:10 +0800 Subject: [PATCH] mgrLM // Simplify userDataFolderExists(). --- Source/Modules/IMEModules/ctlInputMethod_Menu.swift | 2 +- Source/Modules/LangModelRelated/mgrLangModel.swift | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Modules/IMEModules/ctlInputMethod_Menu.swift b/Source/Modules/IMEModules/ctlInputMethod_Menu.swift index 82236031..9f83bc33 100644 --- a/Source/Modules/IMEModules/ctlInputMethod_Menu.swift +++ b/Source/Modules/IMEModules/ctlInputMethod_Menu.swift @@ -302,7 +302,7 @@ extension ctlInputMethod { } @objc func openUserDataFolder(_: Any?) { - if !mgrLangModel.checkIfUserDataFolderExists() { + if !mgrLangModel.userDataFolderExists { return } NSWorkspace.shared.openFile( diff --git a/Source/Modules/LangModelRelated/mgrLangModel.swift b/Source/Modules/LangModelRelated/mgrLangModel.swift index ab6a17d7..8850e23e 100644 --- a/Source/Modules/LangModelRelated/mgrLangModel.swift +++ b/Source/Modules/LangModelRelated/mgrLangModel.swift @@ -271,7 +271,7 @@ enum mgrLangModel { } static func chkUserLMFilesExist(_ mode: InputMode) -> Bool { - if !checkIfUserDataFolderExists() { + if !userDataFolderExists { return false } if !ensureFileExists(userPhrasesDataPath(mode)) @@ -309,9 +309,8 @@ enum mgrLangModel { return true } - // ⚠︎ 私有函數:檢查且糾偏,不接受任何傳入變數。該函數不用於其他型別。 - // 待辦事項:擇日合併至另一個同類型的函數當中。 - static func checkIfUserDataFolderExists() -> Bool { + // 檢查給定的目錄是否存在寫入合規性、且糾偏,不接受任何傳入變數。 + static var userDataFolderExists: Bool { let folderPath = mgrLangModel.dataFolderPath(isDefaultFolder: false) var isFolder = ObjCBool(false) var folderExist = FileManager.default.fileExists(atPath: folderPath, isDirectory: &isFolder)