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(): 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: 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: 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}") 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: