projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youku] compare bytes and str for compatible; use compat_urllib_parse for making...
[youtube-dl]
/
youtube_dl
/
extractor
/
yourupload.py
diff --git
a/youtube_dl/extractor/yourupload.py
b/youtube_dl/extractor/yourupload.py
index 40fc4165f402722eca38cbfbc7c06cf2e4409a64..4e25d6f22312a0dca9f1997baa3bacd1c3fd263d 100644
(file)
--- a/
youtube_dl/extractor/yourupload.py
+++ b/
youtube_dl/extractor/yourupload.py
@@
-1,8
+1,6
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from .common import InfoExtractor
@@
-16,7
+14,7
@@
class YourUploadIE(InfoExtractor):
_TESTS = [
{
'url': 'http://yourupload.com/watch/14i14h',
_TESTS = [
{
'url': 'http://yourupload.com/watch/14i14h',
- 'md5': '
bf5c2f95c4c917536e80936af7bc51e1
',
+ 'md5': '
5e2c63385454c557f97c4c4131a393cd
',
'info_dict': {
'id': '14i14h',
'ext': 'mp4',
'info_dict': {
'id': '14i14h',
'ext': 'mp4',
@@
-35,24
+33,21
@@
class YourUploadIE(InfoExtractor):
]
def _real_extract(self, url):
]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
+ video_id = self._match_id(url)
- url = 'http://embed.yucache.net/{0:}'.format(video_id)
- webpage = self._download_webpage(url, video_id)
+
embed_
url = 'http://embed.yucache.net/{0:}'.format(video_id)
+ webpage = self._download_webpage(
embed_
url, video_id)
title = self._og_search_title(webpage)
title = self._og_search_title(webpage)
- thumbnail = self._og_search_thumbnail(webpage)
- url = self._og_search_video_url(webpage)
-
- formats = [{
- 'format_id': 'sd',
- 'url': url,
- }]
+ video_url = self._og_search_video_url(webpage)
+ thumbnail = self._og_search_thumbnail(webpage, default=None)
return {
'id': video_id,
'title': title,
return {
'id': video_id,
'title': title,
- '
formats': formats
,
+ '
url': video_url
,
'thumbnail': thumbnail,
'thumbnail': thumbnail,
+ 'http_headers': {
+ 'Referer': embed_url,
+ },
}
}