Decode href percent encoding in OPF and encryption.xml (readium/r2-lc…

…p-swift/#57)
readium · Oct 28, 2019 · f1471e4 · f1471e4
1 parent 8c5f55b
commit f1471e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/r2-streamer-swift/Parser/EPUB/EPUBEncryptionParser.swift b/r2-streamer-swift/Parser/EPUB/EPUBEncryptionParser.swift
@@ -56,7 +56,7 @@ final class EPUBEncryptionParser: Loggable {
         // Loop through <EncryptedData> elements..
         for encryptedDataElement in document.xpath("./enc:EncryptedData") {
             guard let algorithm = encryptedDataElement.firstChild(xpath: "enc:EncryptionMethod")?.attr("Algorithm"),
-                var resourceURI = encryptedDataElement.firstChild(xpath:"enc:CipherData/enc:CipherReference")?.attr("URI") else
+                var resourceURI = encryptedDataElement.firstChild(xpath:"enc:CipherData/enc:CipherReference")?.attr("URI")?.removingPercentEncoding else
             {
                 continue
             }

diff --git a/r2-streamer-swift/Parser/EPUB/OPFParser.swift b/r2-streamer-swift/Parser/EPUB/OPFParser.swift
@@ -183,7 +183,7 @@ final class OPFParser: Loggable {
     /// - Parameter item: The XML element, or manifest XML item.
     /// - Returns: The `Link` representing the manifest XML item.
     private func makeLink(from manifestItem: XMLElement) -> Link? {
-        guard let href = manifestItem.attr("href") else {
+        guard let href = manifestItem.attr("href")?.removingPercentEncoding else {
             return nil
         }