X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fpornhd.py;h=57c78ba52a994a9c2aff224470b86b913702241f;hb=3047121c639428235191ff5f7afbda7ecda38779;hp=954dfccb75954d50a9a46bc14bdb1d0dcbd5588c;hpb=ff21a8e0ee43d4ce0b75cd938f9bdfab664dd579;p=youtube-dl
diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dl/extractor/pornhd.py
index 954dfccb7..57c78ba52 100644
--- a/youtube_dl/extractor/pornhd.py
+++ b/youtube_dl/extractor/pornhd.py
@@ -36,7 +36,8 @@ class PornHdIE(InfoExtractor):
webpage = self._download_webpage(url, display_id or video_id)
title = self._html_search_regex(
- r'
(.+) porn HD.+?', webpage, 'title')
+ [r']+class=["\']video-name["\'][^>]*>([^<]+)',
+ r'(.+?) - .*?[Pp]ornHD.*?'], webpage, 'title')
description = self._html_search_regex(
r'([^<]+)
', webpage, 'description', fatal=False)
view_count = int_or_none(self._html_search_regex(
@@ -46,16 +47,17 @@ class PornHdIE(InfoExtractor):
quality = qualities(['sd', 'hd'])
sources = json.loads(js_to_json(self._search_regex(
- r"(?s)'sources'\s*:\s*(\{.+?\})\s*\}\);", webpage, 'sources')))
+ r"(?s)'sources'\s*:\s*(\{.+?\})\s*\}[;,)]",
+ webpage, 'sources')))
formats = []
- for container, s in sources.items():
- for qname, video_url in s.items():
- formats.append({
- 'url': video_url,
- 'container': container,
- 'format_id': '%s-%s' % (container, qname),
- 'quality': quality(qname),
- })
+ for qname, video_url in sources.items():
+ if not video_url:
+ continue
+ formats.append({
+ 'url': video_url,
+ 'format_id': qname,
+ 'quality': quality(qname),
+ })
self._sort_formats(formats)
return {