aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-12-16 05:10:42 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-12-16 05:10:42 +0100
commit6f5dcd4eee10a291b89b70a68e1a955cd94d341f (patch)
tree106805de7f8a30b23a283dcf5fdbdb6a34561651
parent1bb2fc98e05b7cc556aa63aa226b5349e8a39159 (diff)
downloadyoutube-dl-6f5dcd4eee10a291b89b70a68e1a955cd94d341f.tar.xz
[pornhd] Simplify
-rw-r--r--youtube_dl/extractor/pornhd.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dl/extractor/pornhd.py
index c56740b8a..71abd5013 100644
--- a/youtube_dl/extractor/pornhd.py
+++ b/youtube_dl/extractor/pornhd.py
@@ -3,12 +3,13 @@ import re
from .common import InfoExtractor
from ..utils import compat_urllib_parse
+
class PornHdIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?pornhd\.com/videos/(?P<video_id>[0-9]+)/(?P<video_title>.+)'
_TEST = {
- u'id': u'1962',
u'url': u'http://www.pornhd.com/videos/1962/sierra-day-gets-his-cum-all-over-herself-hd-porn-video',
- u'md5': u'4fe06e5108e8b524c35896f4c54c7155',
+ u'file': u'1962.flv',
+ u'md5': u'35272469887dca97abd30abecc6cdf75',
u'info_dict': {
u"title": u"sierra-day-gets-his-cum-all-over-herself-hd-porn-video",
u"age_limit": 18,
@@ -20,23 +21,18 @@ class PornHdIE(InfoExtractor):
video_id = mobj.group('video_id')
video_title = mobj.group('video_title')
- video_extension = 'flv'
webpage = self._download_webpage(url, video_id)
-
- self.report_extraction(video_id)
-
video_url = self._html_search_regex(
r'&hd=(http.+?)&', webpage, u'video URL')
video_url = compat_urllib_parse.unquote(video_url)
-
age_limit = 18
return {
- 'id': video_id,
- 'url': video_url,
- 'ext': video_extension,
- 'title': video_title,
+ 'id': video_id,
+ 'url': video_url,
+ 'ext': 'flv',
+ 'title': video_title,
'age_limit': age_limit,
}