3411a5a34d
The CLI previously always started full app initialization (config load, listener setup, receiver construction, and debug output) even when invoked with `-h`, `--help`, `-v`, or `--version`. That made basic introspection noisy and buried the requested output in startup logs. Add early argument checks in `main()` so help/version requests are handled immediately and the process exits without starting the app. Introduce a small `print_help()` helper for consistent usage output. This improves terminal UX and makes debugging/invocation checks much clearer by keeping `-h` and `-v` output focused and predictable.
59 lines
1.3 KiB
Python
59 lines
1.3 KiB
Python
import asyncio
|
|
import sys
|
|
from collections.abc import Iterable
|
|
|
|
from rich import print
|
|
|
|
from .__version__ import __version__
|
|
from .config.load import loadConfig
|
|
from .config.model import Config
|
|
from .mpd.listener import MpdStateListener
|
|
from .song_receiver import (
|
|
Receiver,
|
|
choose_loop_factory,
|
|
construct_receiver,
|
|
)
|
|
|
|
|
|
async def listen(
|
|
config: Config, listener: MpdStateListener, receivers: Iterable[Receiver]
|
|
) -> None:
|
|
await listener.start(config.mpd)
|
|
await asyncio.gather(*(rec.start(listener) for rec in receivers))
|
|
await listener.loop(receivers)
|
|
|
|
|
|
def print_help() -> None:
|
|
print("Usage: mpd-now-playable [OPTIONS]")
|
|
print("")
|
|
print("Options:")
|
|
print(" -h, --help Show this help message and exit.")
|
|
print(" -v, --version Show version and exit.")
|
|
|
|
|
|
def main() -> None:
|
|
args = set(sys.argv[1:])
|
|
if "-h" in args or "--help" in args:
|
|
print_help()
|
|
return
|
|
if "-v" in args or "--version" in args:
|
|
print(f"mpd-now-playable v{__version__}")
|
|
return
|
|
|
|
print(f"mpd-now-playable v{__version__}")
|
|
config = loadConfig()
|
|
print(config)
|
|
|
|
listener = MpdStateListener(config.cache)
|
|
receivers = tuple(construct_receiver(rec_config) for rec_config in config.receivers)
|
|
factory = choose_loop_factory(receivers)
|
|
|
|
asyncio.run(
|
|
listen(config, listener, receivers),
|
|
loop_factory=factory.make_loop,
|
|
debug=True,
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|