projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d8ba30
)
[yourupload] Simplify
author
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 28 Apr 2015 20:05:14 +0000
(
04:05
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 28 Apr 2015 20:05:14 +0000
(
04:05
+0800)
youtube_dl/extractor/yourupload.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/yourupload.py
b/youtube_dl/extractor/yourupload.py
index 2064f4a693481b7fc40ad32c565f36ebc16fa825..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
@@
-35,25
+33,19
@@
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)
embed_url = 'http://embed.yucache.net/{0:}'.format(video_id)
webpage = self._download_webpage(embed_url, video_id)
title = self._og_search_title(webpage)
embed_url = 'http://embed.yucache.net/{0:}'.format(video_id)
webpage = self._download_webpage(embed_url, video_id)
title = self._og_search_title(webpage)
- thumbnail = self._og_search_thumbnail(webpage)
video_url = self._og_search_video_url(webpage)
video_url = self._og_search_video_url(webpage)
-
- formats = [{
- 'format_id': 'sd',
- 'url': video_url,
- }]
+ 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,
'http_headers': {
'Referer': embed_url,
'thumbnail': thumbnail,
'http_headers': {
'Referer': embed_url,