summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNaglis Jonaitis <[email protected]>2014-09-25 17:57:38 +0300
committerNaglis Jonaitis <[email protected]>2014-09-25 17:57:38 +0300
commit11b3ce85097430e1d26ddff0f51aa895c9d5af43 (patch)
treeb13e3f071426354fd0e23f946f3f3882d8037a38
parent9a0d98bb401a809eaed68623a8534b3874d079e8 (diff)
downloadyoutube-dl-11b3ce85097430e1d26ddff0f51aa895c9d5af43.tar.gz
youtube-dl-11b3ce85097430e1d26ddff0f51aa895c9d5af43.zip
[crunchyroll] Allow to list subtitles (fixes #3805)
-rw-r--r--youtube_dl/extractor/crunchyroll.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py
index 4903764f7..f99888ecc 100644
--- a/youtube_dl/extractor/crunchyroll.py
+++ b/youtube_dl/extractor/crunchyroll.py
@@ -9,7 +9,7 @@ import xml.etree.ElementTree
from hashlib import sha1
from math import pow, sqrt, floor
-from .common import InfoExtractor
+from .subtitles import SubtitlesInfoExtractor
from ..utils import (
ExtractorError,
compat_urllib_parse,
@@ -26,7 +26,7 @@ from ..aes import (
)
-class CrunchyrollIE(InfoExtractor):
+class CrunchyrollIE(SubtitlesInfoExtractor):
_VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.com/(?:[^/]*/[^/?&]*?|media/\?id=)(?P<video_id>[0-9]+))(?:[/?&]|$)'
_TEST = {
'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513',
@@ -271,6 +271,10 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
else:
subtitles[lang_code] = self._convert_subtitles_to_srt(subtitle)
+ if self._downloader.params.get('listsubtitles', False):
+ self._list_available_subtitles(video_id, subtitles)
+ return
+
return {
'id': video_id,
'title': video_title,