Merge branch 'master' into master

This commit is contained in:
Ritiek Malhotra
2018-07-28 23:43:55 -07:00
committed by GitHub
2 changed files with 5 additions and 21 deletions

View File

@@ -69,24 +69,7 @@ def override_config(config_file, parser, raw_args=None):
""" Override default dict with config dict passed as comamnd line argument. """
config_file = os.path.realpath(config_file)
config = merge(default_conf['spotify-downloader'], get_config(config_file))
parser.set_defaults(manual=config['manual'])
parser.set_defaults(no_metadata=config['no-metadata'])
parser.set_defaults(avconv=config['avconv'])
parser.set_defaults(folder=os.path.relpath(config['folder'], os.getcwd()))
parser.set_defaults(overwrite=config['overwrite'])
parser.set_defaults(input_ext=config['input-ext'])
parser.set_defaults(output_ext=config['output-ext'])
parser.set_defaults(trim_silence=config['trim-silence'])
parser.set_defaults(download_only_metadata=config['download-only-metadata'])
parser.set_defaults(dry_run=config['dry-run'])
parser.set_defaults(music_videos_only=config['music-videos-only'])
parser.set_defaults(no_spaces=config['no-spaces'])
parser.set_defaults(file_format=config['file-format'])
parser.set_defaults(search_format=config['search-format'])
parser.set_defaults(youtube_api_key=config['youtube-api-key'])
parser.set_defaults(log_level=config['log-level'])
parser.set_defaults(**config)
return parser.parse_args(raw_args)