Parse HTML on main thread (#84)

* Parse HTML on main thread * PR Comment
tophat · Jan 9, 2019 · 5624cd7 · 5624cd7
1 parent 888dae1
commit 5624cd7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/Source/Text Parsing/RichTextParser.swift b/Source/Text Parsing/RichTextParser.swift
@@ -85,13 +85,28 @@ class RichTextParser {
             }
             return (latex, nil)
         }
+        if Thread.isMainThread {
+            return self.getAttributedTextFromDown(with: input)
+        }
+
+        var output = NSAttributedString(string: "")
+        var parsingError: ParsingError?
+
+        DispatchQueue.main.sync {
+            (output, parsingError) = self.getAttributedTextFromDown(with: input)
+        }
+
+        return (output, parsingError)
+    }
+
+    private func getAttributedTextFromDown(with input: String) -> (output: NSAttributedString, error: ParsingError?) {
         guard let attributedInput = try? Down(markdownString: self.stripCodeTagsIfNecessary(from: input)).toAttributedString() else {
             return (NSAttributedString(string: input), ParsingError.attributedTextGeneration(text: input))
         }
-        var mutableAttributedInput = NSMutableAttributedString(attributedString: attributedInput)
+
+        let mutableAttributedInput = NSMutableAttributedString(attributedString: attributedInput)
         mutableAttributedInput.replaceFont(with: self.font)
-        mutableAttributedInput = mutableAttributedInput.trimmingTrailingNewlinesAndWhitespaces()
-        return (mutableAttributedInput, nil)
+        return (mutableAttributedInput.trimmingTrailingNewlinesAndWhitespaces(), nil)
     }
 
     func seperateComponents(from input: String) -> [String] {

diff --git a/UnitTests/Text Parsing/RichTextParserSpec.swift b/UnitTests/Text Parsing/RichTextParserSpec.swift
@@ -64,6 +64,20 @@ class RichTextParserSpec: QuickSpec {
                     expect(attributedStrings.count).to(equal(1))
                     expect(attributedStrings[0].string).to(equal("\nMessage"))
                 }
+                it("generates an attributed string array with the correct components for html on a non-main thread") {
+                    waitUntil { done in
+                        DispatchQueue.global().async {
+                            let components = self.richTextParser.seperateComponents(from: MarkDownText.complexHTML)
+                            let results = self.richTextParser.generateAttributedStringArray(from: components)
+                            let attributedStrings = results.output
+
+                            expect(attributedStrings.count).to(equal(1))
+                            expect(attributedStrings[0].string).to(equal("\nMessage"))
+                            done()
+                        }
+                    }
+
+                }
             }
             context("Rich text to attributed string") {
                 it("generates a single attributed string with multiple rich text types") {