Compare commits

..

No commits in common. "528115691a7c034a95f8a56bfb14dae90a1606a9" and "a9fa15d643069c36909a2403c643d88f86e8c7ab" have entirely different histories.

3 changed files with 11 additions and 11 deletions

View file

@ -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):

View file

@ -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]}")
logger.error(f" {plugin.args[criterion].pretty()}")
error = True
if error:
sys.exit(1)

View file

@ -39,7 +39,10 @@ class Argument:
self.choices = choices
self.help = help
def __str__(self):
def is_valid(self):
return (self.short != None and self.short != "") or (self.long != None and self.long != "")
def pretty(self):
if self.short and self.long:
pretty = f"-{self.short}, --{self.long}"
elif self.long:
@ -48,9 +51,6 @@ 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