mii/AzooKeyKanaKanjiConverter
1
0
Fork 0
mirror of https://github.com/mii443/AzooKeyKanaKanjiConverter.git synced 2025-12-03 11:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: file I/Oでの遅延をなくすために、事前にキャッシュできるように

Browse Source
This commit is contained in:
fkunn1326
2025-02-26 20:24:27 +09:00
parent 24f506b5b5
commit 39b90389da
3 changed files with 109 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/KanaKanjiConverterModule/Converter/KanaKanjiConverter.swift
View File

@@ -43,6 +43,10 @@ import EfficientNGram
self.lastData = nil
}
public func preloadLouds(option: ConvertRequestOptions) {
LOUDS.preloadLouds(option: option)
}
private func getZenzaiPersonalization(mode: ConvertRequestOptions.ZenzaiMode.PersonalizationMode?) -> (mode: ConvertRequestOptions.ZenzaiMode.PersonalizationMode, base: EfficientNGram, personal: EfficientNGram)? {
guard let mode else {
return nil

26
Sources/KanaKanjiConverterModule/DicdataStore/DicdataStore.swift
View File

@@ -162,19 +162,19 @@ public final class DicdataStore {
importedLoudses.insert(query)
// 一部のASCII文字はエスケープする
let identifier = [
#"\n"#: "[0A]",
#" "#: "[20]",
#"""#: "[22]",
#"'"#: "[27]",
#"*"#: "[2A]",
#"+"#: "[2B]",
#"."#: "[2E]",
#"/"#: "[2F]",
#":"#: "[3A]",
#"<"#: "[3C]",
#">"#: "[3E]",
#"\"#: "[5C]",
#"|"#: "[7C]",
"\\n": "[0A]",
" ": "[20]",
"\"": "[22]",
"\'": "[27]",
"*": "[2A]",
"+": "[2B]",
".": "[2E]",
"/": "[2F]",
":": "[3A]",
"<": "[3C]",
">": "[3E]",
"\\": "[5C]",
"|": "[7C]",
][query, default: query]
if let louds = LOUDS.load(identifier, option: self.requestOptions) {
self.loudses[query] = louds

82
Sources/KanaKanjiConverterModule/LOUDS/extension LOUDS.swift
View File

@@ -10,10 +10,60 @@ import Foundation
import SwiftUtils
extension LOUDS {
private static func loadLOUDSBinary(from url: URL) -> [UInt64]? {
// Cache to store preloaded loudstxt3 data
private static var loudstxt3Cache: [String: Data] = [:]
private static var loudsCache: [String: [UInt64]] = [:]
private static var loudscharsCache: [String: [UInt8]] = [:]
// Call this function at app startup to preload all loudstxt3 files
public static func preloadLouds(option: ConvertRequestOptions) {
guard let fileURLs = try? FileManager.default.contentsOfDirectory(
at: option.dictionaryResourceURL.appendingPathComponent("louds", isDirectory: true),
includingPropertiesForKeys: nil
) else { return }
for url in fileURLs {
let identifier = url.deletingPathExtension().lastPathComponent
let pathext = url.pathExtension
switch pathext {
case "louds":
do {
let binaryData = try Data(contentsOf: url, options: [.uncached]) // 2度読み込むことはないのでキャッシュ不要
loudsCache[identifier] = try loadLOUDSBinary(from: url)
} catch {
debug("Failed to preload \(identifier).louds: \(error)")
}
case "loudschars2":
do {
loudscharsCache[identifier] = try Array(Data(contentsOf: url))
} catch {
debug("Failed to preload \(identifier).loudschars2: \(error)")
}
case "loudstxt3":
do {
loudstxt3Cache[identifier] = try Data(contentsOf: url)
} catch {
debug("Failed to preload \(identifier).loudstxt3: \(error)")
}
default:
break
}
}
}
private static func loadLOUDSBinary(from url: URL) -> [UInt64]? {
// Check if the data is already cached
let identifier = url.deletingPathExtension().lastPathComponent
if let cachedData = loudsCache[identifier] {
return cachedData
}
// If not in cache, load from disk
do {
let binaryData = try Data(contentsOf: url, options: [.uncached])
let ui64array = binaryData.toArray(of: UInt64.self)
// Store in cache for future use
loudsCache[identifier] = ui64array
return ui64array
} catch {
debug(error)
@@ -22,7 +72,6 @@ extension LOUDS {
}
private static func getLOUDSURL(_ identifier: String, option: ConvertRequestOptions) -> (chars: URL, louds: URL) {
if identifier == "user"{
return (
option.sharedContainerURL.appendingPathComponent("user.loudschars2", isDirectory: false),
@@ -57,12 +106,19 @@ extension LOUDS {
package static func load(_ identifier: String, option: ConvertRequestOptions) -> LOUDS? {
let (charsURL, loudsURL) = getLOUDSURL(identifier, option: option)
let nodeIndex2ID: [UInt8]
// Check if the data is already cached
if let cachedData = loudscharsCache[identifier] {
nodeIndex2ID = cachedData
} else {
do {
nodeIndex2ID = try Array(Data(contentsOf: charsURL, options: [.uncached])) // 2度読み込むことはないのでキャッシュ不要
nodeIndex2ID = try Array(Data(contentsOf: charsURL, options: [.uncached]))
// Store in cache for future use
loudscharsCache[identifier] = nodeIndex2ID
} catch {
debug("Error: \(identifier)に対するLOUDSファイルが存在しません。このエラーは無視できる可能性があります。 Description: \(error)")
return nil
}
}
if let bytes = LOUDS.loadLOUDSBinary(from: loudsURL) {
let louds = LOUDS(bytes: bytes.map {$0.littleEndian}, nodeIndex2ID: nodeIndex2ID)
@@ -106,11 +162,20 @@ extension LOUDS {
static func getDataForLoudstxt3(_ identifier: String, indices: [Int], option: ConvertRequestOptions) -> [DicdataElement] {
let binary: Data
// Try to get from cache first
if let cachedData = loudstxt3Cache[identifier] {
binary = cachedData
} else {
// Fall back to loading from disk if not in cache
do {
let url = getLoudstxt3URL(identifier, option: option)
binary = try Data(contentsOf: url)
// Cache the data for future use
loudstxt3Cache[identifier] = binary
} catch {
debug("getDataForLoudstxt3: \(error)")
}
return []
}
@@ -129,13 +194,22 @@ extension LOUDS {
/// indexとの対応を維持したバージョン
static func getDataForLoudstxt3(_ identifier: String, indices: [(trueIndex: Int, keyIndex: Int)], option: ConvertRequestOptions) -> [(loudsNodeIndex: Int, dicdata: [DicdataElement])] {
let binary: Data
// Try to get from cache first
if let cachedData = loudstxt3Cache[identifier] {
binary = cachedData
} else {
// Fall back to loading from disk if not in cache
do {
let url = getLoudstxt3URL(identifier, option: option)
binary = try Data(contentsOf: url)
// Store in cache for future use
loudstxt3Cache[identifier] = binary
} catch {
debug("getDataForLoudstxt3: \(error)")
return []
}
}
let lc = binary[0..<2].toArray(of: UInt16.self)[0]
let header_endIndex: UInt32 = 2 + UInt32(lc) * UInt32(MemoryLayout<UInt32>.size)