Mirrors/yt-dlp
2
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-14 23:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make nested --config-locations relative to parent file

Browse source 
* and allow environment variables in it so that you can use `$PWD`/`%cd%`
to specify paths relative to current directory
This commit is contained in:
pukkandan 2022-02-03 18:18:18 +05:30
parent 5e51f4a8ad
commit 65662dffb1
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yt_dlp/utils.py
View file

@ -5222,8 +5222,10 @@ class Config:
def init(self, args=None, filename=None): def init(self, args=None, filename=None):
assert not self.__initialized assert not self.__initialized
directory = ''
if filename: if filename:
location = os.path.realpath(filename) location = os.path.realpath(filename)
directory = os.path.dirname(location)
if location in self._loaded_paths: if location in self._loaded_paths:
return False return False
self._loaded_paths.add(location) self._loaded_paths.add(location)
@ -5231,7 +5233,7 @@ class Config:
self.__initialized = True self.__initialized = True
self.own_args, self.filename = args, filename self.own_args, self.filename = args, filename
for location in self._parser.parse_args(args)[0].config_locations or []: for location in self._parser.parse_args(args)[0].config_locations or []:
location = compat_expanduser(location) location = os.path.join(directory, expand_path(location))
if os.path.isdir(location): if os.path.isdir(location):
location = os.path.join(location, 'yt-dlp.conf') location = os.path.join(location, 'yt-dlp.conf')
if not os.path.exists(location): if not os.path.exists(location):