From ba163f02b26fd0e35836ce32c3f760a9fde7d65f Mon Sep 17 00:00:00 2001 From: Jonathan Dunn Date: Thu, 14 Mar 2024 10:43:52 -0400 Subject: [PATCH] fixed yt, ts and save --- helper_files/README.md | 7 +++---- helper_files/__init__.py | 6 +++--- installer/__init__.py | 2 +- installer/client/cli/__init__.py | 3 +++ {helper_files => installer/client/cli}/save.py | 0 {helper_files => installer/client/cli}/ts.py | 0 {helper_files => installer/client/cli}/yt.py | 0 pyproject.toml | 6 +++--- 8 files changed, 13 insertions(+), 11 deletions(-) rename {helper_files => installer/client/cli}/save.py (100%) rename {helper_files => installer/client/cli}/ts.py (100%) rename {helper_files => installer/client/cli}/yt.py (100%) diff --git a/helper_files/README.md b/helper_files/README.md index 6fe3878..e8772f9 100644 --- a/helper_files/README.md +++ b/helper_files/README.md @@ -38,8 +38,7 @@ windows: download instructions https://www.ffmpeg.org/download.html ``` - -```bash +````bash ts -h usage: ts [-h] audio_file @@ -75,7 +74,8 @@ options: -t, TAG, --tag TAG add an additional frontmatter tag. Use this argument multiple timesfor multiple tags -n, --nofabric don't use the fabric tags, only use tags from --tag -s, --silent don't use STDOUT for output, only save to the file -``` +```` + ### example ```bash @@ -89,4 +89,3 @@ tags: fabric-extraction stub-for-name extra-tag --- test ``` - diff --git a/helper_files/__init__.py b/helper_files/__init__.py index 42f298d..895cfa2 100644 --- a/helper_files/__init__.py +++ b/helper_files/__init__.py @@ -1,3 +1,3 @@ -from .ts import main as main_ts -from .yt import main as main_yt -from .save import cli as main_save +from ..installer.client.cli.ts import main as main_ts +from ..installer.client.cli.yt import main as main_yt +from ..installer.client.cli.save import cli as main_save diff --git a/installer/__init__.py b/installer/__init__.py index daa0558..6206887 100644 --- a/installer/__init__.py +++ b/installer/__init__.py @@ -1,4 +1,4 @@ -from .client.cli import main as cli +from .client.cli import main as cli, main_save, main_ts, main_yt from .server import ( run_api_server, run_webui_server, diff --git a/installer/client/cli/__init__.py b/installer/client/cli/__init__.py index e45b128..3395da7 100644 --- a/installer/client/cli/__init__.py +++ b/installer/client/cli/__init__.py @@ -1 +1,4 @@ from .fabric import main +from .yt import main as main_yt +from .ts import main as main_ts +from .save import cli as main_save diff --git a/helper_files/save.py b/installer/client/cli/save.py similarity index 100% rename from helper_files/save.py rename to installer/client/cli/save.py diff --git a/helper_files/ts.py b/installer/client/cli/ts.py similarity index 100% rename from helper_files/ts.py rename to installer/client/cli/ts.py diff --git a/helper_files/yt.py b/installer/client/cli/yt.py similarity index 100% rename from helper_files/yt.py rename to installer/client/cli/yt.py diff --git a/pyproject.toml b/pyproject.toml index 07576ca..2cdf07c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,6 +67,6 @@ build-backend = "poetry.core.masonry.api" fabric = 'installer:cli' fabric-api = 'installer:run_api_server' fabric-webui = 'installer:run_webui_server' -ts = 'helper_files:main_ts' -yt = 'helper_files:main_yt' -save = 'helper_files:main_save' +ts = 'installer:main_ts' +yt = 'installer:main_yt' +save = 'installer:main_save'