aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-03-02 23:39:20 +0700
committerSergey M․ <dstftw@gmail.com>2018-03-02 23:39:20 +0700
commit7773a92800900413af0846a3da580749483be346 (patch)
tree1d00ce7c5e42621694f10bf8b69bcd1a463a251f /youtube_dl
parentb871d7e954350ec8525540b9dd319541560bfef0 (diff)
[spankbang] Fix formats extraction (closes #15727)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/spankbang.py50
1 files changed, 35 insertions, 15 deletions
diff --git a/youtube_dl/extractor/spankbang.py b/youtube_dl/extractor/spankbang.py
index e6c2dcfc4..67500b69c 100644
--- a/youtube_dl/extractor/spankbang.py
+++ b/youtube_dl/extractor/spankbang.py
@@ -3,7 +3,12 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
-from ..utils import ExtractorError
+from ..utils import (
+ ExtractorError,
+ parse_duration,
+ parse_resolution,
+ str_to_int,
+)
class SpankBangIE(InfoExtractor):
@@ -15,7 +20,7 @@ class SpankBangIE(InfoExtractor):
'id': '3vvn',
'ext': 'mp4',
'title': 'fantasy solo',
- 'description': 'Watch fantasy solo free HD porn video - 05 minutes - Babe,Masturbation,Solo,Toy - dillion harper masturbates on a bed free adult movies sexy clips.',
+ 'description': 'dillion harper masturbates on a bed',
'thumbnail': r're:^https?://.*\.jpg$',
'uploader': 'silly2587',
'age_limit': 18,
@@ -32,36 +37,49 @@ class SpankBangIE(InfoExtractor):
# mobile page
'url': 'http://m.spankbang.com/1o2de/video/can+t+remember+her+name',
'only_matching': True,
+ }, {
+ # 4k
+ 'url': 'https://spankbang.com/1vwqx/video/jade+kush+solo+4k',
+ 'only_matching': True,
}]
def _real_extract(self, url):
video_id = self._match_id(url)
- webpage = self._download_webpage(url, video_id)
+ webpage = self._download_webpage(url, video_id, headers={
+ 'Cookie': 'country=US'
+ })
if re.search(r'<[^>]+\bid=["\']video_removed', webpage):
raise ExtractorError(
'Video %s is not available' % video_id, expected=True)
- stream_key = self._html_search_regex(
- r'''var\s+stream_key\s*=\s*['"](.+?)['"]''',
- webpage, 'stream key')
-
- formats = [{
- 'url': 'http://spankbang.com/_%s/%s/title/%sp__mp4' % (video_id, stream_key, height),
- 'ext': 'mp4',
- 'format_id': '%sp' % height,
- 'height': int(height),
- } for height in re.findall(r'<(?:span|li|p)[^>]+[qb]_(\d+)p', webpage)]
- self._check_formats(formats, video_id)
+ formats = []
+ for mobj in re.finditer(
+ r'stream_url_(?P<id>[^\s=]+)\s*=\s*(["\'])(?P<url>(?:(?!\2).)+)\2',
+ webpage):
+ format_id, format_url = mobj.group('id', 'url')
+ f = parse_resolution(format_id)
+ f.update({
+ 'url': format_url,
+ 'format_id': format_id,
+ })
+ formats.append(f)
self._sort_formats(formats)
title = self._html_search_regex(
r'(?s)<h1[^>]*>(.+?)</h1>', webpage, 'title')
- description = self._og_search_description(webpage)
+ description = self._search_regex(
+ r'<div[^>]+\bclass=["\']bottom[^>]+>\s*<p>[^<]*</p>\s*<p>([^<]+)',
+ webpage, 'description', fatal=False)
thumbnail = self._og_search_thumbnail(webpage)
uploader = self._search_regex(
r'class="user"[^>]*><img[^>]+>([^<]+)',
webpage, 'uploader', default=None)
+ duration = parse_duration(self._search_regex(
+ r'<div[^>]+\bclass=["\']right_side[^>]+>\s*<span>([^<]+)',
+ webpage, 'duration', fatal=False))
+ view_count = str_to_int(self._search_regex(
+ r'([\d,.]+)\s+plays', webpage, 'view count', fatal=False))
age_limit = self._rta_search(webpage)
@@ -71,6 +89,8 @@ class SpankBangIE(InfoExtractor):
'description': description,
'thumbnail': thumbnail,
'uploader': uploader,
+ 'duration': duration,
+ 'view_count': view_count,
'formats': formats,
'age_limit': age_limit,
}