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

Repo // Add SCPC sequence data from Eten DOS.

This commit is contained in:
ShikiSuen 2023-10-02 20:37:31 +08:00
parent 7bab872346
commit ac4ed0a320
10 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,7 @@ public extension vChewingLM {
}
}
public func loadUserSCPCSequencesData(path: String) {
public func loadSCPCSequencesData(path: String) {
DispatchQueue.main.async {
if FileManager.default.isReadableFile(atPath: path) {
self.lmPlainBopomofo.clear()

12
Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmPlainBopomofo.swift
View File

@ -29,13 +29,17 @@ public extension vChewingLM {
do {
let rawData = try Data(contentsOf: URL(fileURLWithPath: path))
let rawPlist: [String: String] =
try PropertyListSerialization.propertyList(from: rawData, format: nil) as? [String: String] ?? .init()
dataMap = rawPlist
if let rawJSON = try? JSONSerialization.jsonObject(with: rawData) as? [String: String] {
dataMap = rawJSON
} else {
filePath = oldPath
vCLog("↑ Exception happened when reading JSON file at: \(path).")
return false
}
} catch {
filePath = oldPath
vCLog("\(error)")
vCLog("↑ Exception happened when reading data at: \(path).")
vCLog("↑ Exception happened when reading JSON file at: \(path).")
return false
}

12
Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_Core.swift
View File

@ -211,7 +211,7 @@ public class LMMgr {
if PrefMgr.shared.associatedPhrasesEnabled { Self.loadUserAssociatesData() }
if PrefMgr.shared.phraseReplacementEnabled { Self.loadUserPhraseReplacement() }
if PrefMgr.shared.useSCPCTypingMode { Self.loadUserSCPCSequencesData() }
if PrefMgr.shared.useSCPCTypingMode { Self.loadSCPCSequencesData() }
Self.uomCHT.loadData(fromURL: userOverrideModelDataURL(.imeModeCHT))
Self.uomCHS.loadData(fromURL: userOverrideModelDataURL(.imeModeCHS))
@ -268,12 +268,12 @@ public class LMMgr {
)
}
public static func loadUserSCPCSequencesData() {
Self.lmCHT.loadUserSCPCSequencesData(
path: Self.userSCPCSequencesURL(.imeModeCHT).path
public static func loadSCPCSequencesData() {
Self.lmCHT.loadSCPCSequencesData(
path: Self.etenSCPCSequencesURL(.imeModeCHT).path
)
Self.lmCHS.loadUserSCPCSequencesData(
path: Self.userSCPCSequencesURL(.imeModeCHS).path
Self.lmCHS.loadSCPCSequencesData(
path: Self.etenSCPCSequencesURL(.imeModeCHS).path
)
}

9
Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_Utilities.swift
View File

@ -105,12 +105,12 @@ public extension LMMgr {
return URL(fileURLWithPath: dataFolderPath(isDefaultFolder: false)).appendingPathComponent(fileName)
}
/// 使用者逐字選字模式候選字詞順序資料路徑。
/// 逐字選字模式候選字詞順序資料路徑。該資料出自倚天中文 DOS 系統。
/// - Parameter mode: 簡繁體輸入模式。
/// - Returns: 資料路徑（URL）。
static func userSCPCSequencesURL(_ mode: Shared.InputMode) -> URL {
let fileName = (mode == .imeModeCHT) ? "data-plain-bpmf-cht.plist" : "data-plain-bpmf-chs.plist"
return URL(fileURLWithPath: dataFolderPath(isDefaultFolder: false)).appendingPathComponent(fileName)
static func etenSCPCSequencesURL(_ mode: Shared.InputMode) -> URL {
let fileName = (mode == .imeModeCHT) ? "sequenceDataFromEtenDOS-cht" : "sequenceDataFromEtenDOS-chs"
return URL(fileURLWithPath: getBundleDataPath(fileName, factory: true, ext: "json"))
}
/// 使用者波浪符號選單資料路徑。
@ -380,7 +380,6 @@ public extension LMMgr {
break caseCheck
}
}
failed = failed || !ensureFileExists(userSCPCSequencesURL(mode))
return !failed
}

3
Packages/vChewing_MainAssembly/Sources/MainAssembly/PrefMgr_Core.swift
View File

@ -312,7 +312,8 @@ import SwiftExtension
public dynamic var useSCPCTypingMode: Bool {
willSet {
if newValue {
LMMgr.loadUserSCPCSequencesData()
LMMgr.loadSCPCSequencesData()
LMMgr.setSCPCEnabled(true)
}
}
}

2
Packages/vChewing_MainAssembly/Sources/MainAssembly/PrefMgr_Observable.swift
View File

@ -299,7 +299,7 @@ public class PrefMgrObservable: NSObject, PrefMgrProtocol, ObservableObject {
public var useSCPCTypingMode: Bool {
willSet {
if newValue {
LMMgr.loadUserSCPCSequencesData()
LMMgr.loadSCPCSequencesData()
}
}
}

2
Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneGeneral.swift
View File

@ -114,7 +114,7 @@ public struct VwrSettingsPaneGeneral: View {
LocalizedStringKey("Emulating select-candidate-per-character mode"),
isOn: $useSCPCTypingMode.onChange {
guard useSCPCTypingMode else { return }
LMMgr.loadUserSCPCSequencesData()
LMMgr.loadSCPCSequencesData()
}
)
Text(LocalizedStringKey("An accommodation for elder computer users."))

1
Source/Resources/sequenceDataFromEtenDOS-chs.json Normal file
View File

File diff suppressed because one or more lines are too long

1
Source/Resources/sequenceDataFromEtenDOS-cht.json Normal file
View File

File diff suppressed because one or more lines are too long

8
vChewing.xcodeproj/project.pbxproj
View File

@ -59,6 +59,8 @@
5BDB7A4128D4824A001AC277 /* Megrez in Frameworks */ = {isa = PBXBuildFile; productRef = 5BDB7A4028D4824A001AC277 /* Megrez */; };
5BDB7A4528D4824A001AC277 /* ShiftKeyUpChecker in Frameworks */ = {isa = PBXBuildFile; productRef = 5BDB7A4428D4824A001AC277 /* ShiftKeyUpChecker */; };
5BDB7A4728D4824A001AC277 /* Tekkon in Frameworks */ = {isa = PBXBuildFile; productRef = 5BDB7A4628D4824A001AC277 /* Tekkon */; };
5BE5D9952ACAEFDE009A732C /* sequenceDataFromEtenDOS-cht.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BE5D9932ACAEFDE009A732C /* sequenceDataFromEtenDOS-cht.json */; };
5BE5D9962ACAEFDE009A732C /* sequenceDataFromEtenDOS-chs.json in Resources */ = {isa = PBXBuildFile; fileRef = 5BE5D9942ACAEFDE009A732C /* sequenceDataFromEtenDOS-chs.json */; };
5BE63A2D2AC5B8A6009AFC0C /* InstallerShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE63A2C2AC5B882009AFC0C /* InstallerShared.swift */; };
5BE63A2E2AC5B8A8009AFC0C /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE63A2B2AC5B7D3009AFC0C /* MainView.swift */; };
5BE63A2F2AC5B8A9009AFC0C /* vChewingInstallerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE63A2A2AC5B7C3009AFC0C /* vChewingInstallerApp.swift */; };
@ -209,6 +211,8 @@
5BDCBB4827B4F6C600D0CC59 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
5BDCBB4927B4F6C700D0CC59 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
5BDCBB4A27B4F6C700D0CC59 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
5BE5D9932ACAEFDE009A732C /* sequenceDataFromEtenDOS-cht.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "sequenceDataFromEtenDOS-cht.json"; sourceTree = "<group>"; };
5BE5D9942ACAEFDE009A732C /* sequenceDataFromEtenDOS-chs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "sequenceDataFromEtenDOS-chs.json"; sourceTree = "<group>"; };
5BE63A2A2AC5B7C3009AFC0C /* vChewingInstallerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = vChewingInstallerApp.swift; sourceTree = "<group>"; };
5BE63A2B2AC5B7D3009AFC0C /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
5BE63A2C2AC5B882009AFC0C /* InstallerShared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstallerShared.swift; sourceTree = "<group>"; };
@ -345,6 +349,8 @@
children = (
5B84579C2871AD2200C93B01 /* convdict.json */,
5B09307828B6FC3B0021F8C5 /* shortcuts.html */,
5BE5D9942ACAEFDE009A732C /* sequenceDataFromEtenDOS-chs.json */,
5BE5D9932ACAEFDE009A732C /* sequenceDataFromEtenDOS-cht.json */,
5BF9DA2428840E6200DBD48E /* template-associatedPhrases-chs.txt */,
5BF9DA2C2884247800DBD48E /* template-associatedPhrases-cht.txt */,
5BF9DA2328840E6200DBD48E /* template-exclusions.txt */,
@ -738,6 +744,7 @@
5BEDB723283B4C250078EB25 /* data-cht.json in Resources */,
5BEDB721283B4C250078EB25 /* data-cns.json in Resources */,
5BBC2D9F28F51C0400C986F6 /* LICENSE-CHT.txt in Resources */,
5BE5D9952ACAEFDE009A732C /* sequenceDataFromEtenDOS-cht.json in Resources */,
5BF9DA2D288427E000DBD48E /* template-associatedPhrases-cht.txt in Resources */,
5BBC2D9E28F51C0400C986F6 /* LICENSE.txt in Resources */,
5BEDB725283B4C250078EB25 /* data-chs.json in Resources */,
@ -748,6 +755,7 @@
5BF9DA2728840E6200DBD48E /* template-usersymbolphrases.txt in Resources */,
5B1C98B929436CEE0019B807 /* data-bpmf-reverse-lookup.json in Resources */,
5BBC2DA128F51C0400C986F6 /* LICENSE-CHS.txt in Resources */,
5BE5D9962ACAEFDE009A732C /* sequenceDataFromEtenDOS-chs.json in Resources */,
5BEDB724283B4C250078EB25 /* data-symbols.json in Resources */,
5B7BC4B027AFFBE800F66C24 /* frmPrefWindow.xib in Resources */,
5BF9DA2A28840E6200DBD48E /* template-replacements.txt in Resources */,