diff --git a/formtool/__init__.py b/formtool/__init__.py index 803f25f..849dc93 100644 --- a/formtool/__init__.py +++ b/formtool/__init__.py @@ -1,11 +1,9 @@ -import argparse import glob from pathlib import Path from subprocess import check_call from hypy_utils import printc - defaults = { 'av1': { '-c:v': 'libsvtav1', diff --git a/formtool/__main__.py b/formtool/__main__.py index e69de29..6b36004 100644 --- a/formtool/__main__.py +++ b/formtool/__main__.py @@ -0,0 +1,38 @@ +import argparse + +from . import defaults, main + + +def cli(fmt: str | None = None): + agupa = argparse.ArgumentParser("formtool", "ffmpeg shortcuts") + if fmt is None: + agupa.add_argument('format', choices=defaults.keys(), help="Compression format to use.") + agupa.add_argument('files', nargs='+', help="One or more files to compress.") + agupa.add_argument('--keep', action='store_true', help="Keep original files after compression.") + args, passthrough = agupa.parse_known_args() + + main(fmt or args.format, args.files, args.keep, passthrough) + + +def av1(): + cli('av1') + + +def x264(): + cli('x264') + + +def mp3(): + cli('mp3') + + +def opus(): + cli('opus') + + +def flac(): + cli('flac') + + +if __name__ == '__main__': + cli() diff --git a/formtool/cli.py b/formtool/cli.py deleted file mode 100644 index 38a724b..0000000 --- a/formtool/cli.py +++ /dev/null @@ -1,34 +0,0 @@ -import argparse - -from . import defaults, main - - -def cli(fmt: str | None = None): - agupa = argparse.ArgumentParser("formtool", "ffmpeg shortcuts") - if fmt is None: - agupa.add_argument('format', choices=defaults.keys(), help="Compression format to use.") - agupa.add_argument('files', nargs='+', help="One or more files to compress.") - agupa.add_argument('--keep', action='store_true', help="Keep original files after compression.") - args, passthrough = agupa.parse_known_args() - - main(fmt or args.format, args.files, args.keep, passthrough) - - -def av1(): - cli('av1') - - -def x264(): - cli('x264') - - -def mp3(): - cli('mp3') - - -def opus(): - cli('opus') - - -def flac(): - cli('flac') diff --git a/pyproject.toml b/pyproject.toml index a753350..cd9d6a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,9 +9,9 @@ dependencies = [ ] [project.scripts] -formtool = "formtool.cli:cli" -fav1 = "formtool.cli:av1" -fx264 = "formtool.cli:x264" -fmp3 = "formtool.cli:mp3" -fopus = "formtool.cli:opus" -fflac = "formtool.cli:flac" +formtool = "formtool.__main__:cli" +fav1 = "formtool.__main__:av1" +fx264 = "formtool.__main__:x264" +fmp3 = "formtool.__main__:mp3" +fopus = "formtool.__main__:opus" +fflac = "formtool.__main__:flac"