pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-01-03 18:10:10 +09:00
Code Issues Projects Releases Wiki Activity

[YoutubeDL] improvements to warn_if_short_id()

Browse Source
This commit is contained in:
kikuyan 2021-07-04 02:59:31 +09:00
parent a803582717
commit cffb95942a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/YoutubeDL.py
View File

@ -437,11 +437,11 @@ class YoutubeDL(object):
register_socks_protocols() register_socks_protocols()
def warn_if_short_id(self, argv): def warn_if_short_id(self, argv, parser):
# short YouTube ID starting with dash? # short YouTube ID starting with dash?
idxs = [ idxs = [
i for i, a in enumerate(argv) i for i, a in enumerate(argv)
if re.match(r'^-[0-9A-Za-z_-]{10}$', a)] if re.match(r'^-[0-9A-Za-z_-]{10}$', a) and not parser.has_option(a)]
if idxs: if idxs:
correct_argv = ( correct_argv = (
['youtube-dl'] ['youtube-dl']

3
youtube_dl/__init__.py
View File

@ -13,6 +13,7 @@ import sys
from .options import ( from .options import (
_hide_login_info,
parseOpts, parseOpts,
) )
from .compat import ( from .compat import (
@ -453,7 +454,7 @@ def _real_main(argv=None):
if opts.update_self or opts.rm_cachedir: if opts.update_self or opts.rm_cachedir:
sys.exit() sys.exit()
ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv) ydl.warn_if_short_id(_hide_login_info(sys.argv[1:] if argv is None else argv), parser)
parser.error( parser.error(
'You must provide at least one URL.\n' 'You must provide at least one URL.\n'
'Type youtube-dl --help to see a list of all options.') 'Type youtube-dl --help to see a list of all options.')