projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't accept '-1' as format, 'all' is clearer
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index df2aebb59f836e7255ccaa6fcce545154d58b65d..be5b3c1ab5ff1980ed0db34c599e2a96417b9294 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-61,6
+61,7
@@
from .utils import (
render_table,
SameFileError,
sanitize_filename,
render_table,
SameFileError,
sanitize_filename,
+ sanitize_path,
std_headers,
subtitles_filename,
takewhile_inclusive,
std_headers,
subtitles_filename,
takewhile_inclusive,
@@
-562,7
+563,7
@@
class YoutubeDL(object):
if v is not None)
template_dict = collections.defaultdict(lambda: 'NA', template_dict)
if v is not None)
template_dict = collections.defaultdict(lambda: 'NA', template_dict)
- outtmpl = s
elf.params.get('outtmpl', DEFAULT_OUTTMPL
)
+ outtmpl = s
anitize_path(self.params.get('outtmpl', DEFAULT_OUTTMPL)
)
tmpl = compat_expanduser(outtmpl)
filename = tmpl % template_dict
# Temporary fix for #4787
tmpl = compat_expanduser(outtmpl)
filename = tmpl % template_dict
# Temporary fix for #4787
@@
-1085,8
+1086,7
@@
class YoutubeDL(object):
if req_format is None:
req_format = 'best'
formats_to_download = []
if req_format is None:
req_format = 'best'
formats_to_download = []
- # The -1 is for supporting YoutubeIE
- if req_format in ('-1', 'all'):
+ if req_format == 'all':
formats_to_download = formats
else:
for rfstr in req_format.split(','):
formats_to_download = formats
else:
for rfstr in req_format.split(','):
@@
-1261,7
+1261,7
@@
class YoutubeDL(object):
return
try:
return
try:
- dn = os.path.dirname(
encodeFilename(filename
))
+ dn = os.path.dirname(
sanitize_path(encodeFilename(filename)
))
if dn and not os.path.exists(dn):
os.makedirs(dn)
except (OSError, IOError) as err:
if dn and not os.path.exists(dn):
os.makedirs(dn)
except (OSError, IOError) as err: