add rich to prettier output

Author: teilorr

pyproject.toml

@@ -8,6 +8,7 @@ license-files = ["LICEN[CS]E*"]
 requires-python = ">=3.13"
 dependencies = [
     "requests>=2.33.1",
+    "rich>=15.0.0",
 ]
 classifiers = [
     "Development Status :: 3 - Alpha",

steamlayer/bootstrap/defender.py

@@ -53,19 +53,19 @@ def check_defender_exclusion(path: str) -> bool:
 
 
 def warn_about_defender_if_needed(vendors_path: str) -> None:
-    if not is_realtime_protection_on():
-        return
-
-    if check_defender_exclusion(vendors_path):
-        return
-
     section = "defender"
     shown = state.get(section, "warning_count", 0)
 
     if shown >= MAX_WARNINGS:
         log.debug("Defender warning suppressed (shown %d times).", shown)
         return
 
+    if not is_realtime_protection_on():
+        return
+
+    if check_defender_exclusion(vendors_path):
+        return
+
     log.warning(
         "\n"
         "┌─ Windows Defender Warning ──────────────────────────────────────────┐\n"

steamlayer/core.py

@@ -27,7 +27,7 @@
     GameRestorer,
 )
 from steamlayer.http_client import HTTPClient
-from steamlayer.logging_utils import configure_logging
+from steamlayer.logging_utils import configure_logging, spinner, success
 
 log = logging.getLogger("steamlayer.core")
 
@@ -47,15 +47,15 @@ def _run_discovery_and_patch(
             strict=args.strict,
         )
         game.appid = result.appid
-        log.info(f"Found appid '{game.appid}'")
 
     if game.appid is not None:
         dlc_cache_path = args.cache_dir / f"dlcs_{game.appid}.json"
-        game.dlcs = discoverer.fetch_dlcs(
-            game.appid,
-            cache_path=dlc_cache_path,
-            allow_network=not args.no_network,
-        )
+        with spinner("Fetching DLC metadata..."):
+            game.dlcs = discoverer.fetch_dlcs(
+                game.appid,
+                cache_path=dlc_cache_path,
+                allow_network=not args.no_network,
+            )
 
     config = GoldbergConfig().set_dlcs(game.dlcs)
     patcher = GamePatcher(
@@ -171,8 +171,11 @@ def main() -> None:
 
     emulator = Goldberg(path=VENDORS_PATH / "goldberg")
     if args.restore:
-        restorer = GameRestorer(game=game, emulator=emulator, dry_run=args.dry_run)
-        restorer.run()
+        with spinner("Restoring the patch..."):
+            restorer = GameRestorer(game=game, emulator=emulator, dry_run=args.dry_run)
+            restorer.run()
+            if not args.dry_run:
+                success(f"Restored '{game.path.name}' successfully.")
         return
 
     if args.no_network:
@@ -186,14 +189,20 @@ def main() -> None:
     with HTTPClient() as http:
         try:
             if not args.no_defender_check:
-                warn_about_defender_if_needed(str(VENDORS_PATH))
+                with spinner("Checking if real-time protection is on..."):
+                    warn_about_defender_if_needed(str(VENDORS_PATH))
 
             if args.unpack:
-                SteamlessBootstrapper(VENDORS_PATH / "steamless", http=http).ensure(
-                    allow_network=not args.no_network
-                )
-            SevenZipBootstrapper(VENDORS_PATH / "7zip", http).ensure(allow_network=not args.no_network)
-            GoldbergBootstrapper(VENDORS_PATH / "goldberg", http).ensure(allow_network=not args.no_network)
+                with spinner("Bootstrapping Steamless..."):
+                    SteamlessBootstrapper(VENDORS_PATH / "steamless", http=http).ensure(
+                        allow_network=not args.no_network
+                    )
+
+            with spinner("Bootstrapping 7-Zip..."):
+                SevenZipBootstrapper(VENDORS_PATH / "7zip", http).ensure(allow_network=not args.no_network)
+
+            with spinner("Bootstrapping Goldberg..."):
+                GoldbergBootstrapper(VENDORS_PATH / "goldberg", http).ensure(allow_network=not args.no_network)
 
         except RuntimeError as e:
             log.error(str(e))
@@ -202,6 +211,12 @@ def main() -> None:
         discoverer = DiscoveryFacade(http=http, allow_network=not args.no_network)
         _run_discovery_and_patch(args, game, emulator, discoverer)
 
+    dlc_count = len(game.dlcs)
+    success(
+        f"{'[DRY RUN] ' if args.dry_run else ''}Patched '{game.path.name}' "
+        f"(AppID {game.appid}, {dlc_count} DLC{'s' if dlc_count != 1 else ''})"
+    )
+
     duration = round(time.time() - start_time, 2)
     log.debug(f"Done in: {duration}s")
 

steamlayer/discovery/resolver.py

@@ -3,6 +3,8 @@
 import logging
 import pathlib
 
+from steamlayer.logging_utils import spinner
+
 from .decision import DecisionPolicy
 from .interaction import InteractiveSelector
 from .local import LocalDiscovery
@@ -129,38 +131,41 @@ def resolve(
                 confidence=1.0,
             )
 
-        original_name = game_path.name
-        local_id = self.local.find(game_path)
-        if local_id:
-            return DiscoveryResult(appid=local_id, source=DiscoverySource.LOCAL, confidence=1.0)
+        with spinner("Looking in the local game files..."):
+            original_name = game_path.name
+            local_id = self.local.find(game_path)
+            if local_id:
+                return DiscoveryResult(appid=local_id, source=DiscoverySource.LOCAL, confidence=1.0)
 
-        index_res = self._find_local_index(original_name)
-        all_candidates: list[DiscoveryResult] = []
-        if index_res.appid is not None:
-            if index_res.confidence >= 0.85:
-                log.info(f"Resolved via local index: {index_res.appid}")
-                return index_res
+        with spinner("Looking in the local index..."):
+            index_res = self._find_local_index(original_name)
+            all_candidates: list[DiscoveryResult] = []
+            if index_res.appid is not None:
+                if index_res.confidence >= 0.85:
+                    log.info(f"Resolved via local index: {index_res.appid}")
+                    return index_res
 
-            elif index_res.confidence > 0.4:
-                all_candidates.append(index_res)
+                elif index_res.confidence > 0.4:
+                    all_candidates.append(index_res)
 
         if not allow_network:
             log.warning("AppID discovery failed. Network is disabled.")
             return DiscoveryResult(source=DiscoverySource.NONE)
 
         log.info(f"Searching Steam for: '{original_name}'...")
-        queries = self.query_strategy.generate(original_name)
-        for query in queries:
-            log.debug(f"[QUERY] Trying: '{query}'")
-            web_results = self._find_web(query)
-
-            for res in web_results:
-                res.confidence = self.matcher.calculate_confidence(original_name, res.game_name or "")
-                if res.confidence > 0.4:
-                    all_candidates.append(res)
-
-            if any(c.confidence >= 1.0 for c in all_candidates):
-                break
+        with spinner(f"Searching steam for {original_name}..."):
+            queries = self.query_strategy.generate(original_name)
+            for query in queries:
+                log.debug(f"[QUERY] Trying: '{query}'")
+                web_results = self._find_web(query)
+
+                for res in web_results:
+                    res.confidence = self.matcher.calculate_confidence(original_name, res.game_name or "")
+                    if res.confidence > 0.4:
+                        all_candidates.append(res)
+
+                if any(c.confidence >= 1.0 for c in all_candidates):
+                    break
 
         if all_candidates:
             all_candidates.sort(key=lambda x: x.confidence, reverse=True)

steamlayer/game.py

@@ -6,6 +6,7 @@
 
 from steamlayer.emulators import Emulator, EmulatorConfig
 from steamlayer.fileops import BackedUpFile, SteamAPIDll
+from steamlayer.logging_utils import spinner
 from steamlayer.steamstub import SteamlessCLI, SteamStubScanner
 
 log = logging.getLogger("steamlayer." + __name__)
@@ -85,17 +86,9 @@ def _handle_steamstub(self, dlls: list[SteamAPIDll]) -> None:
             return
 
         if not self.unpack:
-            log.warning("─" * 60)
-            log.warning("⚠  STEAMSTUB (SteamDRM) DETECTED")
-            log.warning(
-                "\nOne or more executables are wrapped with SteamStub. Replacing the DLL might not be enough."
-            )
             for exe, variant in sorted(wrapped.items()):
                 rel = exe.relative_to(self.game.path) if exe.is_relative_to(self.game.path) else exe
-                log.warning(f"  {rel}  [{variant}]")
-
-            log.warning("\nRECOMMENDED: Run with '--unpack' to automate DRM removal via Steamless.")
-            log.warning("─" * 60)
+                log.warning(f"SteamStub detected on '{rel}' ({variant}) — re-run with --unpack to strip it.")
             return
 
         dry_prefix = "[DRY RUN] " if self.dry_run else ""
@@ -153,45 +146,49 @@ def run(self) -> None:
         if not dlls:
             raise FileNotFoundError("No Steam API DLLs found in game directory.")
 
-        self._handle_steamstub(dlls)
+        with spinner("Handling steamstub..."):
+            self._handle_steamstub(dlls)
 
-        for dll in dlls:
-            relative_path = dll.file.relative_to(self.game.path)
-            vault_dest = self.vault_root / relative_path
-            dll.set_backup_destination(vault_dest)
-
-        if self.dry_run:
-            patched_dlls = dlls  # used for logging at the end
+        with spinner("Patching the game..."):
             for dll in dlls:
-                log.info(f"[DRY RUN] Would vault original to: {dll.backup_path}")
-                log.info(f"[DRY RUN] Would overwrite: {dll.file}")
-
-            for target_dir in {d.file.parent for d in dlls}:
-                log.info(
-                    f"[DRY RUN] Would configure '{target_dir}' using the following flags: "
-                    f"(APPID={self.game.appid} DLLS={dlls} DLCS={self.game.dlcs}). "
-                    f"User-specific information would also be correctly written."
-                )
-
-        else:
-            patched_dlls = self.emulator.patch_game(dlls=dlls)
-            try:
-                self.emulator.create_config_files(
-                    config=self.config,
-                    appid=self.game.appid,
-                    game_path=self.game.path,
-                    dll_paths=[d.file for d in patched_dlls],
-                )
-            except Exception as e:
-                log.error(
-                    f"Config creation failed: {e}. The DLL patch was still applied "
-                    "— the game may still work with default settings."
-                )
+                relative_path = dll.file.relative_to(self.game.path)
+                vault_dest = self.vault_root / relative_path
+                dll.set_backup_destination(vault_dest)
 
-        dlc_count = len(self.game.dlcs) if self.game.dlcs else 0
-        dll_count = len(patched_dlls)
+            if self.dry_run:
+                patched_dlls = dlls  # used for logging at the end
+                for dll in dlls:
+                    log.info(f"[DRY RUN] Would vault original to: {dll.backup_path}")
+                    log.info(f"[DRY RUN] Would overwrite: {dll.file}")
+
+                for target_dir in {d.file.parent for d in dlls}:
+                    log.info(
+                        f"[DRY RUN] Would configure '{target_dir}' using the following flags: "
+                        f"(APPID={self.game.appid} DLLS={dlls} DLCS={self.game.dlcs}). "
+                        f"User-specific information would also be correctly written."
+                    )
 
-        log.info(f"{dry_prefix}Patch completed successfully (AppID={appid}, DLLs={dll_count}, DLCs={dlc_count})")
+            else:
+                patched_dlls = self.emulator.patch_game(dlls=dlls)
+                try:
+                    self.emulator.create_config_files(
+                        config=self.config,
+                        appid=self.game.appid,
+                        game_path=self.game.path,
+                        dll_paths=[d.file for d in patched_dlls],
+                    )
+                except Exception as e:
+                    log.error(
+                        f"Config creation failed: {e}. The DLL patch was still applied "
+                        "— the game may still work with default settings."
+                    )
+
+            dlc_count = len(self.game.dlcs) if self.game.dlcs else 0
+            dll_count = len(patched_dlls)
+
+            log.info(
+                f"{dry_prefix}Patch completed successfully (AppID={appid}, DLLs={dll_count}, DLCs={dlc_count})"
+            )
 
 
 class GameRestorer: