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

LMs // Stop letting consolidation process block loading.

This commit is contained in:
ShikiSuen 2022-05-04 11:16:31 +08:00
parent 8b81a3c037
commit 05d9c252cf
5 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ extension vChewing {
return false return false
} }
public static func fixEOF(path: String) -> Bool { @discardableResult public static func fixEOF(path: String) -> Bool {
let urlPath = URL(fileURLWithPath: path) let urlPath = URL(fileURLWithPath: path)
if FileManager.default.fileExists(atPath: path) { if FileManager.default.fileExists(atPath: path) {
var strIncoming = "" var strIncoming = ""
@ -75,7 +75,7 @@ extension vChewing {
return false return false
} }
public static func consolidate(path: String, pragma shouldCheckPragma: Bool) -> Bool { @discardableResult public static func consolidate(path: String, pragma shouldCheckPragma: Bool) -> Bool {
var pragmaResult = false var pragmaResult = false
if shouldCheckPragma { if shouldCheckPragma {
pragmaResult = checkPragma(path: path) pragmaResult = checkPragma(path: path)

8
Source/Modules/LangModelRelated/SubLMs/lmAssociates.swift
View File

@ -49,12 +49,8 @@ extension vChewing {
return false return false
} }
if !LMConsolidator.fixEOF(path: path) { LMConsolidator.fixEOF(path: path)
return false LMConsolidator.consolidate(path: path, pragma: true)
}
if !LMConsolidator.consolidate(path: path, pragma: true) {
return false
}
do { do {
theData = try String(contentsOfFile: path, encoding: .utf8) theData = try String(contentsOfFile: path, encoding: .utf8)

8
Source/Modules/LangModelRelated/SubLMs/lmCore.swift
View File

@ -61,12 +61,8 @@ extension vChewing {
} }
if allowConsolidation { if allowConsolidation {
if !LMConsolidator.fixEOF(path: path) { LMConsolidator.fixEOF(path: path)
return false LMConsolidator.consolidate(path: path, pragma: true)
}
if !LMConsolidator.consolidate(path: path, pragma: true) {
return false
}
} }
do { do {

8
Source/Modules/LangModelRelated/SubLMs/lmLite.swift
View File

@ -52,12 +52,8 @@ extension vChewing {
} }
if allowConsolidation { if allowConsolidation {
if !LMConsolidator.fixEOF(path: path) { LMConsolidator.fixEOF(path: path)
return false LMConsolidator.consolidate(path: path, pragma: true)
}
if !LMConsolidator.consolidate(path: path, pragma: true) {
return false
}
} }
do { do {

8
Source/Modules/LangModelRelated/SubLMs/lmReplacements.swift
View File

@ -49,12 +49,8 @@ extension vChewing {
return false return false
} }
if !LMConsolidator.fixEOF(path: path) { LMConsolidator.fixEOF(path: path)
return false LMConsolidator.consolidate(path: path, pragma: true)
}
if !LMConsolidator.consolidate(path: path, pragma: true) {
return false
}
do { do {
theData = try String(contentsOfFile: path, encoding: .utf8) theData = try String(contentsOfFile: path, encoding: .utf8)