projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4479600
)
[twitter:card] Support vine.co embeds (closes #7496)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 14 Nov 2015 09:02:07 +0000
(17:02 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 14 Nov 2015 09:02:07 +0000
(17:02 +0800)
youtube_dl/extractor/twitter.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twitter.py
b/youtube_dl/extractor/twitter.py
index 2bd5946aca5d424643b4993ead1842544edaf84d..afbe8a651c22e6607b8c5e33e45248c8f4ce94b4 100644
(file)
--- a/
youtube_dl/extractor/twitter.py
+++ b/
youtube_dl/extractor/twitter.py
@@
-52,6
+52,19
@@
class TwitterCardIE(InfoExtractor):
'uploader': 'OMG! Ubuntu!',
'uploader_id': 'omgubuntu',
},
'uploader': 'OMG! Ubuntu!',
'uploader_id': 'omgubuntu',
},
+ },
+ {
+ 'url': 'https://twitter.com/i/cards/tfw/v1/665289828897005568',
+ 'md5': 'ab2745d0b0ce53319a534fccaa986439',
+ 'info_dict': {
+ 'id': 'iBb2x00UVlv',
+ 'ext': 'mp4',
+ 'upload_date': '20151113',
+ 'uploader_id': '1189339351084113920',
+ 'uploader': '@ArsenalTerje',
+ 'title': 'Vine by @ArsenalTerje',
+ },
+ 'add_ie': ['Vine'],
}
]
}
]
@@
-71,11
+84,11
@@
class TwitterCardIE(InfoExtractor):
request.add_header('User-Agent', user_agent)
webpage = self._download_webpage(request, video_id)
request.add_header('User-Agent', user_agent)
webpage = self._download_webpage(request, video_id)
-
youtub
e_url = self._html_search_regex(
- r'<iframe[^>]+src="((?:https?:)?//
www.youtube.com/embed/[^"]+
)"',
- webpage, '
youtube
iframe', default=None)
- if
youtub
e_url:
- return self.url_result(
youtube_url, 'Youtube'
)
+
ifram
e_url = self._html_search_regex(
+ r'<iframe[^>]+src="((?:https?:)?//
(?:www.youtube.com/embed/[^"]+|(?:www\.)?vine\.co/v/\w+/card)
)"',
+ webpage, '
video
iframe', default=None)
+ if
ifram
e_url:
+ return self.url_result(
iframe_url
)
config = self._parse_json(self._html_search_regex(
r'data-player-config="([^"]+)"', webpage, 'data player config'),
config = self._parse_json(self._html_search_regex(
r'data-player-config="([^"]+)"', webpage, 'data player config'),