omdev 0.0.0.dev529__tar.gz → 0.0.0.dev530__tar.gz

{omdev-0.0.0.dev529/omdev.egg-info → omdev-0.0.0.dev530}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev529
+Version: 0.0.0.dev530
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev529
+Requires-Dist: omlish==0.0.0.dev530
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev529 → omdev-0.0.0.dev530}/omdev/tui/apps/irc/app.py

@@ -10,6 +10,7 @@ TODO:
 import shlex
 import typing as ta
 
+from omlish import check
 from omlish import lang
 
 from ... import textual as tx
@@ -90,7 +91,7 @@ class IrcApp(tx.App):
         self._window_order: list[str] = ['system']
         self._current_window_idx: int = 0
         self._current_channel: str | None = None
-        self._startup_commands: ta.Sequence[str] = startup_commands or []
+        self._startup_commands: ta.Sequence[str] = check.not_isinstance(startup_commands or [], str)
 
     @property
     def client(self) -> IrcClient | None:

omdev-0.0.0.dev530/omdev/tui/apps/irc/main.py

@@ -0,0 +1,84 @@
+import os.path
+import tomllib
+import typing as ta
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import marshal as msh
+from omlish.argparse import all as argparse
+
+from ....home.paths import get_home_paths
+from .app import IrcApp
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Config:
+    autoexec: ta.Sequence[str] | None = None
+
+
+def load_config(cfg_file: str | None = None) -> Config | None:
+    if cfg_file is not None:
+        check.state(os.path.exists(cfg_file), 'Config file does not exist')
+
+    else:
+        cfg_file = os.path.join(get_home_paths().config_dir, 'irc.toml')
+        if not os.path.exists(cfg_file):
+            return None
+
+    with open(cfg_file) as f:
+        cfg_src = f.read()
+
+    cfg_dct = tomllib.loads(cfg_src)
+    return msh.unmarshal(cfg_dct, Config)
+
+
+##
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser(description='Simple IRC client using Textual')
+
+    parser.add_argument(
+        '-x',
+        action='append',
+        dest='commands',
+        help='Execute slash command on startup (can be specified multiple times)',
+    )
+
+    parser.add_argument('-c', '--config', help='Specify config file')
+    parser.add_argument('-C', '--no-config', action='store_true', help='Disable config file')
+
+    args = parser.parse_args()
+
+    #
+
+    cfg: Config | None = None
+    if not args.no_config:
+        cfg = load_config(args.config)
+
+    #
+
+    autoexec: list[str] = []
+
+    if cfg is not None:
+        if isinstance(cfg.autoexec, str):
+            autoexec.append(cfg.autoexec)
+        elif cfg.autoexec:
+            autoexec.extend(cfg.autoexec)
+
+    if args.commands:
+        autoexec.extend(args.commands)
+
+    #
+
+    app = IrcApp(
+        startup_commands=autoexec,
+    )
+    app.run()
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev529 → omdev-0.0.0.dev530/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev529
+Version: 0.0.0.dev530
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev529
+Requires-Dist: omlish==0.0.0.dev530
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev529 → omdev-0.0.0.dev530}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev529
+omlish==0.0.0.dev530
 
 [all]
 black~=26.1

{omdev-0.0.0.dev529 → omdev-0.0.0.dev530}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev529'
+version = '0.0.0.dev530'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev529',
+    'omlish == 0.0.0.dev530',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev529/omdev/tui/apps/irc/main.py

@@ -1,26 +0,0 @@
-from omlish.argparse import all as argparse
-
-from .app import IrcApp
-
-
-##
-
-
-def _main() -> None:
-    parser = argparse.ArgumentParser(description='Simple IRC client using Textual')
-    parser.add_argument(
-        '-x',
-        action='append',
-        dest='commands',
-        help='Execute slash command on startup (can be specified multiple times)',
-    )
-    args = parser.parse_args()
-
-    app = IrcApp(
-        startup_commands=args.commands,
-    )
-    app.run()
-
-
-if __name__ == '__main__':
-    _main()