jens/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add Windows configuration file locations (#1881)

Browse source
This commit is contained in:
Philipp Hagemeister 2013-12-03 13:04:02 +01:00
parent 36a826a50d
commit 1b753cb334
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -183,7 +183,7 @@ which means you can modify it, redistribute it or use it however you like.
# CONFIGURATION # CONFIGURATION
You can configure youtube-dl by placing default arguments (such as `--extract-audio --no-mtime` to always extract the audio and not copy the mtime) into `/etc/youtube-dl.conf` and/or `~/.config/youtube-dl.conf`. You can configure youtube-dl by placing default arguments (such as `--extract-audio --no-mtime` to always extract the audio and not copy the mtime) into `/etc/youtube-dl.conf` and/or `~/.config/youtube-dl.conf`. On Windows, the configuration file locations are `%APPDATA%\youtube-dl\config` and `C:\Users\<Yourname>\youtube-dl.conf`.
# OUTPUT TEMPLATE # OUTPUT TEMPLATE

29
youtube_dl/__init__.py
View file

@ -81,15 +81,13 @@ from .PostProcessor import (
def parseOpts(overrideArguments=None): def parseOpts(overrideArguments=None):
def _readOptions(filename_bytes): def _readOptions(filename_bytes, def=[]):
try: try:
optionf = open(filename_bytes) optionf = open(filename_bytes)
except IOError: except IOError:
return [] # silently skip if file is not present return def # silently skip if file is not present
try: try:
res = [] res = [shlex.split(l, comments=True) for l in optionf]
for l in optionf:
res += shlex.split(l, comments=True)
finally: finally:
optionf.close() optionf.close()
return res return res
@ -419,6 +417,8 @@ def parseOpts(overrideArguments=None):
if opts.verbose: if opts.verbose:
write_string(u'[debug] Override config: ' + repr(overrideArguments) + '\n') write_string(u'[debug] Override config: ' + repr(overrideArguments) + '\n')
else: else:
systemConf = _readOptions('/etc/youtube-dl.conf')
xdg_config_home = os.environ.get('XDG_CONFIG_HOME') xdg_config_home = os.environ.get('XDG_CONFIG_HOME')
if xdg_config_home: if xdg_config_home:
userConfFile = os.path.join(xdg_config_home, 'youtube-dl', 'config') userConfFile = os.path.join(xdg_config_home, 'youtube-dl', 'config')
@ -428,8 +428,23 @@ def parseOpts(overrideArguments=None):
userConfFile = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl', 'config') userConfFile = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl', 'config')
if not os.path.isfile(userConfFile): if not os.path.isfile(userConfFile):
userConfFile = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl.conf') userConfFile = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl.conf')
systemConf = _readOptions('/etc/youtube-dl.conf') userConf = _readOptions(userConfFile, None)
userConf = _readOptions(userConfFile)
if userConf is None:
appdata_dir = os.environ.get('appdata')
if appdata_dir:
userConf = _readOptions(
os.path.join(appdata_dir, 'youtube-dl', 'config'),
def=None)
if userConf is None:
userConfFile = _readOptions(
os.path.join(os.path.expanduser('~'), 'youtube-dl.conf'),
def=None)
if userConf is None:
userConf = []
commandLineConf = sys.argv[1:] commandLineConf = sys.argv[1:]
argv = systemConf + userConf + commandLineConf argv = systemConf + userConf + commandLineConf
opts, args = parser.parse_args(argv) opts, args = parser.parse_args(argv)