]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[pornhd] Fix extraction (closes #14005)
authorSergey M․ <dstftw@gmail.com>
Sun, 27 Aug 2017 15:36:57 +0000 (22:36 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 27 Aug 2017 15:37:26 +0000 (22:37 +0700)
youtube_dl/extractor/pornhd.py

index 36761788dd9ca0c3f1a0a0e15493b2a812642357..b52879c7a444fef98b2354660025958a7c5ce180 100644 (file)
@@ -54,7 +54,7 @@ class PornHdIE(InfoExtractor):
              r'<title>(.+?) - .*?[Pp]ornHD.*?</title>'], webpage, 'title')
 
         sources = self._parse_json(js_to_json(self._search_regex(
-            r"(?s)sources'?\s*:\s*(\{.+?\})\s*\}[;,)]",
+            r"(?s)sources'?\s*[:=]\s*(\{.+?\})",
             webpage, 'sources', default='{}')), video_id)
 
         if not sources:
@@ -82,7 +82,8 @@ class PornHdIE(InfoExtractor):
         view_count = int_or_none(self._html_search_regex(
             r'(\d+) views\s*<', webpage, 'view count', fatal=False))
         thumbnail = self._search_regex(
-            r"'poster'\s*:\s*'([^']+)'", webpage, 'thumbnail', fatal=False)
+            r"poster'?\s*:\s*([\"'])(?P<url>(?:(?!\1).)+)\1", webpage,
+            'thumbnail', fatal=False, group='url')
 
         return {
             'id': video_id,