shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Fix crash when comments present in html

This commit is contained in:
Shadowfacts 2023-04-03 23:39:22 -04:00
parent e5363b2e21
commit 29b594207c
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tusker/HTMLConverter.swift
View File

@ -32,17 +32,20 @@ struct HTMLConverter {
let doc = try! SwiftSoup.parseBodyFragment(html) let doc = try! SwiftSoup.parseBodyFragment(html)
let body = doc.body()! let body = doc.body()!
let attributedText = attributedTextForHTMLNode(body) if let attributedText = attributedTextForHTMLNode(body) {
let mutAttrString = NSMutableAttributedString(attributedString: attributedText) let mutAttrString = NSMutableAttributedString(attributedString: attributedText)
mutAttrString.trimTrailingCharactersInSet(.whitespacesAndNewlines) mutAttrString.trimTrailingCharactersInSet(.whitespacesAndNewlines)
mutAttrString.collapseWhitespace() mutAttrString.collapseWhitespace()
mutAttrString.addAttribute(.paragraphStyle, value: paragraphStyle, range: mutAttrString.fullRange) mutAttrString.addAttribute(.paragraphStyle, value: paragraphStyle, range: mutAttrString.fullRange)
return mutAttrString return mutAttrString
} else {
return NSAttributedString()
}
} }
private func attributedTextForHTMLNode(_ node: Node, usePreformattedText: Bool = false) -> NSAttributedString { private func attributedTextForHTMLNode(_ node: Node, usePreformattedText: Bool = false) -> NSAttributedString? {
switch node { switch node {
case let node as TextNode: case let node as TextNode:
let text: String let text: String
@ -65,7 +68,9 @@ struct HTMLConverter {
} }
} }
attributed.append(attributedTextForHTMLNode(child, usePreformattedText: usePreformattedText || node.tagName() == "pre")) if let childText = attributedTextForHTMLNode(child, usePreformattedText: usePreformattedText || node.tagName() == "pre") {
attributed.append(childText)
}
if appendEllipsis { if appendEllipsis {
attributed.append(NSAttributedString("…")) attributed.append(NSAttributedString("…"))
@ -134,10 +139,8 @@ struct HTMLConverter {
} }
return attributed return attributed
case is DataNode:
return NSAttributedString()
default: default:
fatalError("Unexpected node type \(type(of: node))") return nil
} }
} }