From 802c2c87da0569be6339822cda4307b40cc2a164 Mon Sep 17 00:00:00 2001 From: Satoshi Takano Date: Thu, 5 Mar 2020 02:02:08 +0900 Subject: [PATCH] Accept some edge case --- OpenGraph/OpenGraphParser.swift | 6 +++--- Tests/ogp.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenGraph/OpenGraphParser.swift b/OpenGraph/OpenGraphParser.swift index 314f342..e8e31f8 100644 --- a/OpenGraph/OpenGraphParser.swift +++ b/OpenGraph/OpenGraphParser.swift @@ -20,11 +20,11 @@ extension OpenGraphParser { // prepare regular expressions to extract og property and content. let propertyRegexp = try! NSRegularExpression( - pattern: "\\sproperty=(?:\"|\')og:([a-zA_Z:]+?)(?:\"|\')", + pattern: "\\sproperty=(?:\"|\')*og:([a-zA_Z:]+)(?:\"|\')*", options: [] ) let contentRegexp = try! NSRegularExpression( - pattern: "\\scontent=\"(.*?)\"", + pattern: "\\scontent=\\\\*?\"(.*?)\\\\*?\"", options: [] ) @@ -43,7 +43,7 @@ extension OpenGraphParser { var contentMatches = contentRegexp.matches(in: metaTag, options: [], range: NSMakeRange(0, metaTag.count)) if contentMatches.first == nil { let contentRegexp = try! NSRegularExpression( - pattern: "\\scontent='(.*?)'", + pattern: "\\scontent=\\\\*?'(.*?)\\\\*?'", options: [] ) contentMatches = contentRegexp.matches(in: metaTag, options: [], range: NSMakeRange(0, metaTag.count)) diff --git a/Tests/ogp.html b/Tests/ogp.html index 8c6f210..b38e93e 100644 --- a/Tests/ogp.html +++ b/Tests/ogp.html @@ -1,8 +1,8 @@ - - + +