diff --git a/.gitignore b/.gitignore index abe0419..d9d86ba 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /tests/ /build/ /VNTools.egg-info/ +/dist/ diff --git a/RenPy-Android-Unpack/README.md b/RenDroidUnpack/README.md similarity index 100% rename from RenPy-Android-Unpack/README.md rename to RenDroidUnpack/README.md diff --git a/FFMpeg-Compressor/__init__.py b/RenDroidUnpack/__init__.py similarity index 100% rename from FFMpeg-Compressor/__init__.py rename to RenDroidUnpack/__init__.py diff --git a/RenDroidUnpack/__main__.py b/RenDroidUnpack/__main__.py new file mode 100755 index 0000000..6e79193 --- /dev/null +++ b/RenDroidUnpack/__main__.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 + +from . import application + +if __name__ == '__main__': + application.launch() diff --git a/RenPy-Android-Unpack/actions.py b/RenDroidUnpack/actions.py similarity index 99% rename from RenPy-Android-Unpack/actions.py rename to RenDroidUnpack/actions.py index e5d42e6..489eee9 100755 --- a/RenPy-Android-Unpack/actions.py +++ b/RenDroidUnpack/actions.py @@ -3,7 +3,7 @@ from PIL import Image import shutil import os -from printer import Printer +from .printer import Printer class Extract: diff --git a/RenPy-Android-Unpack/__main__.py b/RenDroidUnpack/application.py old mode 100755 new mode 100644 similarity index 94% rename from RenPy-Android-Unpack/__main__.py rename to RenDroidUnpack/application.py index 8826079..91d1577 --- a/RenPy-Android-Unpack/__main__.py +++ b/RenDroidUnpack/application.py @@ -4,8 +4,8 @@ import argparse import sys import os -from printer import Printer -from actions import Actions +from .printer import Printer +from .actions import Actions def args_init(): @@ -17,8 +17,7 @@ def args_init(): parser.add_argument('-o', '--output') return parser.parse_args() - -if __name__ == '__main__': +def launch(): if sys.platform == "win32": colorama.init() args = args_init() diff --git a/RenPy-Android-Unpack/printer.py b/RenDroidUnpack/printer.py similarity index 100% rename from RenPy-Android-Unpack/printer.py rename to RenDroidUnpack/printer.py diff --git a/RenPy-Unpacker/README.md b/RenPyRipper/README.md similarity index 100% rename from RenPy-Unpacker/README.md rename to RenPyRipper/README.md diff --git a/RenPy-Unpacker/unpack.rpy b/RenPyRipper/unpack.rpy similarity index 100% rename from RenPy-Unpacker/unpack.rpy rename to RenPyRipper/unpack.rpy diff --git a/VNDS-to-RenPy/README.md b/VNDS2RenPy/README.md similarity index 100% rename from VNDS-to-RenPy/README.md rename to VNDS2RenPy/README.md diff --git a/RenPy-Android-Unpack/__init__.py b/VNDS2RenPy/__init__.py similarity index 100% rename from RenPy-Android-Unpack/__init__.py rename to VNDS2RenPy/__init__.py diff --git a/VNDS-to-RenPy/__main__.py b/VNDS2RenPy/__main__.py similarity index 100% rename from VNDS-to-RenPy/__main__.py rename to VNDS2RenPy/__main__.py diff --git a/FFMpeg-Compressor/README.md b/VNRecode/README.md similarity index 100% rename from FFMpeg-Compressor/README.md rename to VNRecode/README.md diff --git a/VNDS-to-RenPy/__init__.py b/VNRecode/__init__.py similarity index 100% rename from VNDS-to-RenPy/__init__.py rename to VNRecode/__init__.py diff --git a/FFMpeg-Compressor/__main__.py b/VNRecode/__main__.py similarity index 67% rename from FFMpeg-Compressor/__main__.py rename to VNRecode/__main__.py index aef4d34..4e7fb68 100644 --- a/FFMpeg-Compressor/__main__.py +++ b/VNRecode/__main__.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -from application import Application -from compress import Compress -from printer import Printer -from config import Config -from utils import Utils +from .application import Application +from .compress import Compress +from .printer import Printer +from .config import Config +from .utils import Utils def init(): diff --git a/FFMpeg-Compressor/application.py b/VNRecode/application.py similarity index 100% rename from FFMpeg-Compressor/application.py rename to VNRecode/application.py diff --git a/FFMpeg-Compressor/compress.py b/VNRecode/compress.py similarity index 100% rename from FFMpeg-Compressor/compress.py rename to VNRecode/compress.py diff --git a/FFMpeg-Compressor/config.py b/VNRecode/config.py similarity index 97% rename from FFMpeg-Compressor/config.py rename to VNRecode/config.py index d36e3d4..a556c5e 100644 --- a/FFMpeg-Compressor/config.py +++ b/VNRecode/config.py @@ -24,4 +24,5 @@ class Config: config = tomllib.load(cfile) else: print("Failed to find config. Check `ffmpeg-comp -h` to more info") + exit(255) return cls(config=config, args=args) diff --git a/FFMpeg-Compressor/ffmpeg-comp.toml b/VNRecode/ffmpeg-comp.toml similarity index 100% rename from FFMpeg-Compressor/ffmpeg-comp.toml rename to VNRecode/ffmpeg-comp.toml diff --git a/FFMpeg-Compressor/printer.py b/VNRecode/printer.py similarity index 100% rename from FFMpeg-Compressor/printer.py rename to VNRecode/printer.py diff --git a/FFMpeg-Compressor/utils.py b/VNRecode/utils.py similarity index 100% rename from FFMpeg-Compressor/utils.py rename to VNRecode/utils.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..766fb7f --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = [ + "setuptools >= 61.0" +] +build-backend = "setuptools.build_meta" + +[tool.setuptools] +packages = ["VNRecode", "RenDroidUnpack", "VNDS2RenPy"] +include-package-data = true + +[tool.setuptools.package-data] +'VNRecode' = ['*.py'] +'VNDS2RenPy' = ['*.py'] +'RenDroidUnpack' = ['*.py'] + +[project.scripts] +vnrecode = "VNRecode.__main__:init" +vnds2renpy = "VNDS2RenPy.__main__:main" +rendroid-unpack = "RenDroidUnpack.application:launch" + +[project] +name = "vntools" +version = "2.0-dev" +requires-python = ">= 3.11" +dependencies = [ + "Pillow==10.3.0", + "pillow-avif-plugin==1.4.3", + "python-ffmpeg==2.0.12", + "progress==1.6", + "colorama==0.4.6" +] \ No newline at end of file