From ef1e4715269a27f98e25008f9c882dc9db305a95 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 27 Jul 2018 16:31:43 +0200 Subject: [PATCH 1/2] Directly link FAQs in README, minor changes (#315) --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2ef43d3..2fc24d7 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@ [![Gitter Chat](https://badges.gitter.im/ritiek/spotify-downloader/Lobby.svg)](https://gitter.im/spotify-downloader/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - Downloads songs from YouTube in an MP3 format by using Spotify's HTTP link. - - Can also download a song by entering its artist and song name (in case if you don't have the Spotify's HTTP link for some song). - - Automatically applies metadata to the downloaded song which include: - Title @@ -31,7 +29,7 @@ That's how your music library will look like! ## Installation -**This tool works with only Python 3**. +**This tool works only with Python 3.** Python 2 compatibility was dropped because of the way it deals with unicode (2020 is coming soon too). If you still need to use Python 2 - check out the (outdated) @@ -70,6 +68,9 @@ contains detailed information about different available ways to download tracks. ## FAQ +- [ +How to specify a custom folder where tracks should be downloaded?](https://github.com/ritiek/spotify-downloader/wiki/FAQ#how-to-specify-a-custom-folder-where-tracks-should-be-downloaded) + Check out our [FAQ wiki page](https://github.com/ritiek/spotify-downloader/wiki/FAQ) for more info. From a3b32547e0373c21e8ed852a8cd670086664af65 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sat, 28 Jul 2018 23:42:42 -0700 Subject: [PATCH 2/2] Pass **config to parser.set_defaults() (#319) --- core/handle.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/core/handle.py b/core/handle.py index f8f7e9f..3bdb8ab 100644 --- a/core/handle.py +++ b/core/handle.py @@ -68,23 +68,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(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)