Skip to content

Commit

Permalink
Provide guidance when called with a YouTube ID starting with a dash.
Browse files Browse the repository at this point in the history
  • Loading branch information
phihag committed Nov 23, 2014
1 parent d37cab2 commit 7d4111e
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 4 deletions.
7 changes: 7 additions & 0 deletions test/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
js_to_json,
get_filesystem_encoding,
intlist_to_bytes,
args_to_str,
)


Expand Down Expand Up @@ -361,5 +362,11 @@ def test_intlist_to_bytes(self):
intlist_to_bytes([0, 1, 127, 128, 255]),
b'\x00\x01\x7f\x80\xff')

def test_args_to_str(self):
self.assertEqual(
args_to_str(['foo', 'ba/r', '-baz', '2 be', '']),
'foo ba/r -baz \'2 be\' \'\''
)

if __name__ == '__main__':
unittest.main()
19 changes: 19 additions & 0 deletions youtube_dl/YoutubeDL.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
compat_str,
compat_urllib_error,
compat_urllib_request,
shlex_quote,
)
from .utils import (
escape_url,
Expand Down Expand Up @@ -60,6 +61,7 @@
write_string,
YoutubeDLHandler,
prepend_extension,
args_to_str,
)
from .cache import Cache
from .extractor import get_info_extractor, gen_extractors
Expand Down Expand Up @@ -253,6 +255,22 @@ def __init__(self, params=None, auto_init=True):
self.print_debug_header()
self.add_default_info_extractors()

def warn_if_short_id(self, argv):
# short YouTube ID starting with dash?
idxs = [
i for i, a in enumerate(argv)
if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
if idxs:
correct_argv = (
['youtube-dl'] +
[a for i, a in enumerate(argv) if i not in idxs] +
['--'] + [argv[i] for i in idxs]
)
self.report_warning(
'Long argument string detected. '
'Use -- to separate parameters and URLs, like this:\n%s\n' %
args_to_str(correct_argv))

def add_info_extractor(self, ie):
"""Add an InfoExtractor object to the end of the list."""
self._ies.append(ie)
Expand Down Expand Up @@ -1410,3 +1428,4 @@ def get_encoding(self):
if encoding is None:
encoding = preferredencoding()
return encoding

7 changes: 4 additions & 3 deletions youtube_dl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,12 @@ def _real_main(argv=None):

# Maybe do nothing
if (len(all_urls) < 1) and (opts.load_info_filename is None):
if not (opts.update_self or opts.rm_cachedir):
parser.error('you must provide at least one URL')
else:
if opts.update_self or opts.rm_cachedir:
sys.exit()

ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
parser.error('you must provide at least one URL')

try:
if opts.load_info_filename is not None:
retcode = ydl.download_with_info_file(opts.load_info_filename)
Expand Down
6 changes: 5 additions & 1 deletion youtube_dl/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import getpass
import optparse
import os
import re
import subprocess
import sys

Expand Down Expand Up @@ -174,7 +175,10 @@ def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
from shlex import quote as shlex_quote
except ImportError: # Python < 3.3
def shlex_quote(s):
return "'" + s.replace("'", "'\"'\"'") + "'"
if re.match(r'^[-_\w./]+$', s):
return s
else:
return "'" + s.replace("'", "'\"'\"'") + "'"


def compat_ord(c):
Expand Down
6 changes: 6 additions & 0 deletions youtube_dl/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urlparse,
shlex_quote,
)


Expand Down Expand Up @@ -1433,3 +1434,8 @@ def ytdl_is_updateable():
from zipimport import zipimporter

return isinstance(globals().get('__loader__'), zipimporter) or hasattr(sys, 'frozen')


def args_to_str(args):
# Get a short string representation for a subprocess command
return ' '.join(shlex_quote(a) for a in args)

0 comments on commit 7d4111e

Please sign in to comment.