aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/hellporno.py32
1 files changed, 14 insertions, 18 deletions
diff --git a/youtube_dl/extractor/hellporno.py b/youtube_dl/extractor/hellporno.py
index 06f85127f..754322cdf 100644
--- a/youtube_dl/extractor/hellporno.py
+++ b/youtube_dl/extractor/hellporno.py
@@ -1,55 +1,51 @@
from __future__ import unicode_literals
-
-import re
-
from .common import InfoExtractor
+
class HellPornoIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?hellporno\.com/videos/(?P<display_id>[^/]+)'
+ _VALID_URL = r'https?://(?:www\.)?hellporno\.com/videos/(?P<id>[^/]+)'
_TEST = {
'url': 'http://hellporno.com/videos/dixie-is-posing-with-naked-ass-very-erotic/',
'md5': '1fee339c610d2049699ef2aa699439f1',
'info_dict': {
'id': '149116',
+ 'display_id': 'dixie-is-posing-with-naked-ass-very-erotic',
'ext': 'mp4',
'title': 'Dixie is posing with naked ass very erotic',
- 'description': 'md5:5ba02cbf31eff820147b3cc25306d89a',
- 'categories': list, # NSFW
'thumbnail': 're:https?://.*\.jpg$',
'age_limit': 18,
}
}
def _real_extract(self, url):
- webpage = self._download_webpage(url, 'main')
+ display_id = self._match_id(url)
+ webpage = self._download_webpage(url, display_id)
- video_id = self._html_search_regex(r'video_id:\s*\'([^\']+)\'', webpage, 'id')
+ video_id = self._html_search_regex(
+ r'video_id:\s*\'([^\']+)\'', webpage, 'id')
- video_url = self._html_search_regex(r'video_url:\s*\'([^\']+)\'', webpage, 'video_url')
+ ext = self._html_search_regex(
+ r'postfix:\s*\'([^\']+)\'', webpage, 'ext')[1:]
- ext = self._html_search_regex(r'postfix:\s*\'([^\']+)\'', webpage, 'ext')[1:]
+ video_url = self._html_search_regex(
+ r'video_url:\s*\'([^\']+)\'', webpage, 'video_url')
title = self._html_search_regex(
r'<title>([^<]+)\s*-\s*Hell Porno</title>', webpage, 'title')
- description = self._html_search_meta('description', webpage, 'description', fatal=False)
-
thumbnail = self._html_search_regex(
r'preview_url:\s*\'([^\']+)\'',
webpage, 'thumbnail', fatal=False)
- categories_str = self._html_search_regex(
- r'<meta name="keywords" content="([^"]+)"', webpage, 'categories', fatal=False)
- categories = (
- None if categories_str is None
- else categories_str.split(','))
+ categories = self._html_search_meta(
+ 'keywords', webpage, 'categories', default='').split(',')
return {
'id': video_id,
+ 'display_id': display_id,
'url': video_url,
'title': title,
'ext': ext,
- 'description': description,
'thumbnail': thumbnail,
'categories': categories,
'age_limit': 18,