From 0d71ea4d36960d500593cc3f56127251d6a26839 Mon Sep 17 00:00:00 2001 From: Ben Tettmar <83777519+bentettmar@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:40:01 +0100 Subject: [PATCH 1/5] Add custom Logging class. Add a custom Logging class that has colours and will also log to the default logging lib in Python. --- opendrop/logger.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 opendrop/logger.py diff --git a/opendrop/logger.py b/opendrop/logger.py new file mode 100644 index 0000000..be8f834 --- /dev/null +++ b/opendrop/logger.py @@ -0,0 +1,18 @@ +import colorama +import logging + +class Logging: + def info(message: str) -> None: + logging.info(message) + print(f"{colorama.Fore.BLUE}{colorama.Style.BRIGHT}[INFO]{colorama.Style.RESET_ALL} {message}") + def error(message: str) -> None: + logging.error(message) + print(f"{colorama.Fore.RED}{colorama.Style.BRIGHT}[ERROR]{colorama.Style.RESET_ALL} {message}") + def success(message: str) -> None: + print(f"{colorama.Fore.GREEN}{colorama.Style.BRIGHT}[SUCCESS]{colorama.Style.RESET_ALL} {message}") + def warning(message: str) -> None: + logging.warning(message) + print(f"{colorama.Fore.YELLOW}{colorama.Style.BRIGHT}[WARNING]{colorama.Style.RESET_ALL} {message}") + def debug(message: str) -> None: + logging.debug(message) + print(f"{colorama.Fore.MAGENTA}{colorama.Style.BRIGHT}[DEBUG]{colorama.Style.RESET_ALL} {message}") From 78e02bb35b3a311a29f17a7d6b981175bea43b2b Mon Sep 17 00:00:00 2001 From: Ben Tettmar <83777519+bentettmar@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:40:27 +0100 Subject: [PATCH 2/5] Update logger to custom Logging class --- opendrop/cli.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/opendrop/cli.py b/opendrop/cli.py index eaa58bb..2d7b1e0 100644 --- a/opendrop/cli.py +++ b/opendrop/cli.py @@ -19,17 +19,19 @@ import argparse import json -import logging import os import sys import threading import time +import logging from .client import AirDropBrowser, AirDropClient from .config import AirDropConfig, AirDropReceiverFlags from .server import AirDropServer +from .logger import Logging -logger = logging.getLogger(__name__) +# logger = logging.getLogger(__name__) +logger = Logging def main(): From f813cd7fa4c8d4a8a2800bb2bb4caa7fcabc3ee7 Mon Sep 17 00:00:00 2001 From: Ben Tettmar <83777519+bentettmar@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:40:44 +0100 Subject: [PATCH 3/5] Update logger to custom Logging class --- opendrop/client.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendrop/client.py b/opendrop/client.py index 5ce8d43..fdbb2dc 100644 --- a/opendrop/client.py +++ b/opendrop/client.py @@ -31,8 +31,10 @@ from zeroconf import IPVersion, ServiceBrowser, Zeroconf from .util import AbsArchiveWrite, AirDropUtil +from .logger import Logging -logger = logging.getLogger(__name__) +# logger = logging.getLogger(__name__) +logger = Logging class AirDropBrowser: From bbfb7ae5d725e15a65ee47cc9f67bf9a4fcec213 Mon Sep 17 00:00:00 2001 From: Ben Tettmar <83777519+bentettmar@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:41:00 +0100 Subject: [PATCH 4/5] Update logger to custom Logging class --- opendrop/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendrop/config.py b/opendrop/config.py index d20f33a..1dca31b 100644 --- a/opendrop/config.py +++ b/opendrop/config.py @@ -26,7 +26,10 @@ from pkg_resources import resource_filename -logger = logging.getLogger(__name__) +from .logger import Logging + +# logger = logging.getLogger(__name__) +logger = Logging class AirDropReceiverFlags: From dc156cc2942979ccc32b451bfc30e9f376346698 Mon Sep 17 00:00:00 2001 From: Ben Tettmar <83777519+bentettmar@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:41:16 +0100 Subject: [PATCH 5/5] Update logger to custom Logging class --- opendrop/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendrop/server.py b/opendrop/server.py index 9fe3f80..315798f 100644 --- a/opendrop/server.py +++ b/opendrop/server.py @@ -31,8 +31,10 @@ from zeroconf import IPVersion, ServiceInfo, Zeroconf from .util import AirDropUtil +from .logger import Logging -logger = logging.getLogger(__name__) +# logger = logging.getLogger(__name__) +logger = Logging class AirDropServer: