shadowfacts
/
HTMLStreamer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix replace callback with nested element, fix skip/replace at beginning of block skipping block break 

Fixes shadowfacts/Tusker#461
This commit is contained in:
Shadowfacts 2024-03-17 10:56:49 -04:00
parent 9c8b127f15
commit 95edb408fa
4 changed files with 90 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Sources/HTMLStreamer/AttributedStringConverter.swift
View File

@ -24,7 +24,19 @@ public class AttributedStringConverter<Callbacks: HTMLConversionCallbacks> {
private var tokenizer: Tokenizer<String.UnicodeScalarView.Iterator>!
private var str: NSMutableAttributedString!
private var actionStack: [ElementAction] = []
private var actionStack: [ElementAction] = [] {
didSet {
hasSkipOrReplaceElementAction = actionStack.contains(where: {
switch $0 {
case .skip, .replace(_):
true
default:
false
}
})
}
}
private var hasSkipOrReplaceElementAction = false
private var styleStack: [Style] = []
private var blockStateMachine = BlockStateMachine(blockBreak: "", lineBreak: "", listIndentForContentOutsideItem: "", append: { _ in }, removeChar: {})
private var currentElementIsEmpty = true
@ -59,13 +71,15 @@ public class AttributedStringConverter<Callbacks: HTMLConversionCallbacks> {
switch token {
case .character(let c):
currentElementIsEmpty = false
if blockStateMachine.continueBlock(char: c) {
if blockStateMachine.continueBlock(char: c),
!hasSkipOrReplaceElementAction {
currentRun.unicodeScalars.append(c)
}
case .characterSequence(let s):
currentElementIsEmpty = false
for c in s.unicodeScalars {
if blockStateMachine.continueBlock(char: c) {
if blockStateMachine.continueBlock(char: c),
!hasSkipOrReplaceElementAction {
currentRun.unicodeScalars.append(c)
}
}
@ -281,13 +295,10 @@ public class AttributedStringConverter<Callbacks: HTMLConversionCallbacks> {
}()
private func finishRun() {
if actionStack.contains(.skip) {
currentRun = ""
return
} else if case .append(let s) = actionStack.last {
if case .append(let s) = actionStack.last {
currentRun.append(s)
} else if case .replace(let replacement) = actionStack.first(where: \.isReplace) {
currentRun = replacement
} else if case .replace(let replacement) = actionStack.last {
currentRun.append(replacement)
}
guard !currentRun.isEmpty else {

8
Sources/HTMLStreamer/HTMLConversionCallbacks.swift
View File

@ -17,14 +17,6 @@ public enum ElementAction: Equatable {
case skip
case replace(String)
case append(String)
var isReplace: Bool {
if case .replace(_) = self {
true
} else {
false
}
}
}
public extension HTMLConversionCallbacks {

29
Sources/HTMLStreamer/TextConverter.swift
View File

@ -13,7 +13,19 @@ public class TextConverter<Callbacks: HTMLConversionCallbacks> {
private var tokenizer: Tokenizer<String.UnicodeScalarView.Iterator>!
private var str: String!
private var actionStack: [ElementAction] = []
private var actionStack: [ElementAction] = [] {
didSet {
hasSkipOrReplaceElementAction = actionStack.contains(where: {
switch $0 {
case .skip, .replace(_):
true
default:
false
}
})
}
}
private var hasSkipOrReplaceElementAction = false
var blockStateMachine = BlockStateMachine(blockBreak: "", lineBreak: "", listIndentForContentOutsideItem: "", append: { _ in }, removeChar: {})
private var currentElementIsEmpty = true
private var currentRun = ""
@ -46,13 +58,15 @@ public class TextConverter<Callbacks: HTMLConversionCallbacks> {
switch token {
case .character(let scalar):
currentElementIsEmpty = false
if blockStateMachine.continueBlock(char: scalar) {
if blockStateMachine.continueBlock(char: scalar),
!hasSkipOrReplaceElementAction {
currentRun.unicodeScalars.append(scalar)
}
case .characterSequence(let string):
currentElementIsEmpty = false
for c in string.unicodeScalars {
if blockStateMachine.continueBlock(char: c) {
if blockStateMachine.continueBlock(char: c),
!hasSkipOrReplaceElementAction {
currentRun.unicodeScalars.append(c)
}
}
@ -137,13 +151,10 @@ public class TextConverter<Callbacks: HTMLConversionCallbacks> {
}
private func finishRun() {
if actionStack.contains(.skip) {
currentRun = ""
return
} else if case .append(let s) = actionStack.last {
if case .append(let s) = actionStack.last {
currentRun.append(s)
} else if case .replace(let replacement) = actionStack.first(where: \.isReplace) {
currentRun = replacement
} else if case .replace(let replacement) = actionStack.last {
currentRun.append(replacement)
}
guard !currentRun.isEmpty else {

50
Tests/HTMLStreamerTests/AttributedStringConverterTests.swift
View File

@ -264,6 +264,12 @@ final class AttributedStringConverterTests: XCTestCase {
.paragraphStyle: NSParagraphStyle.default,
.foregroundColor: color,
]))
let replaceNested = convert("<span class='replace'><b>a</b></span>", callbacks: Callbacks.self)
XCTAssertEqual(replaceNested, NSAttributedString(string: "…", attributes: [
.font: font,
.paragraphStyle: NSParagraphStyle.default,
.foregroundColor: color,
]))
let appended = convert("<span class='append'>test</span>", callbacks: Callbacks.self)
XCTAssertEqual(appended, NSAttributedString(string: "test…", attributes: [
.font: font,
@ -612,4 +618,48 @@ final class AttributedStringConverterTests: XCTestCase {
XCTAssertEqual(convert("<ol><li><pre>a</pre></li></ol>"), result)
}
func testInvisibleAtBeginningOfParagraphDoesNotPreventParagraphBreak() {
struct Invisible: HTMLConversionCallbacks {
static func elementAction(name: String, attributes: [Attribute]) -> ElementAction {
if attributes.attributeValue(for: "class") == "invisible" {
.skip
} else {
.default
}
}
}
let result = NSAttributedString(string: "a\n\nc", attributes: [
.font: font,
.paragraphStyle: NSParagraphStyle.default,
.foregroundColor: color,
])
let html = """
<p>a</p><p><span class="invisible">b</span><span class="ellipsis">c</span></p>
"""
XCTAssertEqual(convert(html, callbacks: Invisible.self), result)
}
func testReplaceAtBeginningOfParagraphDoesNotPreventParagraphBreak() {
struct Replace: HTMLConversionCallbacks {
static func elementAction(name: String, attributes: [Attribute]) -> ElementAction {
if attributes.attributeValue(for: "class") == "replace" {
.replace("c")
} else {
.default
}
}
}
let result = NSAttributedString(string: "a\n\nc", attributes: [
.font: font,
.paragraphStyle: NSParagraphStyle.default,
.foregroundColor: color,
])
let html = """
<p>a</p><p><span class="replace">b</span></p>
"""
XCTAssertEqual(convert(html, callbacks: Replace.self), result)
}
}