dynamically load commands from obsws_cli.commands

no changes to files other than imports

patch bump

obsws_cli/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present onyx-and-iris <code@onyxandiris.online>
 #
 # SPDX-License-Identifier: MIT
-__version__ = '0.24.4'
+__version__ = '0.24.5'

obsws_cli/app.py

@@ -2,6 +2,7 @@
 
 import importlib
 import logging
+import pkgutil
 from typing import Annotated
 
 import obsws_python as obsws
@@ -9,32 +10,15 @@ import typer
 
 from obsws_cli.__about__ import __version__ as version
 
-from . import config, console, styles
+from . import commands, config, console, styles
 from .alias import RootTyperAliasGroup
 
 app = typer.Typer(cls=RootTyperAliasGroup)
-for sub_typer in (
+for importer, modname, ispkg in pkgutil.iter_modules(
-    'filter',
+    commands.__path__, commands.__name__ + '.'
-    'group',
-    'hotkey',
-    'input',
-    'media',
-    'profile',
-    'projector',
-    'record',
-    'replaybuffer',
-    'scene',
-    'scenecollection',
-    'sceneitem',
-    'screenshot',
-    'settings',
-    'stream',
-    'studiomode',
-    'text',
-    'virtualcam',
 ):
-    module = importlib.import_module(f'.{sub_typer}', package=__package__)
+    subtyper = importlib.import_module(modname)
-    app.add_typer(module.app, name=sub_typer)
+    app.add_typer(subtyper.app, name=modname.split('.')[-1])
 
 
 def version_callback(value: bool):

obsws_cli/commands/filter.py

@@ -7,8 +7,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console, util
+from obsws_cli import console, util
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/group.py

@@ -6,9 +6,9 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console, util, validate
+from obsws_cli import console, util, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
-from .protocols import DataclassProtocol
+from obsws_cli.protocols import DataclassProtocol
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/hotkey.py

@@ -6,8 +6,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/input.py

@@ -7,8 +7,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console, util, validate
+from obsws_cli import console, util, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/media.py

@@ -4,8 +4,8 @@ from typing import Annotated, Optional
 
 import typer
 
-from . import console, util, validate
+from obsws_cli import console, util, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/profile.py

@@ -6,8 +6,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console, util, validate
+from obsws_cli import console, util, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/projector.py

@@ -6,8 +6,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/record.py

@@ -5,8 +5,8 @@ from typing import Annotated, Optional
 
 import typer
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/replaybuffer.py

@@ -2,8 +2,8 @@
 
 import typer
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/scene.py

@@ -6,8 +6,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console, util, validate
+from obsws_cli import console, util, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/scenecollection.py

@@ -5,8 +5,8 @@ from typing import Annotated
 import typer
 from rich.table import Table
 
-from . import console, validate
+from obsws_cli import console, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/sceneitem.py

@@ -5,8 +5,8 @@ from typing import Annotated, Optional
 import typer
 from rich.table import Table
 
-from . import console, util, validate
+from obsws_cli import console, util, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/screenshot.py

@@ -6,8 +6,8 @@ from typing import Annotated
 import obsws_python as obsws
 import typer
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/settings.py

@@ -6,8 +6,8 @@ import typer
 from rich.table import Table
 from rich.text import Text
 
-from . import console, util
+from obsws_cli import console, util
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/stream.py

@@ -2,8 +2,8 @@
 
 import typer
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/studiomode.py

@@ -2,8 +2,8 @@
 
 import typer
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/text.py

@@ -4,8 +4,8 @@ from typing import Annotated, Optional
 
 import typer
 
-from . import console, validate
+from obsws_cli import console, validate
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)
 

obsws_cli/commands/virtualcam.py

@@ -2,8 +2,8 @@
 
 import typer
 
-from . import console
+from obsws_cli import console
-from .alias import SubTyperAliasGroup
+from obsws_cli.alias import SubTyperAliasGroup
 
 app = typer.Typer(cls=SubTyperAliasGroup)