Browse Source

refactor: move the main routine outside the a folder (#400)

pull/407/head
Pier CeccoPierangioliEugenio 10 months ago committed by GitHub
parent
commit
b1bb71fd1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      apps/tlogg/pyproject.toml
  2. 2
      apps/tlogg/tlogg/__init__.py
  3. 52
      apps/tlogg/tlogg/__main__.py
  4. 38
      apps/tlogg/tlogg/app/main.py
  5. 2
      apps/tlogg/tlogg/helper.py

4
apps/tlogg/pyproject.toml

@ -40,7 +40,9 @@ Changelog = "https://github.com/ceccopierangiolieugenio/pyTermTk/blob/main/apps
tlogg = "tlogg.__main__:main" tlogg = "tlogg.__main__:main"
[tool.setuptools] [tool.setuptools]
packages = ["tlogg", "tlogg.app", "tlogg.plugins"] packages = [
"tlogg", "tlogg.app",
"tlogg.plugins"]
[tool.setuptools.dynamic] [tool.setuptools.dynamic]
version = {attr = "tlogg.__version__"} version = {attr = "tlogg.__version__"}

2
apps/tlogg/tlogg/__init__.py

@ -24,4 +24,4 @@ __version__:str = '0.5.0-a.0'
from .plugin import TloggPlugin from .plugin import TloggPlugin
from .proxy import tloggProxy, TloggViewerProxy from .proxy import tloggProxy, TloggViewerProxy
from .helper import * from .helper import TloggHelper

52
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 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # 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__': if __name__ == '__main__':
main() main()

38
apps/tlogg/tlogg/app/main.py

@ -171,41 +171,3 @@ class TLOGG(TTkGridLayout):
loggWidget = LoggWidget(file) loggWidget = LoggWidget(file)
self._kodeTab.addTab(widget=loggWidget, label=os.path.basename(file), data=file) self._kodeTab.addTab(widget=loggWidget, label=os.path.basename(file), data=file)
self._kodeTab.setCurrentWidget(loggWidget) 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()

2
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 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
__all__ = ['TloggHelper']
import importlib, pkgutil import importlib, pkgutil
import runpy import runpy
import sys, os import sys, os

Loading…
Cancel
Save