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:
505c28a
)
[subtitles] removed only-sub option (--skip-download achieves the same
author
Ismael Mejia
<iemejia@gmail.com>
Thu, 8 Aug 2013 08:06:24 +0000
(10:06 +0200)
committer
Ismael Mejia
<iemejia@gmail.com>
Thu, 8 Aug 2013 08:06:24 +0000
(10:06 +0200)
functionality)
test/parameters.json
patch
|
blob
|
history
test/test_dailymotion_subtitles.py
patch
|
blob
|
history
test/test_youtube_subtitles.py
patch
|
blob
|
history
youtube_dl/__init__.py
patch
|
blob
|
history
diff --git
a/test/parameters.json
b/test/parameters.json
index 96998b5c39972bb43faddbb5711d07c9ce31574e..f042880edbf0bcab661900b86809ade8ec7697af 100644
(file)
--- a/
test/parameters.json
+++ b/
test/parameters.json
@@
-38,7
+38,6
@@
"writedescription": false,
"writeinfojson": true,
"writesubtitles": false,
"writedescription": false,
"writeinfojson": true,
"writesubtitles": false,
- "onlysubtitles": false,
"allsubtitles": false,
"listssubtitles": false
}
"allsubtitles": false,
"listssubtitles": false
}
diff --git
a/test/test_dailymotion_subtitles.py
b/test/test_dailymotion_subtitles.py
index f63426a185f889e44868c270fdf7e389aeec162b..32e3f6abe5cb55558fe0c348e4178a237ea0412e 100644
(file)
--- a/
test/test_dailymotion_subtitles.py
+++ b/
test/test_dailymotion_subtitles.py
@@
-46,14
+46,6
@@
class TestDailymotionSubtitles(unittest.TestCase):
info_dict = IE.extract(TEST_URL)
sub = info_dict[0]['subtitles']['fr']
self.assertEqual(md5(sub), '594564ec7d588942e384e920e5341792')
info_dict = IE.extract(TEST_URL)
sub = info_dict[0]['subtitles']['fr']
self.assertEqual(md5(sub), '594564ec7d588942e384e920e5341792')
- def test_onlysubtitles(self):
- DL = FakeYDL()
- DL.params['writesubtitles'] = True
- DL.params['onlysubtitles'] = True
- IE = DailymotionIE(DL)
- info_dict = IE.extract(TEST_URL)
- sub = info_dict[0]['subtitles']['en']
- self.assertEqual(md5(sub), '976553874490cba125086bbfea3ff76f')
def test_allsubtitles(self):
DL = FakeYDL()
DL.params['allsubtitles'] = True
def test_allsubtitles(self):
DL = FakeYDL()
DL.params['allsubtitles'] = True
diff --git
a/test/test_youtube_subtitles.py
b/test/test_youtube_subtitles.py
index fe0eac6804767f3cc2b355912c1e4179b310be10..fe5d097ce58fe07801abfc02b671692ca3af63b0 100644
(file)
--- a/
test/test_youtube_subtitles.py
+++ b/
test/test_youtube_subtitles.py
@@
-45,14
+45,6
@@
class TestYoutubeSubtitles(unittest.TestCase):
info_dict = IE.extract('QRS8MkLhQmM')
sub = info_dict[0]['subtitles']['it']
self.assertEqual(md5(sub), '164a51f16f260476a05b50fe4c2f161d')
info_dict = IE.extract('QRS8MkLhQmM')
sub = info_dict[0]['subtitles']['it']
self.assertEqual(md5(sub), '164a51f16f260476a05b50fe4c2f161d')
- def test_youtube_onlysubtitles(self):
- DL = FakeYDL()
- DL.params['writesubtitles'] = True
- DL.params['onlysubtitles'] = True
- IE = YoutubeIE(DL)
- info_dict = IE.extract('QRS8MkLhQmM')
- sub = info_dict[0]['subtitles']['en']
- self.assertEqual(md5(sub), '4cd9278a35ba2305f47354ee13472260')
def test_youtube_allsubtitles(self):
DL = FakeYDL()
DL.params['allsubtitles'] = True
def test_youtube_allsubtitles(self):
DL = FakeYDL()
DL.params['allsubtitles'] = True
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 8c6abddd93da5b29eb3d3df59150e9fd60cb5fcd..34f3dad0f2c3dc1597415e9437f68587be1ad563 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-193,9
+193,6
@@
def parseOpts(overrideArguments=None):
subtitles.add_option('--write-auto-sub', '--write-automatic-sub',
action='store_true', dest='writeautomaticsub',
help='write automatic subtitle file (youtube only)', default=False)
subtitles.add_option('--write-auto-sub', '--write-automatic-sub',
action='store_true', dest='writeautomaticsub',
help='write automatic subtitle file (youtube only)', default=False)
- subtitles.add_option('--only-sub',
- action='store_true', dest='skip_download',
- help='[deprecated] alias of --skip-download', default=False)
subtitles.add_option('--all-subs',
action='store_true', dest='allsubtitles',
help='downloads all the available subtitles of the video', default=False)
subtitles.add_option('--all-subs',
action='store_true', dest='allsubtitles',
help='downloads all the available subtitles of the video', default=False)