github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-24 18:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve 5736d79172

Browse source
This commit is contained in:
pukkandan 2022-09-17 10:14:44 +05:30
parent 3166e6840c
commit 2b24afa6d7
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yt_dlp/__init__.py
View file

@ -411,6 +411,9 @@ def metadataparser_actions(f):
if opts.download_archive is not None: if opts.download_archive is not None:
opts.download_archive = expand_path(opts.download_archive) opts.download_archive = expand_path(opts.download_archive)
if opts.ffmpeg_location is not None:
opts.ffmpeg_location = expand_path(opts.ffmpeg_location)
if opts.user_agent is not None: if opts.user_agent is not None:
opts.headers.setdefault('User-Agent', opts.user_agent) opts.headers.setdefault('User-Agent', opts.user_agent)
if opts.referer is not None: if opts.referer is not None:
@ -920,7 +923,6 @@ def _real_main(argv=None):
# We may need ffmpeg_location without having access to the YoutubeDL instance # We may need ffmpeg_location without having access to the YoutubeDL instance
# See https://github.com/yt-dlp/yt-dlp/issues/2191 # See https://github.com/yt-dlp/yt-dlp/issues/2191
if opts.ffmpeg_location: if opts.ffmpeg_location:
opts.ffmpeg_location = expand_path(opts.ffmpeg_location)
FFmpegPostProcessor._ffmpeg_location.set(opts.ffmpeg_location) FFmpegPostProcessor._ffmpeg_location.set(opts.ffmpeg_location)
with YoutubeDL(ydl_opts) as ydl: with YoutubeDL(ydl_opts) as ydl:

4
yt_dlp/cookies.py
View file

@ -988,8 +988,8 @@ def _parse_browser_specification(browser_name, profile=None, keyring=None, conta
raise ValueError(f'unsupported browser: "{browser_name}"') raise ValueError(f'unsupported browser: "{browser_name}"')
if keyring not in (None, *SUPPORTED_KEYRINGS): if keyring not in (None, *SUPPORTED_KEYRINGS):
raise ValueError(f'unsupported keyring: "{keyring}"') raise ValueError(f'unsupported keyring: "{keyring}"')
if profile is not None and _is_path(profile): if profile is not None and _is_path(expand_path(profile)):
profile = os.path.expanduser(profile) profile = expand_path(profile)
return browser_name, profile, keyring, container return browser_name, profile, keyring, container

2
yt_dlp/utils.py
View file

@ -762,7 +762,7 @@ def sanitized_Request(url, *args, **kwargs):
def expand_path(s): def expand_path(s):
"""Expand shell variables and ~""" """Expand $ shell variables and ~"""
return os.path.expandvars(compat_expanduser(s)) return os.path.expandvars(compat_expanduser(s))