diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2026-07-03 14:25:38 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2026-07-03 14:25:38 +0300 |
| commit | 7f749362a5a4ad31ae8e4e4aed49d30e2263aeef (patch) | |
| tree | 52ea9c3026ee7984cc0773737d61b9b72f6a6118 | |
| parent | 4bc6ddf6a360a62d214e20c8dd8021dddd2435d6 (diff) | |
| download | fungus-launcher-7f749362a5a4ad31ae8e4e4aed49d30e2263aeef.tar.gz fungus-launcher-7f749362a5a4ad31ae8e4e4aed49d30e2263aeef.tar.xz | |
add --verbose
| -rw-r--r-- | fungus-launcher.py | 20 | ||||
| -rw-r--r-- | fungus-proton-manager.py | 31 | ||||
| -rw-r--r-- | fungus-run.py | 30 | ||||
| -rw-r--r-- | fungus/logger.py | 69 | ||||
| -rw-r--r-- | fungus/run_manager.py | 24 |
5 files changed, 136 insertions, 38 deletions
diff --git a/fungus-launcher.py b/fungus-launcher.py index 20faf80..4b325d4 100644 --- a/fungus-launcher.py +++ b/fungus-launcher.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 +import argparse import os import sys @@ -14,11 +15,26 @@ else: dev_site_packages = os.path.join(base_dir, PYTHON_SITE_PACKAGES) sys.path.insert(0, dev_site_packages) -from fungus.app import FungusApp +from fungus.logger import set_level +import logging + + +def main() -> None: + parser = argparse.ArgumentParser( + description="Fungus Launcher — a game library manager for Linux/Wine.", + ) + parser.add_argument("-v", "--verbose", action="store_true", + help="Enable debug logging output") + args = parser.parse_args() + + if args.verbose: + set_level(logging.DEBUG) + + from fungus.app import FungusApp -def main(): app = FungusApp() app.run(sys.argv) + if __name__ == "__main__": main() diff --git a/fungus-proton-manager.py b/fungus-proton-manager.py index a519ef9..8fb3b8f 100644 --- a/fungus-proton-manager.py +++ b/fungus-proton-manager.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 """Fungus Proton Manager — GTK UI for downloading / removing Proton versions.""" +import argparse import os import threading @@ -11,8 +12,26 @@ gi.require_version("Gtk", "3.0") from gi.repository import Gtk, GLib # type: ignore from fungus.dark_theme import apply_dark_theme -from fungus.logger import get_logger +from fungus.logger import get_logger, set_level from fungus.path_manager import PathManager +import logging + + +def main() -> None: + parser = argparse.ArgumentParser( + description="Fungus Proton Manager — download / remove Proton versions.", + ) + parser.add_argument("-v", "--verbose", action="store_true", + help="Enable debug logging output") + args = parser.parse_args() + + if args.verbose: + set_level(logging.DEBUG) + + apply_dark_theme() + win = ProtonDownloader() + win.connect("destroy", Gtk.main_quit) + Gtk.main() from fungus.proton_manager import ( RATE_LIMITED_MSG, _cache_key, @@ -385,15 +404,5 @@ class ProtonDownloader(Gtk.Dialog): widget.set_sensitive(True) -# ── Main ────────────────────────────────────────────────────────────── - - -def main(): - apply_dark_theme() - win = ProtonDownloader() - win.connect("destroy", Gtk.main_quit) - Gtk.main() - - if __name__ == "__main__": main() diff --git a/fungus-run.py b/fungus-run.py index 5373a7a..c5753d7 100644 --- a/fungus-run.py +++ b/fungus-run.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 +import argparse import os import sys @@ -9,7 +10,34 @@ dev_site_packages = os.path.join(base_dir, "lib", "python3.*", "site-packages") if os.path.exists(dev_site_packages): sys.path.insert(0, dev_site_packages) -from fungus.run_manager import main +from fungus.logger import set_level +import logging + + +def main() -> None: + parser = argparse.ArgumentParser(description="Launch a game via Fungus.") + parser.add_argument("-v", "--verbose", action="store_true", + help="Enable debug logging output") + parser.add_argument("--game") + parser.add_argument("--cmd", help="Override the game executable path") + parser.add_argument("--igpu", action="store_true", + help="Force integrated GPU") + args = parser.parse_args() + + if args.verbose: + set_level(logging.DEBUG) + + from fungus.run_manager import handle_command, load_game_from_json + + if not args.game: + parser.error("no game provided. Use --game <gameid>.") + + game = load_game_from_json(args.game) + if not game: + parser.error(f'game "{args.game}" not found in games.json.') + + handle_command(game, cmd_override=args.cmd, igpu=args.igpu) + if __name__ == "__main__": main() diff --git a/fungus/logger.py b/fungus/logger.py new file mode 100644 index 0000000..41955cf --- /dev/null +++ b/fungus/logger.py @@ -0,0 +1,69 @@ +#!/usr/bin/python3 +"""Centralised logging configuration for Fungus Launcher. + +Sets up a root logger with a single console handler that writes to +stderr (so stdout remains clean for pipes). All submodules should +obtain their logger via ``get_logger(name)`` rather than calling +``logging.getLogger`` directly — this ensures the handler is +installed exactly once at first call. + +Usage:: + + from fungus.logger import get_logger, set_level + log = get_logger(__name__) + log.info("something happened") + log.debug("verbose details") + log.error("something went wrong: %s", exc) + + # Enable debug output from the CLI:: + + set_level(logging.DEBUG) +""" + +import logging +import sys + +_handler: logging.Handler | None = None + + +def set_level(level: int) -> None: + """Set the minimum logging level for all loggers. + + Installs the handler if it has not yet been created, then sets + both the root logger and the handler to *level*. + """ + global _handler + + if not _handler: + _handler = logging.StreamHandler(sys.stderr) + _handler.setFormatter( + logging.Formatter("[%(name)s] %(levelname)s %(message)s") + ) + logging.root.addHandler(_handler) + + logging.root.setLevel(level) + _handler.setLevel(level) + + +def get_logger(name: str | None = None) -> logging.Logger: + """Return a logger named *name* (or the root logger). + + The first call installs a ``StreamHandler`` writing to + ``sys.stderr`` with a simple ``[name] level message`` format. + Subsequent calls reuse the same handler. + """ + global _handler + + logger = logging.getLogger(name) + + if not _handler: + _handler = logging.StreamHandler(sys.stderr) + _handler.setFormatter( + logging.Formatter("[%(name)s] %(levelname)s %(message)s") + ) + logger.addHandler(_handler) + + # Leave the logger at NOTSET so it inherits from the root logger. + # The handler's own level (INFO by default) controls the minimum + # severity; passing -v/--verbose raises it to DEBUG. + return logger diff --git a/fungus/run_manager.py b/fungus/run_manager.py index 602be8e..4c490c0 100644 --- a/fungus/run_manager.py +++ b/fungus/run_manager.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -import argparse import dbus # type: ignore import gi # type: ignore import os @@ -1014,27 +1013,4 @@ def load_game_from_json(gameid): return None -def main(): - """CLI entry point — parse args, load game, and launch it.""" - from fungus.dark_theme import apply_dark_theme - apply_dark_theme() - - parser = argparse.ArgumentParser(description=None) - parser.add_argument("--game") - parser.add_argument("--cmd", help="Override the game executable path") - parser.add_argument("--igpu", action="store_true", - help="Force integrated GPU (overrides global discrete-GPU setting)") - - args = parser.parse_args() - - if not args.game: - log.error("no game provided. Use --game <gameid>.") - sys.exit(1) - - game = load_game_from_json(args.game) - if not game: - log.error('game "%s" not found in games.json.', args.game) - sys.exit(1) - - handle_command(game, cmd_override=args.cmd, igpu=args.igpu) |
