diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-02-21 22:31:53 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-02-22 00:27:49 +0100 |
| commit | 4d1718481755dde078678b6e55d457fc6351fcdd (patch) | |
| tree | fb48730bb2415e3b81d4ef6278f20a6a5d90cf51 | |
| parent | fb7cb6823e5ace9437bc79f2e1928a30f317856b (diff) | |
[YoutubeDL] don't set the 'requested_subtitles' without writesubtitles or writeautomaticsub
| -rw-r--r-- | test/test_subtitles.py | 10 | ||||
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/test/test_subtitles.py b/test/test_subtitles.py index c04fe6f22..457f268fa 100644 --- a/test/test_subtitles.py +++ b/test/test_subtitles.py @@ -113,7 +113,7 @@ class TestYoutubeSubtitles(BaseTestSubtitles): self.DL.params['writesubtitles'] = True self.DL.params['allsubtitles'] = True subtitles = self.getSubtitles() - self.assertEqual(len(subtitles), 0) + self.assertFalse(subtitles) def test_youtube_multiple_langs(self): self.url = 'QRS8MkLhQmM' @@ -152,7 +152,7 @@ class TestDailymotionSubtitles(BaseTestSubtitles): self.DL.params['writesubtitles'] = True self.DL.params['allsubtitles'] = True subtitles = self.getSubtitles() - self.assertEqual(len(subtitles), 0) + self.assertFalse(subtitles) def test_multiple_langs(self): self.DL.params['writesubtitles'] = True @@ -246,7 +246,7 @@ class TestVimeoSubtitles(BaseTestSubtitles): self.DL.params['writesubtitles'] = True self.DL.params['allsubtitles'] = True subtitles = self.getSubtitles() - self.assertEqual(len(subtitles), 0) + self.assertFalse(subtitles) def test_multiple_langs(self): self.DL.params['writesubtitles'] = True @@ -281,7 +281,7 @@ class TestWallaSubtitles(BaseTestSubtitles): self.DL.params['writesubtitles'] = True self.DL.params['allsubtitles'] = True subtitles = self.getSubtitles() - self.assertEqual(len(subtitles), 0) + self.assertFalse(subtitles) class TestCeskaTelevizeSubtitles(BaseTestSubtitles): @@ -308,7 +308,7 @@ class TestCeskaTelevizeSubtitles(BaseTestSubtitles): self.DL.params['writesubtitles'] = True self.DL.params['allsubtitles'] = True subtitles = self.getSubtitles() - self.assertEqual(len(subtitles), 0) + self.assertFalse(subtitles) class TestLyndaSubtitles(BaseTestSubtitles): diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index f8b8fb0c1..088b111eb 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1164,8 +1164,10 @@ class YoutubeDL(object): if lang not in available_subs: available_subs[lang] = cap_info - if not available_subs: - return available_subs + if (not self.params.get('writesubtitles') and not + self.params.get('writeautomaticsub') or not + available_subs): + return None if self.params.get('allsubtitles', False): requested_langs = available_subs.keys() |