From 86380766ac8253208c4d79338757993ba4746005 Mon Sep 17 00:00:00 2001 From: Gnarwhal Date: Wed, 4 Sep 2024 17:51:58 +0000 Subject: [PATCH 1/2] loggers => _loggers --- src/sshare/logger.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sshare/logger.py b/src/sshare/logger.py index 084292f..d586028 100644 --- a/src/sshare/logger.py +++ b/src/sshare/logger.py @@ -17,25 +17,25 @@ from sshare.plugin import Plugin class Logger: def __init__(self, *args, **kwargs): if kwargs.get("preload_command_line") == True: - self.loggers = [ Plugin.internal("command_line") ] + self._loggers = [ Plugin.internal("command_line") ] else: - self.loggers = [] + self._loggers = [] self.add(*args) def add(self, *args, **kwargs): for logger in args: - self.loggers.append() + self._loggers.append() def info(self, message): - for logger in self.loggers: + for logger in self._loggers: logger.info(message) def warn(self, message): - for logger in self.loggers: + for logger in self._loggers: logger.warn(message) def error(self, message): - for logger in self.loggers: + for logger in self._loggers: logger.error(message) def fatal(self, message, error_code=1): From 528115691a7c034a95f8a56bfb14dae90a1606a9 Mon Sep 17 00:00:00 2001 From: Gnarwhal Date: Wed, 4 Sep 2024 17:53:01 +0000 Subject: [PATCH 2/2] Use __str__ to print plugin arguments --- src/sshare/main.py | 2 +- src/sshare/plugins/config.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sshare/main.py b/src/sshare/main.py index 445c046..18b0e5d 100644 --- a/src/sshare/main.py +++ b/src/sshare/main.py @@ -150,7 +150,7 @@ def main(): if isinstance(plugin.activate, dict): criteria = plugin.activate[plugin_type] for criterion in criteria: - logger.error(f" {plugin.args[criterion].pretty()}") + logger.error(f" {plugin.args[criterion]}") error = True if error: sys.exit(1) diff --git a/src/sshare/plugins/config.py b/src/sshare/plugins/config.py index 7fb7c2a..305a546 100644 --- a/src/sshare/plugins/config.py +++ b/src/sshare/plugins/config.py @@ -39,10 +39,7 @@ class Argument: self.choices = choices self.help = help - def is_valid(self): - return (self.short != None and self.short != "") or (self.long != None and self.long != "") - - def pretty(self): + def __str__(self): if self.short and self.long: pretty = f"-{self.short}, --{self.long}" elif self.long: @@ -51,6 +48,9 @@ class Argument: pretty = f"-{self.short}" return pretty + f" {self.help}" + def is_valid(self): + return (self.short != None and self.short != "") or (self.long != None and self.long != "") + def bind(self, plugin, argument): self.plugin = plugin self.metavar = argument