aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-10-24 15:13:17 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-10-24 15:13:33 +0800
commit5ace137bf4af2dda4ee17e72716d78783700b07d (patch)
tree901e7303e1bcb8fd379efcb41183db7ea89c8a59 /youtube_dl/extractor
parent9dde0e04e6d952977ecfd85ceac883106e7ac1ee (diff)
[dotsub] Support vimeo embed (closes #10964)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/dotsub.py46
1 files changed, 38 insertions, 8 deletions
diff --git a/youtube_dl/extractor/dotsub.py b/youtube_dl/extractor/dotsub.py
index fd64d1a7f..1f75352ca 100644
--- a/youtube_dl/extractor/dotsub.py
+++ b/youtube_dl/extractor/dotsub.py
@@ -9,7 +9,7 @@ from ..utils import (
class DotsubIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?dotsub\.com/view/(?P<id>[^/]+)'
- _TEST = {
+ _TESTS = [{
'url': 'https://dotsub.com/view/9c63db2a-fa95-4838-8e6e-13deafe47f09',
'md5': '21c7ff600f545358134fea762a6d42b6',
'info_dict': {
@@ -24,7 +24,24 @@ class DotsubIE(InfoExtractor):
'upload_date': '20131130',
'view_count': int,
}
- }
+ }, {
+ 'url': 'https://dotsub.com/view/747bcf58-bd59-45b7-8c8c-ac312d084ee6',
+ 'md5': '2bb4a83896434d5c26be868c609429a3',
+ 'info_dict': {
+ 'id': '168006778',
+ 'ext': 'mp4',
+ 'title': 'Apartments and flats in Raipur the white symphony',
+ 'description': 'md5:784d0639e6b7d1bc29530878508e38fe',
+ 'thumbnail': 're:^https?://dotsub.com/media/747bcf58-bd59-45b7-8c8c-ac312d084ee6/p',
+ 'duration': 290,
+ 'timestamp': 1476767794.2809999,
+ 'upload_date': '20160525',
+ 'uploader': 'parthivi001',
+ 'uploader_id': 'user52596202',
+ 'view_count': int,
+ },
+ 'add_ie': ['Vimeo'],
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
@@ -37,12 +54,23 @@ class DotsubIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(
[r'<source[^>]+src="([^"]+)"', r'"file"\s*:\s*\'([^\']+)'],
- webpage, 'video url')
+ webpage, 'video url', default=None)
+ info_dict = {
+ 'id': video_id,
+ 'url': video_url,
+ 'ext': 'flv',
+ }
- return {
- 'id': video_id,
- 'url': video_url,
- 'ext': 'flv',
+ if not video_url:
+ setup_data = self._parse_json(self._html_search_regex(
+ r'(?s)data-setup=([\'"])(?P<content>(?!\1).+?)\1',
+ webpage, 'setup data', group='content'), video_id)
+ info_dict = {
+ '_type': 'url_transparent',
+ 'url': setup_data['src'],
+ }
+
+ info_dict.update({
'title': info['title'],
'description': info.get('description'),
'thumbnail': info.get('screenshotURI'),
@@ -50,4 +78,6 @@ class DotsubIE(InfoExtractor):
'uploader': info.get('user'),
'timestamp': float_or_none(info.get('dateCreated'), 1000),
'view_count': int_or_none(info.get('numberOfViews')),
- }
+ })
+
+ return info_dict