Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions macSKK/Dict.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,35 @@ enum DictReferringOption {
case okuri(String)
}

/// 従来形式の辞書で1行を読み込めなかった内容。コメント行と空行は含まない。
struct DictReadFailure: Equatable, Sendable {
/// 1始まりの行番号
let lineNumber: Int
/// 読み込めなかった行の生テキスト
let line: String
let reason: Reason

enum Reason: Error, Equatable, Sendable {
/// " /" で読みと変換候補が区切られていない
case missingSeparator
/// 読みに空白が含まれる
case spaceInYomi
/// 変換候補がスラッシュで終わっていない
case unterminatedCandidates

var localizedDescription: String {
switch self {
case .missingSeparator:
String(localized: "DictReadFailureReasonMissingSeparator")
case .spaceInYomi:
String(localized: "DictReadFailureReasonSpaceInYomi")
case .unterminatedCandidates:
String(localized: "DictReadFailureReasonUnterminatedCandidates")
}
}
}
}

protocol DictProtocol {
/**
* 辞書を引き変換候補順に返す
Expand Down
30 changes: 25 additions & 5 deletions macSKK/Entry.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,34 @@ struct Entry: Sendable {
// コメント行
return nil
}
let words = line.split(separator: " /", maxSplits: 1)
if words.count != 2 || words[0].contains(" ") {
guard case .success(let entry) = Self.parse(line: line, dictId: dictId) else {
return nil
}
yomi = String(words[0]).replacing("う゛", with: "ゔ")
guard let candidates = Self.parseWords(words[1], dictId: dictId) else { return nil }
self = entry
}

/**
* SKK辞書の一行をパースする。
*
* 読みの「う゛」は「ゔ」に変換して返す。
* 空文字列の変換候補を含む場合、現状の実装では除外して返す。
* コメント行は呼び出し側で除く。ここが失敗するのは区切りがない、読みに空白がある、
* 変換候補がスラッシュで終わっていない、の3つ。
*/
static func parse(line: String, dictId: FileDict.ID) -> Result<Entry, DictReadFailure.Reason> {
let words = line.split(separator: " /", maxSplits: 1)
if words.count != 2 {
return .failure(.missingSeparator)
}
if words[0].contains(" ") {
return .failure(.spaceInYomi)
}
let yomi = String(words[0]).replacing("う゛", with: "ゔ")
guard let candidates = parseWords(words[1], dictId: dictId) else {
return .failure(.unterminatedCandidates)
}
// TODO: いまは空の変換候補をスキップしているが扱えるようにしたい
self.candidates = candidates.filter { !$0.word.isEmpty }
return .success(Entry(yomi: yomi, candidates: candidates.filter { !$0.word.isEmpty }))
}

init(yomi: String, candidates: [Word]) {
Expand Down
11 changes: 8 additions & 3 deletions macSKK/FileDict.swift
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ enum FileDictType: Equatable {
logger.log("辞書 \(self.id, privacy: .public) から \(self.entryCount) エントリ読み込みました")
NotificationCenter.default.post(name: notificationNameFileDictStatus,
object: StatusEvent(id: self.id,
status: .loaded(success: entryCount, failure: failedEntryCount),
status: .loaded(success: entryCount, failures: readFailures),
trigger: .load))
case .failure(let error):
logger.error("辞書 \(self.id, privacy: .public) の読み込みでエラーが発生しました: \(error)")
Expand Down Expand Up @@ -324,6 +324,11 @@ enum FileDictType: Equatable {
*/
var failedEntryCount: Int { return searchable.failedEntryCount }

/**
* 読み込みに失敗した行。コメント行、空行は除く。
*/
var readFailures: [DictReadFailure] { return searchable.readFailures }

// MARK: DictProtocol
@MainActor func refer(_ yomi: String, option: DictReferringOption?) -> [Word] {
return searchable.refer(yomi, option: option)
Expand Down Expand Up @@ -392,8 +397,8 @@ enum FileDictType: Equatable {
extension FileDict {
/// 辞書の読み込み状態
enum Status {
/// 正常に読み込み済み。引数は読み込めたエントリ数と読み込みできなかった行数
case loaded(success: Int, failure: Int)
/// 正常に読み込み済み。引数は読み込めたエントリ数と読み込めなかった行
case loaded(success: Int, failures: [DictReadFailure])
case loading
/// 無効に設定されている
case disabled
Expand Down
27 changes: 14 additions & 13 deletions macSKK/MemoryDict.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ struct MemoryDict: SearchableDict, DictProtocol, Sendable {
*/
private(set) var entries: [String: [Word]]
/**
* 読み込みに失敗した行数。コメント行、空行は除いた行数。
* 読み込みに失敗した行。コメント行、空行は除く。
*/
private(set) var failedEntryCount: Int
private(set) var readFailures: [DictReadFailure]
/**
* 重複を含まない送りなしの読みの配列。最近変換したものが後に登場する。
*
Expand All @@ -31,14 +31,15 @@ struct MemoryDict: SearchableDict, DictProtocol, Sendable {
var okuriNashiYomis: [String] = []
var okuriAriYomis: [String] = []
var lineNumber = 0
var failedEntryCount = 0
var readFailures: [DictReadFailure] = []

source.enumerateLines { line, stop in
lineNumber += 1
if line.isEmpty || line.hasPrefix(";") {
return
}
if let entry = Entry(line: line, dictId: dictId) {
switch Entry.parse(line: line, dictId: dictId) {
case .success(let entry):
// 空文字列への変換候補をもつ場合、entry.candidatesは空になっているのでスキップする
if !entry.candidates.isEmpty {
if let candidates = dict[entry.yomi] {
Expand All @@ -52,21 +53,21 @@ struct MemoryDict: SearchableDict, DictProtocol, Sendable {
okuriNashiYomis.append(entry.yomi)
}
}
} else {
failedEntryCount += 1
logger.warning("辞書 \(dictId, privacy: .public) の読み込みで \(lineNumber)行目を正常に読み込めなかったためこの行をスキップします")
case .failure(let reason):
readFailures.append(DictReadFailure(lineNumber: lineNumber, line: line, reason: reason))
logger.warning("辞書 \(dictId, privacy: .public) の読み込みで \(lineNumber)行目を正常に読み込めなかったためこの行をスキップします (\(String(describing: reason), privacy: .public))")
}
}
entries = dict
self.failedEntryCount = failedEntryCount
self.readFailures = readFailures
self.okuriNashiYomis = okuriNashiYomis.reversed()
self.okuriAriYomis = okuriAriYomis.reversed()
}

init(entries: [String: [Word]], saveToUserDict: Bool = true) {
self.entries = entries
self.saveToUserDict = saveToUserDict
failedEntryCount = 0
readFailures = []
for yomi in entries.keys {
if yomi.isOkuriAri {
okuriAriYomis.append(yomi)
Expand All @@ -78,15 +79,15 @@ struct MemoryDict: SearchableDict, DictProtocol, Sendable {

init(okuriAriEntries: [String: [Word]], okuriNashiEntries: [String: [Word]], saveToUserDict: Bool = true) {
self.entries = okuriAriEntries.merging(okuriNashiEntries) { current, _ in current }
failedEntryCount = 0
readFailures = []
okuriAriYomis = Array(okuriAriEntries.keys)
okuriNashiYomis = Array(okuriNashiEntries.keys)
self.saveToUserDict = saveToUserDict
}

init(entries: [String: [Word]], failedEntryCount: Int, okuriNashiYomis: [String], okuriAriYomis: [String], saveToUserDict: Bool) {
init(entries: [String: [Word]], readFailures: [DictReadFailure], okuriNashiYomis: [String], okuriAriYomis: [String], saveToUserDict: Bool) {
self.entries = entries
self.failedEntryCount = failedEntryCount
self.readFailures = readFailures
self.okuriNashiYomis = okuriNashiYomis
self.okuriAriYomis = okuriAriYomis
self.saveToUserDict = saveToUserDict
Expand All @@ -97,7 +98,7 @@ struct MemoryDict: SearchableDict, DictProtocol, Sendable {
nonisolated func with(saveToUserDict: Bool) -> MemoryDict {
MemoryDict(
entries: entries,
failedEntryCount: failedEntryCount,
readFailures: readFailures,
okuriNashiYomis: okuriNashiYomis,
okuriAriYomis: okuriAriYomis,
saveToUserDict: saveToUserDict
Expand Down
27 changes: 14 additions & 13 deletions macSKK/ReadonlyMemoryDict.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,39 @@ struct ReadonlyMemoryDict: SearchableDict, DictProtocol, Sendable {
/// 全読みの変換候補を `keys` の順に連結したもの。読みごとの範囲は `starts` で引く
private let words: [Word]
/**
* 読み込みに失敗した行数。コメント行、空行は除いた行数。
* 読み込みに失敗した行。コメント行、空行は除く。
*/
let failedEntryCount: Int
let readFailures: [DictReadFailure]
/// この辞書から返した変換候補をユーザー辞書に保存するかどうか
let saveToUserDict: Bool

init(dictId: FileDict.ID, source: String, saveToUserDict: Bool = true) {
// 読み込み中のピークメモリを抑えるためDictionaryを経由せず登場順に溜める
var entries: [(yomi: String, words: [Word])] = []
var lineNumber = 0
var failedEntryCount = 0
var readFailures: [DictReadFailure] = []

source.enumerateLines { line, stop in
lineNumber += 1
if line.isEmpty || line.hasPrefix(";") {
return
}
if let entry = Entry(line: line, dictId: dictId) {
switch Entry.parse(line: line, dictId: dictId) {
case .success(let entry):
// 空文字列への変換候補をもつ場合、entry.candidatesは空になっているのでスキップする
if !entry.candidates.isEmpty {
entries.append((yomi: entry.yomi, words: entry.candidates))
}
} else {
failedEntryCount += 1
logger.warning("辞書 \(dictId, privacy: .public) の読み込みで \(lineNumber)行目を正常に読み込めなかったためこの行をスキップします")
case .failure(let reason):
readFailures.append(DictReadFailure(lineNumber: lineNumber, line: line, reason: reason))
logger.warning("辞書 \(dictId, privacy: .public) の読み込みで \(lineNumber)行目を正常に読み込めなかったためこの行をスキップします (\(String(describing: reason), privacy: .public))")
}
}
self.init(table: Self.makeTable(entries: entries), failedEntryCount: failedEntryCount, saveToUserDict: saveToUserDict)
self.init(table: Self.makeTable(entries: entries), readFailures: readFailures, saveToUserDict: saveToUserDict)
}

init(entries: [String: [Word]], saveToUserDict: Bool = true) {
self.init(table: Self.makeTable(entries: entries.map { (yomi: $0.key, words: $0.value) }), failedEntryCount: 0, saveToUserDict: saveToUserDict)
self.init(table: Self.makeTable(entries: entries.map { (yomi: $0.key, words: $0.value) }), readFailures: [], saveToUserDict: saveToUserDict)
}

/// JSON形式の辞書用。
Expand All @@ -66,17 +67,17 @@ struct ReadonlyMemoryDict: SearchableDict, DictProtocol, Sendable {
init(okuriAriEntries: [String: [Word]], okuriNashiEntries: [String: [Word]], saveToUserDict: Bool = true) {
let entries = okuriAriEntries.map { (yomi: $0.key, words: $0.value) }
+ okuriNashiEntries.filter { okuriAriEntries[$0.key] == nil }.map { (yomi: $0.key, words: $0.value) }
self.init(table: Self.makeTable(entries: entries), failedEntryCount: 0, saveToUserDict: saveToUserDict)
self.init(table: Self.makeTable(entries: entries), readFailures: [], saveToUserDict: saveToUserDict)
}

/// ``keys``, ``starts``, ``words`` の組。
private typealias Table = (keys: [String], starts: [UInt32], words: [Word])

private init(table: Table, failedEntryCount: Int, saveToUserDict: Bool) {
private init(table: Table, readFailures: [DictReadFailure], saveToUserDict: Bool) {
self.keys = table.keys
self.starts = table.starts
self.words = table.words
self.failedEntryCount = failedEntryCount
self.readFailures = readFailures
self.saveToUserDict = saveToUserDict
}

Expand Down Expand Up @@ -119,7 +120,7 @@ struct ReadonlyMemoryDict: SearchableDict, DictProtocol, Sendable {

nonisolated func with(saveToUserDict: Bool) -> ReadonlyMemoryDict {
ReadonlyMemoryDict(table: (keys: keys, starts: starts, words: words),
failedEntryCount: failedEntryCount,
readFailures: readFailures,
saveToUserDict: saveToUserDict)
}

Expand Down
7 changes: 5 additions & 2 deletions macSKK/SearchableDict.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ protocol SearchableDict: Sendable {
var saveToUserDict: Bool { get }
/// 辞書がもっているエントリ数
var entryCount: Int { get }
/// 読み込みに失敗した行数。コメント行、空行は除いた行数。
var failedEntryCount: Int { get }
/// 読み込みに失敗した行。コメント行、空行は除く。
var readFailures: [DictReadFailure] { get }
}

extension SearchableDict {
/// 読み込みに失敗した行数。コメント行、空行は除いた行数。
var failedEntryCount: Int { readFailures.count }

nonisolated func refer(_ yomi: String, option: DictReferringOption?) -> [Word] {
if let option {
switch option {
Expand Down
Loading