From e5fa49ad53cc6b6191ae9ddc0b666e4fa1461841 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Thu, 29 Aug 2024 02:49:44 +0300 Subject: [PATCH] Fix packaging names --- .gitignore | 2 +- build.bat | 12 ++++++------ build.sh | 12 ++++++------ pyproject.toml | 14 +++++++------- {RenPyRipper => renpy-ripper}/README.md | 0 RenPyRipper/unpack.rpy => renpy-ripper/ripper.rpy | 0 {RenDroidUnpack => unrenapk}/README.md | 0 {RenDroidUnpack => unrenapk}/__init__.py | 0 {RenDroidUnpack => unrenapk}/__main__.py | 0 {RenDroidUnpack => unrenapk}/actions.py | 0 {RenDroidUnpack => unrenapk}/application.py | 2 +- {RenDroidUnpack => unrenapk}/printer.py | 0 {VNDS2RenPy => vnds2renpy}/README.md | 0 {VNDS2RenPy => vnds2renpy}/__init__.py | 0 {VNDS2RenPy => vnds2renpy}/__main__.py | 0 {VNRecode => vnrecode}/README.md | 0 {VNRecode => vnrecode}/__init__.py | 0 {VNRecode => vnrecode}/__main__.py | 0 {VNRecode => vnrecode}/application.py | 0 {VNRecode => vnrecode}/compress.py | 0 {VNRecode => vnrecode}/config.py | 6 +++--- {VNRecode => vnrecode}/printer.py | 0 {VNRecode => vnrecode}/utils.py | 0 .../ffmpeg-comp.toml => vnrecode/vnrecode.toml | 0 24 files changed, 24 insertions(+), 24 deletions(-) rename {RenPyRipper => renpy-ripper}/README.md (100%) rename RenPyRipper/unpack.rpy => renpy-ripper/ripper.rpy (100%) rename {RenDroidUnpack => unrenapk}/README.md (100%) rename {RenDroidUnpack => unrenapk}/__init__.py (100%) rename {RenDroidUnpack => unrenapk}/__main__.py (100%) rename {RenDroidUnpack => unrenapk}/actions.py (100%) rename {RenDroidUnpack => unrenapk}/application.py (97%) rename {RenDroidUnpack => unrenapk}/printer.py (100%) rename {VNDS2RenPy => vnds2renpy}/README.md (100%) rename {VNDS2RenPy => vnds2renpy}/__init__.py (100%) rename {VNDS2RenPy => vnds2renpy}/__main__.py (100%) rename {VNRecode => vnrecode}/README.md (100%) rename {VNRecode => vnrecode}/__init__.py (100%) rename {VNRecode => vnrecode}/__main__.py (100%) rename {VNRecode => vnrecode}/application.py (100%) rename {VNRecode => vnrecode}/compress.py (100%) rename {VNRecode => vnrecode}/config.py (76%) rename {VNRecode => vnrecode}/printer.py (100%) rename {VNRecode => vnrecode}/utils.py (100%) rename VNRecode/ffmpeg-comp.toml => vnrecode/vnrecode.toml (100%) diff --git a/.gitignore b/.gitignore index d9d86ba..e6aa831 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /output/ /tests/ /build/ -/VNTools.egg-info/ /dist/ +/vntools.egg-info/ diff --git a/build.bat b/build.bat index 688d43d..89343d1 100755 --- a/build.bat +++ b/build.bat @@ -5,12 +5,12 @@ mkdir output mkdir output\bin python -m pip install -r requirements.txt || goto :exit python -m pip install Nuitka || goto :exit -python -m nuitka --jobs=%NUMBER_OF_PROCESSORS% --output-dir=output --follow-imports --onefile --output-filename=ffmpeg-comp FFMpeg-Compressor\__main__.py || goto :exit -xcopy FFMpeg-Compressor\ffmpeg-comp.toml output\bin /Y -move /Y output\ffmpeg-comp.exe output\bin -python -m nuitka --jobs=%NUMBER_OF_PROCESSORS% --output-dir=output --follow-imports --onefile --output-filename=rendroid-unpack RenPy-Android-Unpack\__main__.py || goto :exit -move /Y output\rendroid-unpack.exe output\bin -python -m nuitka --jobs=%NUMBER_OF_PROCESSORS% --output-dir=output --follow-imports --onefile --output-filename=vnds2renpy VNDS-to-RenPy/__main__.py || goto :exit +python -m nuitka --jobs=%NUMBER_OF_PROCESSORS% --output-dir=output --follow-imports --onefile --output-filename=vnrecode vnrecode\__main__.py || goto :exit +xcopy vnrecode\vnrecode.toml output\bin /Y +move /Y output\vnrecode.exe output\bin +python -m nuitka --jobs=%NUMBER_OF_PROCESSORS% --output-dir=output --follow-imports --onefile --output-filename=unrenapk unrenapk\__main__.py || goto :exit +move /Y output\unrenapk.exe output\bin +python -m nuitka --jobs=%NUMBER_OF_PROCESSORS% --output-dir=output --follow-imports --onefile --output-filename=vnds2renpy vnds2renpy/__main__.py || goto :exit move /Y output\vnds2renpy.exe output\bin echo "Done! You can get binaries into output\bin directory" diff --git a/build.sh b/build.sh index 90e774e..a7cf3b3 100755 --- a/build.sh +++ b/build.sh @@ -14,11 +14,11 @@ case "$(uname -s)" in Linux*) jobs="--jobs=$(nproc)";; Darwin*) jobs="--jobs=$(sysctl -n hw.ncpu)";; esac -python3 -m nuitka "${jobs}" --output-dir=output --onefile --follow-imports --output-filename=ffmpeg-comp FFMpeg-Compressor/__main__.py -cp FFMpeg-Compressor/ffmpeg-comp.toml output/bin -mv output/ffmpeg-comp output/bin -python3 -m nuitka "${jobs}" --output-dir=output --onefile --follow-imports --output-filename=rendroid-unpack RenPy-Android-Unpack/__main__.py -mv output/rendroid-unpack output/bin -python3 -m nuitka "${jobs}" --output-dir=output --onefile --follow-imports --output-filename=vnds2renpy VNDS-to-RenPy/__main__.py +python3 -m nuitka "${jobs}" --output-dir=output --onefile --follow-imports --output-filename=vnrecode vnrecode/__main__.py +cp vnrecode/vnrecode.toml output/bin +mv output/vnrecode output/bin +python3 -m nuitka "${jobs}" --output-dir=output --onefile --follow-imports --output-filename=unrenapk unrenapk/__main__.py +mv output/unrenapk output/bin +python3 -m nuitka "${jobs}" --output-dir=output --onefile --follow-imports --output-filename=vnds2renpy vnds2renpy/__main__.py mv output/vnds2renpy output/bin echo "Done! You can get binaries into output/bin directory" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 766fb7f..be74c59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,18 +5,18 @@ requires = [ build-backend = "setuptools.build_meta" [tool.setuptools] -packages = ["VNRecode", "RenDroidUnpack", "VNDS2RenPy"] +packages = ["vnrecode", "unrenapk", "vnds2renpy"] include-package-data = true [tool.setuptools.package-data] -'VNRecode' = ['*.py'] -'VNDS2RenPy' = ['*.py'] -'RenDroidUnpack' = ['*.py'] +'vnrecode' = ['*.py', '*.toml'] +'vnds2renpy' = ['*.py'] +'unrenapk' = ['*.py'] [project.scripts] -vnrecode = "VNRecode.__main__:init" -vnds2renpy = "VNDS2RenPy.__main__:main" -rendroid-unpack = "RenDroidUnpack.application:launch" +vnrecode = "vnrecode.__main__:init" +vnds2renpy = "vnds2renpy.__main__:main" +unrenapk = "unrenapk.application:launch" [project] name = "vntools" diff --git a/RenPyRipper/README.md b/renpy-ripper/README.md similarity index 100% rename from RenPyRipper/README.md rename to renpy-ripper/README.md diff --git a/RenPyRipper/unpack.rpy b/renpy-ripper/ripper.rpy similarity index 100% rename from RenPyRipper/unpack.rpy rename to renpy-ripper/ripper.rpy diff --git a/RenDroidUnpack/README.md b/unrenapk/README.md similarity index 100% rename from RenDroidUnpack/README.md rename to unrenapk/README.md diff --git a/RenDroidUnpack/__init__.py b/unrenapk/__init__.py similarity index 100% rename from RenDroidUnpack/__init__.py rename to unrenapk/__init__.py diff --git a/RenDroidUnpack/__main__.py b/unrenapk/__main__.py similarity index 100% rename from RenDroidUnpack/__main__.py rename to unrenapk/__main__.py diff --git a/RenDroidUnpack/actions.py b/unrenapk/actions.py similarity index 100% rename from RenDroidUnpack/actions.py rename to unrenapk/actions.py diff --git a/RenDroidUnpack/application.py b/unrenapk/application.py similarity index 97% rename from RenDroidUnpack/application.py rename to unrenapk/application.py index 91d1577..b66d6ba 100644 --- a/RenDroidUnpack/application.py +++ b/unrenapk/application.py @@ -10,7 +10,7 @@ from .actions import Actions def args_init(): parser = argparse.ArgumentParser( - prog='rendroid-unpack', + prog='unrenapk', description='Extract Ren\'Py .apk and .obb files into Ren\'Py SDK\'s project' ) parser.add_argument('path') diff --git a/RenDroidUnpack/printer.py b/unrenapk/printer.py similarity index 100% rename from RenDroidUnpack/printer.py rename to unrenapk/printer.py diff --git a/VNDS2RenPy/README.md b/vnds2renpy/README.md similarity index 100% rename from VNDS2RenPy/README.md rename to vnds2renpy/README.md diff --git a/VNDS2RenPy/__init__.py b/vnds2renpy/__init__.py similarity index 100% rename from VNDS2RenPy/__init__.py rename to vnds2renpy/__init__.py diff --git a/VNDS2RenPy/__main__.py b/vnds2renpy/__main__.py similarity index 100% rename from VNDS2RenPy/__main__.py rename to vnds2renpy/__main__.py diff --git a/VNRecode/README.md b/vnrecode/README.md similarity index 100% rename from VNRecode/README.md rename to vnrecode/README.md diff --git a/VNRecode/__init__.py b/vnrecode/__init__.py similarity index 100% rename from VNRecode/__init__.py rename to vnrecode/__init__.py diff --git a/VNRecode/__main__.py b/vnrecode/__main__.py similarity index 100% rename from VNRecode/__main__.py rename to vnrecode/__main__.py diff --git a/VNRecode/application.py b/vnrecode/application.py similarity index 100% rename from VNRecode/application.py rename to vnrecode/application.py diff --git a/VNRecode/compress.py b/vnrecode/compress.py similarity index 100% rename from VNRecode/compress.py rename to vnrecode/compress.py diff --git a/VNRecode/config.py b/vnrecode/config.py similarity index 76% rename from VNRecode/config.py rename to vnrecode/config.py index a556c5e..a7cf0ed 100644 --- a/VNRecode/config.py +++ b/vnrecode/config.py @@ -13,16 +13,16 @@ class Config: @classmethod def setup_config(cls): - parser = ArgumentParser(prog="ffmpeg-comp", + parser = ArgumentParser(prog="vnrecode", description="Python utility to compress Visual Novel Resources" ) parser.add_argument("source") - parser.add_argument("-c", "--config", default="ffmpeg-comp.toml") + parser.add_argument("-c", "--config", default="vnrecode.toml") args = parser.parse_args() if os.path.isfile(args.config): with open(args.config, "rb") as cfile: config = tomllib.load(cfile) else: - print("Failed to find config. Check `ffmpeg-comp -h` to more info") + print("Failed to find config. Check `vnrecode -h` to more info") exit(255) return cls(config=config, args=args) diff --git a/VNRecode/printer.py b/vnrecode/printer.py similarity index 100% rename from VNRecode/printer.py rename to vnrecode/printer.py diff --git a/VNRecode/utils.py b/vnrecode/utils.py similarity index 100% rename from VNRecode/utils.py rename to vnrecode/utils.py diff --git a/VNRecode/ffmpeg-comp.toml b/vnrecode/vnrecode.toml similarity index 100% rename from VNRecode/ffmpeg-comp.toml rename to vnrecode/vnrecode.toml