mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-11-27 21:46:54 +01:00
[beeg] Fix extraction (Closes #7155)
This commit is contained in:
parent
ee2edd838a
commit
5946cda7c6
@ -1,65 +1,67 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from ..utils import (
|
||||||
|
int_or_none,
|
||||||
|
parse_iso8601,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class BeegIE(InfoExtractor):
|
class BeegIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?beeg\.com/(?P<id>\d+)'
|
_VALID_URL = r'https?://(?:www\.)?beeg\.com/(?P<id>\d+)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://beeg.com/5416503',
|
'url': 'http://beeg.com/5416503',
|
||||||
'md5': '1bff67111adb785c51d1b42959ec10e5',
|
'md5': '46c384def73b33dbc581262e5ee67cef',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '5416503',
|
'id': '5416503',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Sultry Striptease',
|
'title': 'Sultry Striptease',
|
||||||
'description': 'md5:6db3c6177972822aaba18652ff59c773',
|
'description': 'md5:d22219c09da287c14bed3d6c37ce4bc2',
|
||||||
'categories': list, # NSFW
|
'timestamp': 1391813355,
|
||||||
'thumbnail': 're:https?://.*\.jpg$',
|
'upload_date': '20140207',
|
||||||
|
'duration': 383,
|
||||||
|
'tags': list,
|
||||||
'age_limit': 18,
|
'age_limit': 18,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
video_id = self._match_id(url)
|
||||||
video_id = mobj.group('id')
|
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
video = self._download_json(
|
||||||
|
'http://beeg.com/api/v1/video/%s' % video_id, video_id)
|
||||||
quality_arr = self._search_regex(
|
|
||||||
r'(?s)var\s+qualityArr\s*=\s*{\s*(.+?)\s*}', webpage, 'quality formats')
|
|
||||||
|
|
||||||
formats = [{
|
|
||||||
'url': fmt[1],
|
|
||||||
'format_id': fmt[0],
|
|
||||||
'height': int(fmt[0][:-1]),
|
|
||||||
} for fmt in re.findall(r"'([^']+)'\s*:\s*'([^']+)'", quality_arr)]
|
|
||||||
|
|
||||||
|
formats = []
|
||||||
|
for format_id, video_url in video.items():
|
||||||
|
height = self._search_regex(
|
||||||
|
r'^(\d+)[pP]$', format_id, 'height', default=None)
|
||||||
|
if not height:
|
||||||
|
continue
|
||||||
|
formats.append({
|
||||||
|
'url': self._proto_relative_url(video_url.replace('{DATA_MARKERS}', ''), 'http:'),
|
||||||
|
'format_id': format_id,
|
||||||
|
'height': int(height),
|
||||||
|
})
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = video['title']
|
||||||
r'<title>([^<]+)\s*-\s*beeg\.?</title>', webpage, 'title')
|
video_id = video.get('id') or video_id
|
||||||
|
display_id = video.get('code')
|
||||||
|
description = video.get('desc')
|
||||||
|
|
||||||
description = self._html_search_regex(
|
timestamp = parse_iso8601(video.get('date'), ' ')
|
||||||
r'<meta name="description" content="([^"]*)"',
|
duration = int_or_none(video.get('duration'))
|
||||||
webpage, 'description', fatal=False)
|
|
||||||
thumbnail = self._html_search_regex(
|
|
||||||
r'\'previewer.url\'\s*:\s*"([^"]*)"',
|
|
||||||
webpage, 'thumbnail', fatal=False)
|
|
||||||
|
|
||||||
categories_str = self._html_search_regex(
|
tags = [tag.strip() for tag in video['tags'].split(',')] if video.get('tags') else None
|
||||||
r'<meta name="keywords" content="([^"]+)"', webpage, 'categories', fatal=False)
|
|
||||||
categories = (
|
|
||||||
None if categories_str is None
|
|
||||||
else categories_str.split(','))
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
'display_id': display_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': description,
|
'description': description,
|
||||||
'thumbnail': thumbnail,
|
'timestamp': timestamp,
|
||||||
'categories': categories,
|
'duration': duration,
|
||||||
|
'tags': tags,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'age_limit': 18,
|
'age_limit': 18,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user