diff options
| author | Filippo Valsorda <hi@filippo.io> | 2018-01-07 15:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 15:03:28 +0100 |
| commit | 97bc05116e15df3cf1b7b7216c60fad7ee0acc9f (patch) | |
| tree | 453059413184d22a44241d251a82196c5d2461eb /youtube_dl/extractor/pornhd.py | |
| parent | 7608a91ee7b40c74a35c30b44731606382702592 (diff) | |
| parent | 0a5b1295b7c1aa6395b65ee137087c540b37b32b (diff) | |
| download | youtube-dl-totalwebcasting.tar.gz youtube-dl-totalwebcasting.tar.xz youtube-dl-totalwebcasting.zip | |
Merge branch 'master' into totalwebcasting totalwebcasting
Diffstat (limited to 'youtube_dl/extractor/pornhd.py')
| -rw-r--r-- | youtube_dl/extractor/pornhd.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dl/extractor/pornhd.py index 842317e6c..b52879c7a 100644 --- a/youtube_dl/extractor/pornhd.py +++ b/youtube_dl/extractor/pornhd.py @@ -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, |