From a182fe5eb38a4c952fbd56a2f504aa7e5ebf0b03 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Mon, 21 Jan 2019 05:56:21 -0800 Subject: [PATCH] Use argparse special features to handle displaying version info (#486) * Use argparse special features to handle displaying version info * Remove version argument check from spotdl.py --- spotdl/handle.py | 7 ++++--- spotdl/spotdl.py | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/spotdl/handle.py b/spotdl/handle.py index b0aef87..b7a97c3 100644 --- a/spotdl/handle.py +++ b/spotdl/handle.py @@ -7,6 +7,7 @@ import argparse import mimetypes import os +import spotdl from spotdl import internals @@ -120,9 +121,6 @@ def get_arguments(raw_args=None, to_group=True, to_merge=True): "--username", help="load tracks from user's playlist into .txt", ) - group.add_argument( - "-V", "--version", help="show version and exit", action="store_true" - ) parser.add_argument( "--write-m3u", @@ -257,6 +255,9 @@ def get_arguments(raw_args=None, to_group=True, to_merge=True): parser.add_argument( "-c", "--config", default=None, help="path to custom config.yml file" ) + parser.add_argument( + "-V", "--version", action="version", version="%(prog)s {}".format(spotdl.__version__) + ) parsed = parser.parse_args(raw_args) diff --git a/spotdl/spotdl.py b/spotdl/spotdl.py index 090e6f3..8e74360 100644 --- a/spotdl/spotdl.py +++ b/spotdl/spotdl.py @@ -49,10 +49,6 @@ def match_args(): def main(): const.args = handle.get_arguments() - if const.args.version: - print("spotdl {version}".format(version=__version__)) - sys.exit() - internals.filter_path(const.args.folder) youtube_tools.set_api_key()