projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Generalize cli option converters
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index f731703fb25c5f13d517808585b4826ec84fc236..39cef9c5b99d1c47545455970344bc836c77494e 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-510,6
+510,12
@@
class InfoExtractor(object):
"""Report attempt to log in."""
self.to_screen('Logging in')
"""Report attempt to log in."""
self.to_screen('Logging in')
+ @staticmethod
+ def raise_login_required(msg='This video is only available for registered users'):
+ raise ExtractorError(
+ '%s. Use --username and --password or --netrc to provide account credentials.' % msg,
+ expected=True)
+
# Methods for following #608
@staticmethod
def url_result(url, ie=None, video_id=None, video_title=None):
# Methods for following #608
@staticmethod
def url_result(url, ie=None, video_id=None, video_title=None):
@@
-1289,11
+1295,11
@@
class InfoExtractor(object):
return ret
@classmethod
return ret
@classmethod
- def _merge_subtitles(
k
ls, subtitle_dict1, subtitle_dict2):
+ def _merge_subtitles(
c
ls, subtitle_dict1, subtitle_dict2):
""" Merge two subtitle dictionaries, language by language. """
ret = dict(subtitle_dict1)
for lang in subtitle_dict2:
""" Merge two subtitle dictionaries, language by language. """
ret = dict(subtitle_dict1)
for lang in subtitle_dict2:
- ret[lang] =
k
ls._merge_subtitle_items(subtitle_dict1.get(lang, []), subtitle_dict2[lang])
+ ret[lang] =
c
ls._merge_subtitle_items(subtitle_dict1.get(lang, []), subtitle_dict2[lang])
return ret
def extract_automatic_captions(self, *args, **kwargs):
return ret
def extract_automatic_captions(self, *args, **kwargs):