From 35461e860294165f1e8ea62b1cbcc8b980729b2f Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sun, 26 Apr 2020 12:29:41 +0530 Subject: [PATCH] Setup logzero.logger --- CHANGES.md | 14 +++++++++++++- spotdl/command_line/__main__.py | 15 ++++++++++++--- spotdl/command_line/helpers.py | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8d9e8fc..c90bb35 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,9 +6,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [2.0.0] - +### Migrating from v1.2.6 to v2.0.0 + +### Fixed + +### Added + +### Changed + +### Removed +- Command-line options + ## [1.2.6] (Hotfix Release) - 2020-03-02 ### Fixed -Embed release date metadata only when available (follow up of #672) ([@ritiek](https://github.com/ritiek)) (#674) +- Embed release date metadata only when available (follow up of #672) ([@ritiek](https://github.com/ritiek)) (#674) ## [1.2.5] - 2020-03-02 ### Fixed diff --git a/spotdl/command_line/__main__.py b/spotdl/command_line/__main__.py index ba9e769..4f96648 100644 --- a/spotdl/command_line/__main__.py +++ b/spotdl/command_line/__main__.py @@ -1,6 +1,7 @@ from spotdl.authorize.services import AuthorizeSpotify from spotdl import command_line +import logzero import sys def match_arguments(arguments): @@ -47,8 +48,18 @@ def match_arguments(arguments): ) +def set_logger(level): + fmt = "%(color)s%(levelname)s:%(end_color)s %(message)s" + formatter = logzero.LogFormatter(fmt=fmt) + logzero.formatter(formatter) + logzero.loglevel(level) + return logzero.logger + + def main(): arguments = command_line.get_arguments() + logger = set_logger(arguments.log_level) + logger.debug(arguments.__dict__) AuthorizeSpotify( client_id=arguments.spotify_client_id, @@ -56,12 +67,10 @@ def main(): ) # youtube_tools.set_api_key() - # logzero.setup_default_logger(formatter=const._formatter, level=const.args.log_level) - try: match_arguments(arguments.__dict__) except KeyboardInterrupt as e: - # log.exception(e) + logger.exception(e) sys.exit(2) diff --git a/spotdl/command_line/helpers.py b/spotdl/command_line/helpers.py index 34599b5..ab17d59 100644 --- a/spotdl/command_line/helpers.py +++ b/spotdl/command_line/helpers.py @@ -18,6 +18,7 @@ from spotdl.track import Track import spotdl.util +from logzero import logger import os import urllib.request