mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-24 17:25:52 +01:00
Merge branch 'master' of github.com:rg3/youtube-dl
This commit is contained in:
commit
826e911e41
@ -2596,9 +2596,12 @@ except ImportError: # Python < 3.3
|
|||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
assert shlex.split('中文') == ['中文']
|
args = shlex.split('中文')
|
||||||
|
assert (isinstance(args, list) and
|
||||||
|
isinstance(args[0], compat_str) and
|
||||||
|
args[0] == '中文')
|
||||||
compat_shlex_split = shlex.split
|
compat_shlex_split = shlex.split
|
||||||
except (AssertionError, UnicodeWarning, UnicodeEncodeError):
|
except (AssertionError, UnicodeEncodeError):
|
||||||
# Working around shlex issue with unicode strings on some python 2
|
# Working around shlex issue with unicode strings on some python 2
|
||||||
# versions (see http://bugs.python.org/issue1548891)
|
# versions (see http://bugs.python.org/issue1548891)
|
||||||
def compat_shlex_split(s, comments=False, posix=True):
|
def compat_shlex_split(s, comments=False, posix=True):
|
||||||
|
@ -1,25 +1,62 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from ..utils import (
|
||||||
|
int_or_none,
|
||||||
|
determine_ext,
|
||||||
|
mimetype2ext,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TweakersIE(InfoExtractor):
|
class TweakersIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://tweakers\.net/video/(?P<id>\d+)'
|
_VALID_URL = r'https?://tweakers\.net/video/(?P<id>\d+)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'https://tweakers.net/video/9926/new-nintendo-3ds-xl-op-alle-fronten-beter.html',
|
'url': 'https://tweakers.net/video/9926/new-nintendo-3ds-xl-op-alle-fronten-beter.html',
|
||||||
'md5': '3147e4ddad366f97476a93863e4557c8',
|
'md5': 'fe73e417c093a788e0160c4025f88b15',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '9926',
|
'id': '9926',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'New Nintendo 3DS XL - Op alle fronten beter',
|
'title': 'New Nintendo 3DS XL - Op alle fronten beter',
|
||||||
'description': 'md5:f97324cc71e86e11c853f0763820e3ba',
|
'description': 'md5:3789b21fed9c0219e9bcaacd43fab280',
|
||||||
'thumbnail': 're:^https?://.*\.jpe?g$',
|
'thumbnail': 're:^https?://.*\.jpe?g$',
|
||||||
'duration': 386,
|
'duration': 386,
|
||||||
|
'uploader_id': 's7JeEm',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
playlist_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
entries = self._extract_xspf_playlist(
|
video_data = self._download_json(
|
||||||
'https://tweakers.net/video/s1playlist/%s/playlist.xspf' % playlist_id, playlist_id)
|
'https://tweakers.net/video/s1playlist/%s/1920/1080/playlist.json' % video_id,
|
||||||
return self.playlist_result(entries, playlist_id)
|
video_id)['items'][0]
|
||||||
|
|
||||||
|
title = video_data['title']
|
||||||
|
|
||||||
|
formats = []
|
||||||
|
for location in video_data.get('locations', {}).get('progressive', []):
|
||||||
|
format_id = location.get('label')
|
||||||
|
width = int_or_none(location.get('width'))
|
||||||
|
height = int_or_none(location.get('height'))
|
||||||
|
for source in location.get('sources', []):
|
||||||
|
source_url = source.get('src')
|
||||||
|
if not source_url:
|
||||||
|
continue
|
||||||
|
ext = mimetype2ext(source.get('type')) or determine_ext(source_url)
|
||||||
|
formats.append({
|
||||||
|
'format_id': format_id,
|
||||||
|
'url': source_url,
|
||||||
|
'width': width,
|
||||||
|
'height': height,
|
||||||
|
'ext': ext,
|
||||||
|
})
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'id': video_id,
|
||||||
|
'title': title,
|
||||||
|
'description': video_data.get('description'),
|
||||||
|
'thumbnail': video_data.get('poster'),
|
||||||
|
'duration': int_or_none(video_data.get('duration')),
|
||||||
|
'uploader_id': video_data.get('account'),
|
||||||
|
'formats': formats,
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user