MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-23 20:16:54 +01:00
Code Issues Releases Wiki Activity

[yourupload] Fix extraction (closes #11601)

Browse Source
This commit is contained in:
Sergey M․ 2017-01-15 10:34:39 +07:00
parent 6f0be93747
commit a7acf868a5
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
youtube_dl/extractor/yourupload.py
View File

@ -2,44 +2,37 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import urljoin
class YourUploadIE(InfoExtractor): class YourUploadIE(InfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)? _VALID_URL = r'https?://(?:www\.)?(?:yourupload\.com/(?:watch|embed)|embed\.yourupload\.com)/(?P<id>[A-Za-z0-9]+)'
(?:yourupload\.com/watch| _TESTS = [{
embed\.yourupload\.com| 'url': 'http://yourupload.com/watch/14i14h',
embed\.yucache\.net 'md5': '5e2c63385454c557f97c4c4131a393cd',
)/(?P<id>[A-Za-z0-9]+) 'info_dict': {
''' 'id': '14i14h',
_TESTS = [ 'ext': 'mp4',
{ 'title': 'BigBuckBunny_320x180.mp4',
'url': 'http://yourupload.com/watch/14i14h', 'thumbnail': r're:^https?://.*\.jpe?g',
'md5': '5e2c63385454c557f97c4c4131a393cd', }
'info_dict': { }, {
'id': '14i14h', 'url': 'http://www.yourupload.com/embed/14i14h',
'ext': 'mp4', 'only_matching': True,
'title': 'BigBuckBunny_320x180.mp4', }, {
'thumbnail': r're:^https?://.*\.jpe?g', 'url': 'http://embed.yourupload.com/14i14h',
} 'only_matching': True,
}, }]
{
'url': 'http://embed.yourupload.com/14i14h',
'only_matching': True,
},
{
'url': 'http://embed.yucache.net/14i14h?client_file_id=803349',
'only_matching': True,
},
]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
embed_url = 'http://embed.yucache.net/{0:}'.format(video_id) embed_url = 'http://www.yourupload.com/embed/%s' % video_id
webpage = self._download_webpage(embed_url, video_id) webpage = self._download_webpage(embed_url, video_id)
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
video_url = self._og_search_video_url(webpage) video_url = urljoin(embed_url, self._og_search_video_url(webpage))
thumbnail = self._og_search_thumbnail(webpage, default=None) thumbnail = self._og_search_thumbnail(webpage, default=None)
return { return {