Display loaded plugins under "--diagnostic" rather than "--version"

This commit is contained in:
MinchinWeb 2021-06-26 23:08:24 -06:00
parent 7efa5534a1
commit 84cb67204e

View file

@ -17,16 +17,6 @@ import sys
def preconfig_diagnostic(_): def preconfig_diagnostic(_):
from jrnl import __version__ from jrnl import __version__
print(
f"jrnl: {__version__}\n"
f"Python: {sys.version}\n"
f"OS: {platform.system()} {platform.release()}"
)
def preconfig_version(_):
from jrnl import __version__
from jrnl.plugins.collector import ( from jrnl.plugins.collector import (
IMPORT_FORMATS, IMPORT_FORMATS,
EXPORT_FORMATS, EXPORT_FORMATS,
@ -34,14 +24,11 @@ def preconfig_version(_):
get_importer, get_importer,
) )
version_str = f"""jrnl version {__version__} print(
f"jrnl: {__version__}\n"
Copyright (C) 2012-2021 jrnl contributors f"Python: {sys.version}\n"
f"OS: {platform.system()} {platform.release()}"
This is free software, and you are welcome to redistribute it under certain )
conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
print(version_str)
print() print()
print("Active Plugins:") print("Active Plugins:")
print(" Importers:") print(" Importers:")
@ -60,6 +47,19 @@ conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
print(f"{exporter_class().class_path()}") print(f"{exporter_class().class_path()}")
def preconfig_version(_):
from jrnl import __version__
version_str = f"""jrnl version {__version__}
Copyright (C) 2012-2021 jrnl contributors
This is free software, and you are welcome to redistribute it under certain
conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
print(version_str)
def postconfig_list(config, **kwargs): def postconfig_list(config, **kwargs):
from .output import list_journals from .output import list_journals