Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-15 21:57:53 +01:00
Code Issues Projects Releases Wiki Activity

[xfileshare] Improve extraction and extract hls formats

Browse Source
This commit is contained in:
Sergey M․ 2017-04-01 18:55:48 +07:00
parent ca77b92f94
commit 2cd668ee59
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
youtube_dl/extractor/xfileshare.py
View File

@ -6,6 +6,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
decode_packed_codes, decode_packed_codes,
determine_ext,
ExtractorError, ExtractorError,
int_or_none, int_or_none,
NO_DEFAULT, NO_DEFAULT,
@ -95,6 +96,16 @@ class XFileShareIE(InfoExtractor):
# removed by administrator # removed by administrator
'url': 'http://xvidstage.com/amfy7atlkx25', 'url': 'http://xvidstage.com/amfy7atlkx25',
'only_matching': True, 'only_matching': True,
}, {
'url': 'http://vidabc.com/i8ybqscrphfv',
'info_dict': {
'id': 'i8ybqscrphfv',
'ext': 'mp4',
'title': 're:Beauty and the Beast 2017',
},
'params': {
'skip_download': True,
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -133,31 +144,45 @@ class XFileShareIE(InfoExtractor):
webpage, 'title', default=None) or self._og_search_title( webpage, 'title', default=None) or self._og_search_title(
webpage, default=None) or video_id).strip() webpage, default=None) or video_id).strip()
def extract_video_url(default=NO_DEFAULT): def extract_formats(default=NO_DEFAULT):
return self._search_regex( urls = []
(r'file\s*:\s*(["\'])(?P<url>http.+?)\1,', for regex in (
r'file_link\s*=\s*(["\'])(?P<url>http.+?)\1', r'file\s*:\s*(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1',
r'addVariable\((\\?["\'])file\1\s*,\s*(\\?["\'])(?P<url>http.+?)\2\)', r'file_link\s*=\s*(["\'])(?P<url>http(?:(?!\1).)+)\1',
r'<embed[^>]+src=(["\'])(?P<url>http.+?)\1'), r'addVariable\((\\?["\'])file\1\s*,\s*(\\?["\'])(?P<url>http(?:(?!\2).)+)\2\)',
webpage, 'file url', default=default, group='url') r'<embed[^>]+src=(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1'):
for mobj in re.finditer(regex, webpage):
video_url = mobj.group('url')
if video_url not in urls:
urls.append(video_url)
formats = []
for video_url in urls:
if determine_ext(video_url) == 'm3u8':
formats.extend(self._extract_m3u8_formats(
video_url, video_id, 'mp4',
entry_protocol='m3u8_native', m3u8_id='hls',
fatal=False))
else:
formats.append({
'url': video_url,
'format_id': 'sd',
})
if not formats and default is not NO_DEFAULT:
return default
self._sort_formats(formats)
return formats
video_url = extract_video_url(default=None) formats = extract_formats(default=None)
if not video_url: if not formats:
webpage = decode_packed_codes(self._search_regex( webpage = decode_packed_codes(self._search_regex(
r"(}\('(.+)',(\d+),(\d+),'[^']*\b(?:file|embed)\b[^']*'\.split\('\|'\))", r"(}\('(.+)',(\d+),(\d+),'[^']*\b(?:file|embed)\b[^']*'\.split\('\|'\))",
webpage, 'packed code')) webpage, 'packed code'))
video_url = extract_video_url() formats = extract_formats()
thumbnail = self._search_regex( thumbnail = self._search_regex(
r'image\s*:\s*["\'](http[^"\']+)["\'],', webpage, 'thumbnail', default=None) r'image\s*:\s*["\'](http[^"\']+)["\'],', webpage, 'thumbnail', default=None)
formats = [{
'format_id': 'sd',
'url': video_url,
'quality': 1,
}]
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,