Kharec/skywipe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: pass logger instead of multiple get_logger() calls

Browse Source
This commit is contained in:
Sandro CURY CAZZANIGA
2025-12-20 22:30:57 +01:00
parent eaf4e94d24
commit ecbee7a8ac
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
skywipe/cli.py
View File

@@ -6,7 +6,7 @@ from pathlib import Path
from .commands import registry from .commands import registry
from .configure import Configuration from .configure import Configuration
from .logger import setup_logger, get_logger from .logger import setup_logger, get_logger, handle_error
LOG_FILE = Path.home() / ".cache" / "skywipe" / "skywipe.log" LOG_FILE = Path.home() / ".cache" / "skywipe" / "skywipe.log"
@@ -39,10 +39,9 @@ def create_parser():
return parser return parser
def require_config(): def require_config(logger):
config = Configuration() config = Configuration()
if not config.exists(): if not config.exists():
logger = get_logger()
logger.error("Configuration file not found.") logger.error("Configuration file not found.")
logger.error("You must run 'skywipe configure' first.") logger.error("You must run 'skywipe configure' first.")
sys.exit(1) sys.exit(1)
@@ -53,9 +52,10 @@ def main():
args = parser.parse_args() args = parser.parse_args()
setup_logger(verbose=False, log_file=LOG_FILE) setup_logger(verbose=False, log_file=LOG_FILE)
logger = get_logger()
if registry.requires_config(args.command): if registry.requires_config(args.command):
require_config() require_config(logger)
config = Configuration() config = Configuration()
config_data = config.load() config_data = config.load()
verbose = config_data.get("verbose", False) verbose = config_data.get("verbose", False)
@@ -64,14 +64,8 @@ def main():
try: try:
registry.execute( registry.execute(
args.command, skip_confirmation=getattr(args, "yes", False)) args.command, skip_confirmation=getattr(args, "yes", False))
except ValueError as e: except (ValueError, Exception) as e:
logger = get_logger() handle_error(e, logger, exit_on_error=True)
logger.error(f"{e}")
sys.exit(1)
except Exception as e:
logger = get_logger()
logger.error(f"Unexpected error: {e}", exc_info=True)
sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':