use python logging

Author: pvsr

qbpm/icons.py

@@ -12,7 +12,7 @@
 from PIL import Image
 
 from . import Profile, __version__
-from .utils import debug, error
+from .utils import error, info
 
 PREFERRED_ICONS = [
     re.compile(p)
@@ -34,7 +34,7 @@ def choose_icon(icons: list[Icon]) -> Optional[Icon]:
     for pattern in PREFERRED_ICONS:
         for icon in icons:
             if pattern.search(icon.url):
-                debug(f"chose {icon.url}")
+                info(f"chose {icon.url}")
                 return icon
     return None
 
@@ -48,15 +48,15 @@ def download_icon(profile: Profile, home_page: str, overwrite: bool) -> Optional
     try:
         icons = favicon.get(home_page, headers=headers, timeout=10)
     except Exception as e:
-        debug(str(e))
+        info(str(e))
         error(f"failed to fetch favicon from {home_page}")
         return None
     if not icons:
         error(f"no favicon found on {home_page}")
         return None
     icon = choose_icon(icons)
     if not icon:
-        print(f"no favicons found matching one of {PREFERRED_ICONS}")
+        info(f"no favicons found matching one of {PREFERRED_ICONS}")
         return None
 
     tmp_dir = TemporaryDirectory()
@@ -90,7 +90,7 @@ def install_icon_file(
             image = Image.open(src)
             image.save(dest, icon_format="png")
         except Exception as e:
-            debug(str(e))
+            info(str(e))
             error(f"failed to convert {origin or src} to png")
             return None
     else:

qbpm/main.py

@@ -1,3 +1,4 @@
+import logging
 import sys
 from pathlib import Path
 from typing import Any, Callable, NoReturn, Optional
@@ -40,6 +41,12 @@ def creator_options(f: Callable[..., Any]) -> Callable[..., Any]:
     return f
 
 
+class LowerCaseFormatter(logging.Formatter):
+    def format(self, record: logging.LogRecord) -> str:
+        record.levelname = record.levelname.lower()
+        return super().format(record)
+
+
 @click.group(context_settings=CONTEXT_SETTINGS)
 @click.version_option()
 @click.option(
@@ -51,9 +58,20 @@ def creator_options(f: Callable[..., Any]) -> Callable[..., Any]:
     default=default_profile_dir,
     help="Defaults to $XDG_DATA_HOME/qutebrowser-profiles.",
 )
+@click.option(
+    "-l",
+    "--log-level",
+    default="error",
+    type=click.Choice(["debug", "info", "error"], case_sensitive=False),
+)
 @click.pass_context
-def main(ctx: click.Context, profile_dir: Path) -> None:
+def main(ctx: click.Context, profile_dir: Path, log_level: str) -> None:
     ctx.obj = profile_dir
+    root_logger = logging.getLogger()
+    root_logger.setLevel(log_level.upper())
+    handler = logging.StreamHandler()
+    handler.setFormatter(LowerCaseFormatter("{levelname:>6}: {message}", style="{"))
+    root_logger.addHandler(handler)
 
 
 @main.command()

qbpm/utils.py

@@ -1,3 +1,4 @@
+import logging
 import platform
 from collections.abc import Iterator
 from os import environ
@@ -12,18 +13,13 @@
 AUTO_MENUS = WAYLAND_MENUS + X11_MENUS
 SUPPORTED_MENUS = [*AUTO_MENUS, "fzf", "applescript"]
 
-global debugging
-debugging: bool = True
 
-
-# TODO replace with actual logger
-def debug(msg: str) -> None:
-    if debugging:
-        print(f"debug: {msg}", file=stderr)
+def info(msg: str) -> None:
+    logging.info(msg)
 
 
 def error(msg: str) -> None:
-    print(f"error: {msg}", file=stderr)
+    logging.error(msg)
 
 
 def default_profile_dir() -> Path:
@@ -64,5 +60,5 @@ def installed_menus() -> Iterator[str]:
         yield "fzf-tmux"
     # if there's no display and fzf is installed we're probably(?) in a term
     if which("fzf") is not None:
-        print("no graphical launchers found, trying fzf", file=stderr)
+        info("no graphical launchers found, trying fzf")
         yield "fzf"