projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d3ac74
)
[vimeo] Add support for subtitles (Closes #2239)
author
Sergey M.
<dstftw@gmail.com>
Mon, 3 Feb 2014 13:02:58 +0000
(20:02 +0700)
committer
Sergey M.
<dstftw@gmail.com>
Mon, 3 Feb 2014 13:02:58 +0000
(20:02 +0700)
youtube_dl/extractor/vimeo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vimeo.py
b/youtube_dl/extractor/vimeo.py
index a50170ce76923837717dec6df19a558734d46e4e..0f10c89179a47c80f40024b8264b3a660de6853e 100644
(file)
--- a/
youtube_dl/extractor/vimeo.py
+++ b/
youtube_dl/extractor/vimeo.py
@@
-6,6
+6,7
@@
import re
import itertools
from .common import InfoExtractor
import itertools
from .common import InfoExtractor
+from .subtitles import SubtitlesInfoExtractor
from ..utils import (
compat_urllib_parse,
compat_urllib_request,
from ..utils import (
compat_urllib_parse,
compat_urllib_request,
@@
-19,7
+20,7
@@
from ..utils import (
)
)
-class VimeoIE(InfoExtractor):
+class VimeoIE(
Subtitles
InfoExtractor):
"""Information extractor for vimeo.com."""
# _VALID_URL matches Vimeo URLs
"""Information extractor for vimeo.com."""
# _VALID_URL matches Vimeo URLs
@@
-84,6
+85,20
@@
class VimeoIE(InfoExtractor):
'videopassword': 'youtube-dl',
},
},
'videopassword': 'youtube-dl',
},
},
+ {
+ 'url': 'http://vimeo.com/76979871',
+ 'md5': '3363dd6ffebe3784d56f4132317fd446',
+ 'note': 'Video with subtitles',
+ 'info_dict': {
+ 'id': '76979871',
+ 'ext': 'mp4',
+ 'title': 'The New Vimeo Player (You Know, For Videos)',
+ 'description': 'md5:2ec900bf97c3f389378a96aee11260ea',
+ 'upload_date': '20131015',
+ 'uploader_id': 'staff',
+ 'uploader': 'Vimeo Staff',
+ }
+ },
]
def _login(self):
]
def _login(self):
@@
-273,6
+288,17
@@
class VimeoIE(InfoExtractor):
if len(formats) == 0:
raise ExtractorError('No known codec found')
if len(formats) == 0:
raise ExtractorError('No known codec found')
+ subtitles = {}
+ text_tracks = config['request'].get('text_tracks')
+ if text_tracks:
+ for tt in text_tracks:
+ subtitles[tt['lang']] = 'http://vimeo.com' + tt['url']
+
+ video_subtitles = self.extract_subtitles(video_id, subtitles)
+ if self._downloader.params.get('listsubtitles', False):
+ self._list_available_subtitles(video_id, subtitles)
+ return
+
return {
'id': video_id,
'uploader': video_uploader,
return {
'id': video_id,
'uploader': video_uploader,
@@
-286,6
+312,7
@@
class VimeoIE(InfoExtractor):
'view_count': view_count,
'like_count': like_count,
'comment_count': comment_count,
'view_count': view_count,
'like_count': like_count,
'comment_count': comment_count,
+ 'subtitles': video_subtitles,
}
}