From 20090d14b5f9df3957629cce9aacc2f98563d50c Mon Sep 17 00:00:00 2001 From: aj Date: Thu, 5 Sep 2019 12:20:21 +0100 Subject: [PATCH] separated spotframework from web front, centralized logging init --- .gitignore | 2 +- alarm.py | 14 +++++++++++--- backup.py | 8 ++++++++ generateplaylists.py | 16 ++++++++++++---- getaccesstoken.py | 10 ++++++++++ requirements.txt | 15 +-------------- spotframework/__init__.py | 22 ---------------------- 7 files changed, 43 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 29a072c..427088f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -env +venv __pycache__ *.csv .idea diff --git a/alarm.py b/alarm.py index a836921..f737bad 100644 --- a/alarm.py +++ b/alarm.py @@ -10,14 +10,22 @@ import logging logger = logging.getLogger('spotframework') -log_format = '%(asctime)s %(levelname)s %(name)s:%(funcName)s - %(message)s' +file_log_format = '%(asctime)s %(levelname)s %(name)s:%(funcName)s - %(message)s' file_handler = logging.FileHandler(".spot/alarm.log") -formatter = logging.Formatter(log_format) -file_handler.setFormatter(formatter) +file_formatter = logging.Formatter(file_log_format) +file_handler.setFormatter(file_formatter) logger.addHandler(file_handler) +stream_log_format = '%(levelname)s %(name)s:%(funcName)s - %(message)s' +stream_formatter = logging.Formatter(stream_log_format) + +stream_handler = logging.StreamHandler() +stream_handler.setFormatter(stream_formatter) + +logger.addHandler(stream_handler) + def check_phone(): diff --git a/backup.py b/backup.py index 0fc4cfc..490d8ff 100644 --- a/backup.py +++ b/backup.py @@ -19,6 +19,14 @@ if __name__ == '__main__': logger.addHandler(file_handler) + stream_log_format = '%(levelname)s %(name)s:%(funcName)s - %(message)s' + stream_formatter = logging.Formatter(stream_log_format) + + stream_handler = logging.StreamHandler() + stream_handler.setFormatter(stream_formatter) + + logger.addHandler(stream_handler) + try: network = Network(NetworkUser(os.environ['SPOTCLIENT'], diff --git a/generateplaylists.py b/generateplaylists.py index c7bc7ef..19772c7 100644 --- a/generateplaylists.py +++ b/generateplaylists.py @@ -5,7 +5,7 @@ import spotframework.io.json as json import spotframework.util.monthstrings as monthstrings from spotframework.engine.playlistengine import PlaylistEngine from spotframework.engine.filter.shuffle import Shuffle -from spotframework.engine.filter.sort import SortReverseReleaseDate +from spotframework.engine.filter.sort import SortReleaseDate from spotframework.engine.filter.deduplicate import DeduplicateByID, DeduplicateByName import os @@ -26,6 +26,14 @@ file_handler.setFormatter(formatter) logger.addHandler(file_handler) +stream_log_format = '%(levelname)s %(name)s:%(funcName)s - %(message)s' +stream_formatter = logging.Formatter(stream_log_format) + +stream_handler = logging.StreamHandler() +stream_handler.setFormatter(stream_formatter) + +logger.addHandler(stream_handler) + def update_super_playlist(engine, data_dict): @@ -37,9 +45,9 @@ def update_super_playlist(engine, data_dict): if data_dict['shuffle'] is True: processors.append(Shuffle()) else: - processors.append(SortReverseReleaseDate()) + processors.append(SortReleaseDate(reverse=True)) else: - processors.append(SortReverseReleaseDate()) + processors.append(SortReleaseDate(reverse=True)) tracks = engine.make_playlist(data_dict['playlists'], processors) @@ -72,7 +80,7 @@ def update_recents_playlist(engine, data): for exclusion in data['recents']['exclude']: recent_parts.remove(exclusion) - processors = [DeduplicateByName(), SortReverseReleaseDate()] + processors = [DeduplicateByName(), SortReleaseDate(reverse=True)] recent_tracks = engine.get_recent_playlist(boundary_date, recent_parts, processors) engine.execute_playlist(recent_tracks, recents_id) diff --git a/getaccesstoken.py b/getaccesstoken.py index 7ab8f94..ff37caa 100644 --- a/getaccesstoken.py +++ b/getaccesstoken.py @@ -2,6 +2,16 @@ from spotframework.net.user import NetworkUser from spotframework.net.network import Network import os +import logging + +logger = logging.getLogger('spotframework') +stream_log_format = '%(levelname)s %(name)s:%(funcName)s - %(message)s' +stream_formatter = logging.Formatter(stream_log_format) + +stream_handler = logging.StreamHandler() +stream_handler.setFormatter(stream_formatter) + +logger.addHandler(stream_handler) if __name__ == '__main__': diff --git a/requirements.txt b/requirements.txt index 2d474e3..697d2ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,6 @@ -cachetools==3.1.1 certifi==2019.6.16 chardet==3.0.4 -google-api-core==1.14.2 -google-auth==1.6.3 -google-cloud-core==1.0.3 -google-cloud-firestore==1.4.0 -google-cloud-logging==1.12.1 -googleapis-common-protos==1.6.0 -grpcio==1.22.0 idna==2.8 -protobuf==3.9.1 -pyasn1==0.4.6 -pyasn1-modules==0.2.6 -pytz==2019.2 requests==2.22.0 -rsa==4.0 -six==1.12.0 +tabulate==0.8.3 urllib3==1.25.3 diff --git a/spotframework/__init__.py b/spotframework/__init__.py index 45e6c44..b061bef 100644 --- a/spotframework/__init__.py +++ b/spotframework/__init__.py @@ -1,26 +1,4 @@ import logging -import os logger = logging.getLogger(__name__) logger.setLevel('DEBUG') - -if os.environ.get('DEPLOY_DESTINATION', None) == 'PROD': - from google.cloud import logging as glogging - - log_format = '%(funcName)s - %(message)s' - formatter = logging.Formatter(log_format) - - client = glogging.Client() - handler = client.get_default_handler() - - handler.setFormatter(formatter) - - logger.addHandler(handler) -else: - log_format = '%(levelname)s %(name)s:%(funcName)s - %(message)s' - formatter = logging.Formatter(log_format) - - stream_handler = logging.StreamHandler() - stream_handler.setFormatter(formatter) - - logger.addHandler(stream_handler)