support multiple encoding

satoshi-takano · Jul 7, 2022 · cea13a7 · cea13a7
1 parent 382972f
commit cea13a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/Sources/OpenGraph/Extension/String.swift b/Sources/OpenGraph/Extension/String.swift
@@ -9,11 +9,21 @@
 import Foundation
 
 extension String {
-    init?(data: Data, `default`: String.Encoding = .utf8) {
-        var encoding = `default`
-        if #available(macOS 10.10, *) {
-            encoding = data.stringEncoding ?? `default`
-        }
+    init?(data: Data, textEncodingName: String? = nil, `default`: String.Encoding = .utf8) {
+        let encoding: String.Encoding = {
+            if let textEncodingName = textEncodingName {
+                let cfe = CFStringConvertIANACharSetNameToEncoding(textEncodingName as CFString)
+                if cfe != kCFStringEncodingInvalidId {
+                    let se = CFStringConvertEncodingToNSStringEncoding(cfe)
+                    return String.Encoding(rawValue: se)
+                }
+            }
+            if #available(macOS 10.10, *) {
+                return data.stringEncoding ?? `default`
+            }
+            return `default`
+        }()
+
         self.init(data: data, encoding: encoding)
     }
 }
diff --git a/Sources/OpenGraph/OpenGraph.swift b/Sources/OpenGraph/OpenGraph.swift
@@ -53,7 +53,7 @@ public struct OpenGraph {
         if !(200..<300).contains(response.statusCode) {
             completion(.failure(OpenGraphResponseError.unexpectedStatusCode(response.statusCode)))
         } else {
-            guard let htmlString = String(data: data) else {
+            guard let htmlString = String(data: data, textEncodingName: response.textEncodingName) else {
                 completion(.failure(OpenGraphParseError.encodingError))
                 return
             }