projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ap] improve adobe pass names and parse error handling
[youtube-dl]
/
youtube_dl
/
__init__.py
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index cdff3df65e3714b9c733a22f5dee670f4ebfe580..5614ef0fbc176b252cb87ef5e00bec22e271115e 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-120,9
+120,9
@@
def _real_main(argv=None):
desc += ' (Example: "%s%s:%s" )' % (ie.SEARCH_KEY, random.choice(_COUNTS), random.choice(_SEARCHES))
write_string(desc + '\n', out=sys.stdout)
sys.exit(0)
desc += ' (Example: "%s%s:%s" )' % (ie.SEARCH_KEY, random.choice(_COUNTS), random.choice(_SEARCHES))
write_string(desc + '\n', out=sys.stdout)
sys.exit(0)
- if opts.
list_ap_mso_ids
:
+ if opts.
ap_mso_list
:
table = [[mso_id, mso_info['name']] for mso_id, mso_info in MSO_INFO.items()]
table = [[mso_id, mso_info['name']] for mso_id, mso_info in MSO_INFO.items()]
- write_string('Supported TV Providers:\n' + render_table(['mso
id
', 'mso name'], table) + '\n', out=sys.stdout)
+ write_string('Supported TV Providers:\n' + render_table(['mso', 'mso name'], table) + '\n', out=sys.stdout)
sys.exit(0)
# Conflicting, missing and erroneous options
sys.exit(0)
# Conflicting, missing and erroneous options
@@
-165,6
+165,8
@@
def _real_main(argv=None):
parser.error('max sleep interval must be greater than or equal to min sleep interval')
else:
opts.max_sleep_interval = opts.sleep_interval
parser.error('max sleep interval must be greater than or equal to min sleep interval')
else:
opts.max_sleep_interval = opts.sleep_interval
+ if opts.ap_mso and opts.ap_mso not in MSO_INFO:
+ parser.error('Unsupported TV Provider, use --ap-mso-list to get a list of supported TV Providers')
def parse_retries(retries):
if retries in ('inf', 'infinite'):
def parse_retries(retries):
if retries in ('inf', 'infinite'):
@@
-303,7
+305,7
@@
def _real_main(argv=None):
'password': opts.password,
'twofactor': opts.twofactor,
'videopassword': opts.videopassword,
'password': opts.password,
'twofactor': opts.twofactor,
'videopassword': opts.videopassword,
- 'ap_mso
_id': opts.ap_mso_id
,
+ 'ap_mso
': opts.ap_mso
,
'ap_username': opts.ap_username,
'ap_password': opts.ap_password,
'quiet': (opts.quiet or any_getting or any_printing),
'ap_username': opts.ap_username,
'ap_password': opts.ap_password,
'quiet': (opts.quiet or any_getting or any_printing),