Gnarwhal 2024-09-01 19:02:36 +00:00
parent 0140759c88
commit 34e0527daf
Signed by: Gnarwhal
GPG key ID: 0989A73D8C421174
3 changed files with 12 additions and 28 deletions

@ -1 +1 @@
Subproject commit a1d5760b4936690ad9c1d925c16519b8e7edcc6b Subproject commit 13160cb81a37b011082ad4e1e3a9f217540c2c24

View file

@ -1,17 +0,0 @@
# This file is part of SSHare.
#
# SSHare is free software: you can redistribute it and/or modify it under the terms of
# the GNU General Public License as published by the Free Software Foundation,
# either version 3 of the License, or (at your option) any later version.
#
# SSHare is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along with
# SSHare. If not, see <https://www.gnu.org/licenses/>.
from main import main
main()

View file

@ -24,11 +24,12 @@ import tomllib
import subprocess import subprocess
import sys import sys
from pathlib import Path from pathlib import Path
from version import version
from plugins.config import Flag from sshare.plugins.config import Flag
from plugins.config import NoArgument from sshare.plugins.config import NoArgument
from plugins.config import NoDefault from sshare.plugins.config import NoDefault
from sshare.version import version
class Congloggerate: class Congloggerate:
def __init__(self, loggers): def __init__(self, loggers):
@ -70,17 +71,17 @@ def main():
# so that it can be used to report errors while loading and # so that it can be used to report errors while loading and
# configuring plugins # configuring plugins
# i.e. before other logging plugins have had a chance to be initialised # i.e. before other logging plugins have had a chance to be initialised
logger = importlib.import_module("plugins.default.command_line") logger = importlib.import_module("sshare.plugins.default.command_line")
fatalicize(logger) fatalicize(logger)
# Load inbuilt plugins # Load inbuilt plugins
plugins_flat = [ plugins_flat = [
Plugin("command_line", logger), Plugin("command_line", logger),
Plugin("file", importlib.import_module("plugins.default.file")), Plugin("file", importlib.import_module("sshare.plugins.default.file")),
Plugin("current_time", importlib.import_module("plugins.default.current_time")), Plugin("current_time", importlib.import_module("sshare.plugins.default.current_time")),
Plugin("append_type", importlib.import_module("plugins.default.append_type")), Plugin("append_type", importlib.import_module("sshare.plugins.default.append_type")),
Plugin("ssh", importlib.import_module("plugins.default.ssh")), Plugin("ssh", importlib.import_module("sshare.plugins.default.ssh")),
Plugin("log_result", importlib.import_module("plugins.default.log_result")), Plugin("log_result", importlib.import_module("sshare.plugins.default.log_result")),
] ]
plugins = {} plugins = {}
for type in [ "logger", "source", "name", "upload", "result" ]: for type in [ "logger", "source", "name", "upload", "result" ]: