diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2011-11-29 20:13:06 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2011-11-29 20:13:13 +0100 |
| commit | 0cd235eef674540b7001f15681c97d7dd8e6cb13 (patch) | |
| tree | 6679b1ed0760f2b8cb448f9701785f59ddc61cd4 /youtube_dl | |
| parent | 77315556f184fee1166552ffad99bdd8b733d75d (diff) | |
| download | youtube-dl-0cd235eef674540b7001f15681c97d7dd8e6cb13.tar.xz | |
Use freedesktop.org mandated user config file location (Suggested by Tyll in #231)
Diffstat (limited to 'youtube_dl')
| -rwxr-xr-x | youtube_dl/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 3fba08fa4..fa2bd4fca 100755 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -4125,7 +4125,12 @@ def parseOpts(): parser.add_option_group(authentication) parser.add_option_group(postproc) - argv = _readOptions('/etc/youtube-dl.conf') + _readOptions(os.path.expanduser('~/.youtube-dl.conf')) + sys.argv[1:] + xdg_config_home = os.environ.get('XDG_CONFIG_HOME') + if xdg_config_home: + userConf = os.path.join(xdg_config_home, 'youtube-dl.conf') + else: + userConf = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl.conf') + argv = _readOptions('/etc/youtube-dl.conf') + _readOptions(userConf) + sys.argv[1:] opts, args = parser.parse_args(argv) return parser, opts, args |