From c1f152d8d0c77bff19659c7e062cd189be22f690 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Sat, 28 Dec 2024 02:09:56 +0300 Subject: [PATCH 01/11] Remove strict dependencies versioning --- pyproject.toml | 12 ++++++------ requirements.txt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f2c379f..a195225 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,10 +23,10 @@ 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", - "argparse~=1.4.0" + "Pillow>=10.3.0", + "pillow-avif-plugin>=1.4.3", + "python-ffmpeg>=2.0.12", + "progress>=1.6", + "colorama>=0.4.6", + "argparse>=1.4.0" ] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 16bd1e6..c6dd905 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Pillow==10.3.0 -pillow-avif-plugin==1.4.3 -python-ffmpeg==2.0.12 -progress==1.6 -colorama==0.4.6 -argparse~=1.4.0 \ No newline at end of file +Pillow>=10.3.0 +pillow-avif-plugin>=1.4.3 +python-ffmpeg>=2.0.12 +progress>=1.6 +colorama>=0.4.6 +argparse>=1.4.0 From 9c367e5249b0dc5ccacea0701fe74b286f7afabd Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Sat, 28 Dec 2024 03:12:45 +0300 Subject: [PATCH 02/11] vnrecode: fix dest path name --- vnrecode/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnrecode/params.py b/vnrecode/params.py index d0388f2..c102482 100644 --- a/vnrecode/params.py +++ b/vnrecode/params.py @@ -68,7 +68,7 @@ class Params: video_ext = config["VIDEO"]["Extension"] if args.config else args.v_ext video_codec = config["VIDEO"]["Codec"] if args.config else args.v_codec source = Path(args.source) - dest = Path(f"{args.source}_compressed") + dest = Path(source.name + f"_compressed") return cls( copy_unprocessed, force_compress, mimic_mode, hide_errors, webp_rgba, workers, From 3802c52ba054817728cb8cada6d5e3a4ab35f130 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Fri, 24 Jan 2025 02:30:55 +0300 Subject: [PATCH 03/11] vnrecode: check if source path exist (lol) --- vnrecode/params.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vnrecode/params.py b/vnrecode/params.py index c102482..552036c 100644 --- a/vnrecode/params.py +++ b/vnrecode/params.py @@ -68,6 +68,9 @@ class Params: video_ext = config["VIDEO"]["Extension"] if args.config else args.v_ext video_codec = config["VIDEO"]["Codec"] if args.config else args.v_codec source = Path(args.source) + if not source.exists(): + print("Requested path does not exists. Exiting!") + exit(255) dest = Path(source.name + f"_compressed") return cls( From ce62218cdaf4ff35784e25622290f0690ce18370 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Fri, 24 Jan 2025 02:31:26 +0300 Subject: [PATCH 04/11] vnrecode: change progress bar message --- vnrecode/printer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnrecode/printer.py b/vnrecode/printer.py index 9207ba7..18d5138 100644 --- a/vnrecode/printer.py +++ b/vnrecode/printer.py @@ -16,7 +16,7 @@ class Printer: file_count = 0 for folder, folders, file in os.walk(source): file_count += len(file) - self.bar = IncrementalBar('Compressing', max=file_count, suffix='[%(index)d/%(max)d] (%(percent).1f%%)') + self.bar = IncrementalBar('Recoding', max=file_count, suffix='[%(index)d/%(max)d] (%(percent).1f%%)') self.bar.update() @staticmethod From debc1755bbd094b4626a9cb568849106cf8d69c4 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Fri, 24 Jan 2025 03:22:27 +0300 Subject: [PATCH 05/11] vnrecode: add info about default values --- vnrecode/params.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vnrecode/params.py b/vnrecode/params.py index 552036c..a20e9ce 100644 --- a/vnrecode/params.py +++ b/vnrecode/params.py @@ -96,17 +96,17 @@ class Params: parser.add_argument("-nm", "--no-mimic", dest='mimic', action='store_false', help="Disable mimic mode") parser.add_argument("-v", "--show_errors", action='store_false', help="Show recode errors") parser.add_argument("--webp-rgb", dest='webp_rgba', action='store_false', help="Recode .webp without alpha channel") - parser.add_argument("-j", "--jobs", type=int, help="Number of threads", default=16) - parser.add_argument("-ae", dest="a_ext", help="Audio extension", default="opus") - parser.add_argument("-ab", dest="a_bit", help="Audio bit rate", default="128k") - parser.add_argument("-id", dest="i_down", type=int, help="Image resolution downscale multiplier", default=1) - parser.add_argument("-ie", dest="i_ext", help="Image extension", default="avif") - parser.add_argument("-ife", dest="i_fallext", help="Image fallback extension", default="webp") + parser.add_argument("-j", "--jobs", type=int, help="Number of threads (default: 16)", default=16) + parser.add_argument("-ae", dest="a_ext", help="Audio extension (default: opus)", default="opus") + parser.add_argument("-ab", dest="a_bit", help="Audio bit rate (default: 128k)", default="128k") + parser.add_argument("-id", dest="i_down", type=int, help="Image resolution downscale multiplier (default: 1)", default=1) + parser.add_argument("-ie", dest="i_ext", help="Image extension (default: avif)", default="avif") + parser.add_argument("-ife", dest="i_fallext", help="Image fallback extension (default: webp)", default="webp") parser.add_argument("-il", dest='i_lossless', action='store_false', help="Image losing compression mode") - parser.add_argument("-iq", dest="i_quality", type=int, help="Image quality", default=100) - parser.add_argument("--v_crf", help="Video CRF number", type=int, default=27) + parser.add_argument("-iq", dest="i_quality", type=int, help="Image quality (default: 100)", default=100) + parser.add_argument("--v_crf", help="Video CRF number (default: 27)", type=int, default=27) parser.add_argument("-vs", dest="v_skip", action='store_true', help="Skip video recoding") - parser.add_argument("-ve", dest="v_ext", help="Video extension", default="webm") - parser.add_argument("-vc", dest="v_codec", help="Video codec name", default="libvpx-vp9") + parser.add_argument("-ve", dest="v_ext", help="Video extension (default: webm)", default="webm") + parser.add_argument("-vc", dest="v_codec", help="Video codec name (default: libvpx-vp9)", default="libvpx-vp9") args = parser.parse_args() return args \ No newline at end of file From e5bf961ddbf22df9a899eb8ed5110975a690e1f5 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Tue, 28 Jan 2025 21:17:57 +0300 Subject: [PATCH 06/11] vnrecode: fix dest path relativity --- vnrecode/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnrecode/params.py b/vnrecode/params.py index a20e9ce..18f43a6 100644 --- a/vnrecode/params.py +++ b/vnrecode/params.py @@ -71,7 +71,7 @@ class Params: if not source.exists(): print("Requested path does not exists. Exiting!") exit(255) - dest = Path(source.name + f"_compressed") + dest = Path(source.parent, source.name + f"_compressed") return cls( copy_unprocessed, force_compress, mimic_mode, hide_errors, webp_rgba, workers, From 555ea0ebbb17cc227721086857944a34dcf3040e Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Sat, 1 Feb 2025 15:45:14 +0300 Subject: [PATCH 07/11] Initial Arch Linux packaging --- PKGBUILD | 31 +++++++++++++++++++++++++++++++ README.md | 4 +--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..0c6ef83 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: D. Can Celasun +# Contributor: Ezekiel Bethel + +_pkgname=VNTools +pkgname=vntools-git +pkgver=2.0.e5bf961 +pkgrel=1 +pkgdesc="Collection of tools used by VienDesu! Porting Team" +arch=("any") +url="https://github.com/VienDesuPorting/VNTools" +depends=("python" "python-pillow" "python-pillow-avif-plugin" "python-python-ffmpeg" "python-progress" "python-colorama") +makedepends=("python-setuptools" "git") +provides=("vntools") +source=("git+${url}.git#branch=testing") +sha256sums=("SKIP") + +pkgver() { + cd "${srcdir}/${_pkgname}" + printf "2.0.%s" "$(git rev-parse --short HEAD)" +} + +build() { + cd "${srcdir}/${_pkgname}" + python -m build --wheel --no-isolation +} + +package() { + cd "${srcdir}/${_pkgname}" + python -m installer --destdir="${pkgdir}" dist/*.whl +} + diff --git a/README.md b/README.md index b3b0091..eb026d5 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,8 @@ Collection of tools used by VienDesu! Porting Team #### Build tools as binaries: * Run `./build.sh` on UNIX * Run `.\build.bat` for Windows - * Arch Linux - `TODO` - * NixOS - `TODO` #### Install as python package: * Run `pip install -U .` command in project folder - * Arch Linux - `TODO` + * Arch Linux - `paru -Bi .` * NixOS - `TODO` From 00925a4908ca346faafe37f73f1484028c40c617 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Fri, 7 Feb 2025 02:19:03 +0300 Subject: [PATCH 08/11] vnrecode: float image downscale multiplier --- vnrecode/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnrecode/params.py b/vnrecode/params.py index 18f43a6..61fd8de 100644 --- a/vnrecode/params.py +++ b/vnrecode/params.py @@ -99,7 +99,7 @@ class Params: parser.add_argument("-j", "--jobs", type=int, help="Number of threads (default: 16)", default=16) parser.add_argument("-ae", dest="a_ext", help="Audio extension (default: opus)", default="opus") parser.add_argument("-ab", dest="a_bit", help="Audio bit rate (default: 128k)", default="128k") - parser.add_argument("-id", dest="i_down", type=int, help="Image resolution downscale multiplier (default: 1)", default=1) + parser.add_argument("-id", dest="i_down", type=float, help="Image resolution downscale multiplier (default: 1)", default=1) parser.add_argument("-ie", dest="i_ext", help="Image extension (default: avif)", default="avif") parser.add_argument("-ife", dest="i_fallext", help="Image fallback extension (default: webp)", default="webp") parser.add_argument("-il", dest='i_lossless', action='store_false', help="Image losing compression mode") From 3f3de59844f231743c8119c214bfaefe39113bd1 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Fri, 7 Feb 2025 02:24:34 +0300 Subject: [PATCH 09/11] vnrecode: make temp files hidden --- vnrecode/compress.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vnrecode/compress.py b/vnrecode/compress.py index 680da22..bbff31d 100644 --- a/vnrecode/compress.py +++ b/vnrecode/compress.py @@ -70,7 +70,7 @@ class Compress: """ bit_rate = self.__params.audio_bitrate prefix = self.__utils.get_hash(input_path.name) - out_file = Path(output_dir, f'{prefix}_{input_path.stem}.{extension}') + out_file = Path(output_dir, f'.{prefix}_{input_path.stem}.{extension}') try: (FFmpeg() .input(input_path) @@ -93,7 +93,7 @@ class Compress: """ quality = self.__params.image_quality prefix = self.__utils.get_hash(input_path.name) - out_file = Path(output_dir, f"{prefix}_{input_path.stem}.{extension}") + out_file = Path(output_dir, f".{prefix}_{input_path.stem}.{extension}") try: image = Image.open(input_path) @@ -101,7 +101,7 @@ class Compress: (extension == "webp" and not self.__params.webp_rgba)): if File.has_transparency(image): self.__printer.warning(f"{input_path.name} has transparency. Changing to fallback...") - out_file = Path(output_dir, f"{prefix}_{input_path.stem}.{self.__params.image_fall_ext}") + out_file = Path(output_dir, f".{prefix}_{input_path.stem}.{self.__params.image_fall_ext}") if File.has_transparency(image): image.convert('RGBA') @@ -131,7 +131,7 @@ class Compress: :return: Path of compressed video file with md5 hash as prefix """ prefix = self.__utils.get_hash(input_path.name) - out_file = Path(output_dir, f'{prefix}_{input_path.stem}.{extension}') + out_file = Path(output_dir, f'.{prefix}_{input_path.stem}.{extension}') if not self.__params.video_skip: codec = self.__params.video_codec crf = self.__params.video_crf @@ -160,7 +160,7 @@ class Compress: :return: Path of compressed file with md5 hash as prefix """ prefix = self.__utils.get_hash(input_path.name) - out_file = Path(output_dir, f"{prefix}_{input_path.name}") + out_file = Path(output_dir, f".{prefix}_{input_path.name}") if self.__params.force_compress: self.__printer.unknown_file(input_path.name) try: From 54a4bf1274796596518541536e20e76f9be573cb Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Tue, 18 Feb 2025 23:41:11 +0300 Subject: [PATCH 10/11] Set module version as 2.0.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a195225..01df088 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ unrenapk = "unrenapk.application:launch" [project] name = "vntools" -version = "2.0-dev" +version = "2.0.0" requires-python = ">= 3.11" dependencies = [ "Pillow>=10.3.0", From 44f6777f704e51c8f07967cac5c739d73f4ad02f Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Thu, 1 May 2025 03:16:59 +0300 Subject: [PATCH 11/11] Add release links to README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index eb026d5..f9b3c17 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@ Collection of tools used by VienDesu! Porting Team ### Installation #### Download from releases: - * Windows - `TODO` - * Linux - `TODO` - * MacOS - `TODO` + * Windows - [x64](https://git.viende.su/VienDesuPorting/VNTools/releases/download/2.0.0/vntools-win-x64.zip) + * Linux - [x86_64](https://git.viende.su/VienDesuPorting/VNTools/releases/download/2.0.0/vntools-linux-x86_64.zip) [arm64](https://git.viende.su/VienDesuPorting/VNTools/releases/download/2.0.0/vntools-linux-arm64.zip) + * MacOS - [x86_64](https://git.viende.su/VienDesuPorting/VNTools/releases/download/2.0.0/vntools-darwin-x86_64.zip) [arm64](https://git.viende.su/VienDesuPorting/VNTools/releases/download/2.0.0/vntools-darwin-arm64.zip) #### Build tools as binaries: - * Run `./build.sh` on UNIX + * Run `./build.sh` for UNIX * Run `.\build.bat` for Windows #### Install as python package: