projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'yasoob/master'
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 52ee8cedbc0ddbe4b3b78286132e8e813f363805..e2470611512698745181dcf45cebbebc67acdb65 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-13,7
+13,7
@@
import time
import traceback
from .utils import *
import traceback
from .utils import *
-from .extractor import get_info_extractor
+from .extractor import get_info_extractor
, gen_extractors
from .FileDownloader import FileDownloader
from .FileDownloader import FileDownloader
@@
-46,6
+46,7
@@
class YoutubeDL(object):
username: Username for authentication purposes.
password: Password for authentication purposes.
username: Username for authentication purposes.
password: Password for authentication purposes.
+ videopassword: Password for acces a video.
usenetrc: Use netrc for authentication instead.
verbose: Print additional info to stdout.
quiet: Do not print messages to stdout.
usenetrc: Use netrc for authentication instead.
verbose: Print additional info to stdout.
quiet: Do not print messages to stdout.
@@
-71,9
+72,10
@@
class YoutubeDL(object):
writeinfojson: Write the video description to a .info.json file
writethumbnail: Write the thumbnail image to a file
writesubtitles: Write the video subtitles to a file
writeinfojson: Write the video description to a .info.json file
writethumbnail: Write the thumbnail image to a file
writesubtitles: Write the video subtitles to a file
+ writeautomaticsub: Write the automatic subtitles to a file
allsubtitles: Downloads all the subtitles of the video
listsubtitles: Lists all available subtitles for the video
allsubtitles: Downloads all the subtitles of the video
listsubtitles: Lists all available subtitles for the video
- subtitlesformat: Subtitle format [s
bv/sr
t] (default=srt)
+ subtitlesformat: Subtitle format [s
rt/sbv/vt
t] (default=srt)
subtitleslang: Language of the subtitles to download
keepvideo: Keep the video file after post-processing
daterange: A DateRange object, download only if the upload_date is in the range.
subtitleslang: Language of the subtitles to download
keepvideo: Keep the video file after post-processing
daterange: A DateRange object, download only if the upload_date is in the range.
@@
-111,6
+113,13
@@
class YoutubeDL(object):
self._ies.append(ie)
ie.set_downloader(self)
self._ies.append(ie)
ie.set_downloader(self)
+ def add_default_info_extractors(self):
+ """
+ Add the InfoExtractors returned by gen_extractors to the end of the list
+ """
+ for ie in gen_extractors():
+ self.add_info_extractor(ie)
+
def add_post_processor(self, pp):
"""Add a PostProcessor object to the end of the chain."""
self._pps.append(pp)
def add_post_processor(self, pp):
"""Add a PostProcessor object to the end of the chain."""
self._pps.append(pp)
@@
-339,6
+348,7
@@
class YoutubeDL(object):
result_type = ie_result.get('_type', 'video') # If not given we suppose it's a video, support the default old system
if result_type == 'video':
result_type = ie_result.get('_type', 'video') # If not given we suppose it's a video, support the default old system
if result_type == 'video':
+ ie_result.update(extra_info)
if 'playlist' not in ie_result:
# It isn't part of a playlist
ie_result['playlist'] = None
if 'playlist' not in ie_result:
# It isn't part of a playlist
ie_result['playlist'] = None
@@
-473,7
+483,7
@@
class YoutubeDL(object):
self.report_error(u'Cannot write description file ' + descfn)
return
self.report_error(u'Cannot write description file ' + descfn)
return
- if
self.params.get('writesubtitles', False
) and 'subtitles' in info_dict and info_dict['subtitles']:
+ if
(self.params.get('writesubtitles', False) or self.params.get('writeautomaticsub')
) and 'subtitles' in info_dict and info_dict['subtitles']:
# subtitles download errors are already managed as troubles in relevant IE
# that way it will silently go on when used with unsupporting IE
subtitle = info_dict['subtitles'][0]
# subtitles download errors are already managed as troubles in relevant IE
# that way it will silently go on when used with unsupporting IE
subtitle = info_dict['subtitles'][0]