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 9931c98e9fe02dc3fbcc90df7a01eaf9aa6e7fb9..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
@@
-113,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)
@@
-341,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