From 1aed6ea81653d1ecb86c29c712e52f4d041b3dab Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Wed, 17 Jun 2026 05:21:02 +0545 Subject: [PATCH] refactor(src/shared): replace print statements with logger.error Use centralized logging instead of stdout prints to improve observability and consistency --- src/shared/data.py | 3 ++- src/shared/dialogs/about.py | 18 +++++++++--------- src/shared/window/applet_window.py | 5 ++++- src/shared/window/battery_widget.py | 5 +++-- src/shared/window/dropdown.py | 5 +++-- src/shared/window/popup_win.py | 10 +++++----- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/shared/data.py b/src/shared/data.py index 429635e..8add0a5 100644 --- a/src/shared/data.py +++ b/src/shared/data.py @@ -1,3 +1,4 @@ +from fabric.utils import logger import json from fabric.utils import Gdk, GLib, get_relative_path, os @@ -41,7 +42,7 @@ def load_config(): with open(CONFIG_FILE, "r") as f: config = json.load(f) except Exception as e: - print(f"Error loading config: {e}") + logger.error(f"Error loading config: {e}") return config diff --git a/src/shared/dialogs/about.py b/src/shared/dialogs/about.py index 0c41648..cbbd746 100644 --- a/src/shared/dialogs/about.py +++ b/src/shared/dialogs/about.py @@ -1,6 +1,6 @@ import subprocess -from fabric.utils import GdkPixbuf, Gtk, get_relative_path, os, re +from fabric.utils import GdkPixbuf, Gtk, get_relative_path, os, re, logger from utils.functions import escape_markup_text from utils.icon_resolver import IconResolver @@ -73,8 +73,8 @@ def get_executable_path(exec_string): result = subprocess.run(["which", executable], capture_output=True, text=True) if result.returncode == 0: return result.stdout.strip() - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") return None @@ -212,8 +212,8 @@ def get_app_info(wmclass): ) if result.returncode == 0: location = result.stdout.strip() - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") return { "name": wmclass.title() if wmclass else "Unknown Application", @@ -261,8 +261,8 @@ class AboutApp(Gtk.Window): icon_pixbuf = self.icon_resolver.get_icon_pixbuf(app_info["icon"], 128) if icon_pixbuf: logo = Gtk.Image.new_from_pixbuf(icon_pixbuf) - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") if not logo: try: @@ -273,8 +273,8 @@ class AboutApp(Gtk.Window): icon_path, 128, 128, True ) logo = Gtk.Image.new_from_pixbuf(pixbuf) - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") if not logo: # 3. Final fallback diff --git a/src/shared/window/applet_window.py b/src/shared/window/applet_window.py index ed30399..6c15bb8 100644 --- a/src/shared/window/applet_window.py +++ b/src/shared/window/applet_window.py @@ -1,3 +1,4 @@ +from fabric.utils import logger from fabric.utils import GLib from fabric.widgets.eventbox import EventBox # noqa: E402 from fabric.widgets.wayland import WaylandWindow as Window # noqa: E402 @@ -51,7 +52,9 @@ class AppletWindow(PopupWindow): else: active.hide() except Exception as e: - print(f"[AppletWindow] Warning: failed to close active popup: {e}") + logger.error( + f"[AppletWindow] Warning: failed to close active popup: {e}" + ) AppletWindow._active_popup = self diff --git a/src/shared/window/battery_widget.py b/src/shared/window/battery_widget.py index e4da3f1..4b2dfd0 100644 --- a/src/shared/window/battery_widget.py +++ b/src/shared/window/battery_widget.py @@ -1,3 +1,4 @@ +from fabric.utils import logger from fabric.utils import GLib from fabric.widgets.box import Box from fabric.widgets.button import Button @@ -125,7 +126,7 @@ class GameModeButton(Box): toggle_gamemode() GLib.timeout_add(500, lambda: self.update_state()) except Exception as e: - print(f"Failed to toggle game mode: {e}") + logger.error(f"Failed to toggle game mode: {e}") GLib.timeout_add(300, lambda: self._reset_icon_state()) @@ -140,7 +141,7 @@ class GameModeButton(Box): else: self.game_icon.remove_style_class("connected") except Exception as e: - print(f"Failed to check game mode status: {e}") + logger.error(f"Failed to check game mode status: {e}") self.game_icon.remove_style_class("connected") return False # Remove timeout if called from GLib.timeout_add diff --git a/src/shared/window/dropdown.py b/src/shared/window/dropdown.py index e74fbf2..9248b5e 100644 --- a/src/shared/window/dropdown.py +++ b/src/shared/window/dropdown.py @@ -1,3 +1,4 @@ +from fabric.utils import logger from fabric.widgets.box import Box from fabric.widgets.centerbox import CenterBox from fabric.widgets.eventbox import EventBox @@ -87,7 +88,7 @@ class ModusDropdown(AppletWindow): try: modus_service.disconnect_by_func(self.hide_dropdown) - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") super().destroy() diff --git a/src/shared/window/popup_win.py b/src/shared/window/popup_win.py index 603fd24..624470a 100644 --- a/src/shared/window/popup_win.py +++ b/src/shared/window/popup_win.py @@ -1,4 +1,4 @@ -from fabric.utils import Gdk, GLib, Gtk +from fabric.utils import Gdk, GLib, Gtk, logger from fabric.widgets.wayland import WaylandWindow from gi.repository import GtkLayerShell @@ -51,8 +51,8 @@ class PopupWindow(WaylandWindow): if self._pointing_widget: try: self._pointing_widget.disconnect_by_func(self.do_handle_size_allocate) - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") self._pointing_widget = widget return self.do_update_handlers() @@ -74,8 +74,8 @@ class PopupWindow(WaylandWindow): try: self._pointing_widget.disconnect_by_func(self.do_handle_size_allocate) self.disconnect_by_func(self.do_handle_size_allocate) - except Exception: - pass + except Exception as e: + logger.error(f"An error occurred: {e}") return self._pointing_widget.connect("size-allocate", self.do_handle_size_allocate)