From b1bb71fd1ecd9c41a4cb016de15f1d695ea58ba5 Mon Sep 17 00:00:00 2001 From: Pier CeccoPierangioliEugenio Date: Fri, 9 May 2025 14:20:14 +0100 Subject: [PATCH] refactor: move the main routine outside the a folder (#400) --- apps/tlogg/pyproject.toml | 4 ++- apps/tlogg/tlogg/__init__.py | 2 +- apps/tlogg/tlogg/__main__.py | 52 +++++++++++++++++++++++++++++++++++- apps/tlogg/tlogg/app/main.py | 38 -------------------------- apps/tlogg/tlogg/helper.py | 2 ++ 5 files changed, 57 insertions(+), 41 deletions(-) diff --git a/apps/tlogg/pyproject.toml b/apps/tlogg/pyproject.toml index e98499a2..bc8f4cdc 100644 --- a/apps/tlogg/pyproject.toml +++ b/apps/tlogg/pyproject.toml @@ -40,7 +40,9 @@ Changelog = "https://github.com/ceccopierangiolieugenio/pyTermTk/blob/main/apps tlogg = "tlogg.__main__:main" [tool.setuptools] -packages = ["tlogg", "tlogg.app", "tlogg.plugins"] +packages = [ + "tlogg", "tlogg.app", + "tlogg.plugins"] [tool.setuptools.dynamic] version = {attr = "tlogg.__version__"} diff --git a/apps/tlogg/tlogg/__init__.py b/apps/tlogg/tlogg/__init__.py index 2a0f0120..afee79ec 100755 --- a/apps/tlogg/tlogg/__init__.py +++ b/apps/tlogg/tlogg/__init__.py @@ -24,4 +24,4 @@ __version__:str = '0.5.0-a.0' from .plugin import TloggPlugin from .proxy import tloggProxy, TloggViewerProxy -from .helper import * +from .helper import TloggHelper diff --git a/apps/tlogg/tlogg/__main__.py b/apps/tlogg/tlogg/__main__.py index 22bab16d..b54413df 100644 --- a/apps/tlogg/tlogg/__main__.py +++ b/apps/tlogg/tlogg/__main__.py @@ -22,7 +22,57 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from .app import main +__all__ = [] + +import argparse +import appdirs + +import TermTk as ttk + +from tlogg.app.main import TLOGG +from tlogg.app.cfg import TloggCfg +from tlogg.app.options import optionsLoadTheme + +from tlogg.proxy import tloggProxy +from tlogg.helper import TloggHelper + +def main(): + TloggCfg.pathCfg = appdirs.user_config_dir("tlogg") + + parser = argparse.ArgumentParser() + # parser.add_argument('-f', help='Full Screen', action='store_true') + parser.add_argument('-c', help=f'config folder (default: "{TloggCfg.pathCfg}")', default=TloggCfg.pathCfg) + parser.add_argument('filename', type=str, nargs='*', + help='the filename/s') + args = parser.parse_args() + + # TTkLog.use_default_file_logging() + + TloggCfg.pathCfg = args.c + ttk.TTkLog.debug(f"Config Path: {TloggCfg.pathCfg}") + + TloggCfg.load() + + if 'theme' not in TloggCfg.options: + TloggCfg.options['theme'] = 'UTF8' + optionsLoadTheme(TloggCfg.options['theme']) + + TloggHelper._loadPlugins() + + root = ttk.TTk( + title="tlogg", + layout=(tlogg:=TLOGG(tloggProxy=tloggProxy)), + sigmask=( + ttk.TTkTerm.Sigmask.CTRL_C | + ttk.TTkTerm.Sigmask.CTRL_Q | + ttk.TTkTerm.Sigmask.CTRL_S | + ttk.TTkTerm.Sigmask.CTRL_Z )) + TloggHelper._runPlugins() + + for file in args.filename: + tlogg.openFile(file) + + root.mainloop() if __name__ == '__main__': main() \ No newline at end of file diff --git a/apps/tlogg/tlogg/app/main.py b/apps/tlogg/tlogg/app/main.py index 13a5cd1d..6b71581c 100644 --- a/apps/tlogg/tlogg/app/main.py +++ b/apps/tlogg/tlogg/app/main.py @@ -171,41 +171,3 @@ class TLOGG(TTkGridLayout): loggWidget = LoggWidget(file) self._kodeTab.addTab(widget=loggWidget, label=os.path.basename(file), data=file) self._kodeTab.setCurrentWidget(loggWidget) - -def main(): - TloggCfg.pathCfg = appdirs.user_config_dir("tlogg") - - parser = argparse.ArgumentParser() - # parser.add_argument('-f', help='Full Screen', action='store_true') - parser.add_argument('-c', help=f'config folder (default: "{TloggCfg.pathCfg}")', default=TloggCfg.pathCfg) - parser.add_argument('filename', type=str, nargs='*', - help='the filename/s') - args = parser.parse_args() - - # TTkLog.use_default_file_logging() - - TloggCfg.pathCfg = args.c - TTkLog.debug(f"Config Path: {TloggCfg.pathCfg}") - - TloggCfg.load() - - if 'theme' not in TloggCfg.options: - TloggCfg.options['theme'] = 'UTF8' - optionsLoadTheme(TloggCfg.options['theme']) - - TloggHelper._loadPlugins() - - root = TTk( - title="tlogg", - layout=(tlogg:=TLOGG(tloggProxy=tloggProxy)), - sigmask=( - TTkTerm.Sigmask.CTRL_C | - TTkTerm.Sigmask.CTRL_Q | - TTkTerm.Sigmask.CTRL_S | - TTkTerm.Sigmask.CTRL_Z )) - TloggHelper._runPlugins() - - for file in args.filename: - tlogg.openFile(file) - - root.mainloop() \ No newline at end of file diff --git a/apps/tlogg/tlogg/helper.py b/apps/tlogg/tlogg/helper.py index 9619375a..8fb869b1 100644 --- a/apps/tlogg/tlogg/helper.py +++ b/apps/tlogg/tlogg/helper.py @@ -20,6 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +__all__ = ['TloggHelper'] + import importlib, pkgutil import runpy import sys, os