Show totals

Author: varnav

README.md

@@ -29,7 +29,7 @@ You can download and use it as single Windows binary, see [Releases](https://git
 
 Unfortunately antiviruses [don't like packed Python executables](https://github.com/pyinstaller/pyinstaller/issues?q=is%3Aissue+virus), so expect false positives from them if you go this way. Best way is pip.
 
-You will need [cjxl](https://gitlab.com/wg1/jpeg-xl/-/blob/master/doc/developing_in_windows.md) in path, for example `%USERPROFILE%\AppData\Local\Microsoft\WindowsApps`
+You will need [cjxl](https://gitlab.com/wg1/jpeg-xl/-/blob/master/doc/developing_in_windows.md) in path. It's best to build it using [this tool](https://github.com/m-ab-s/media-autobuild_suite) and copy to `%USERPROFILE%\AppData\Local\Microsoft\WindowsApps`
 
 ```cmd
 ./makejxl.exe "c:\\Users\\username\\Pictures\\My Vacation"

makejxl.py

@@ -8,9 +8,8 @@
 from typing import Iterable
 
 import click
-from termcolor import colored
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 SUPPORTED_FORMATS = ['jpeg', 'jpg', 'png', 'apng', 'gif', 'exr', 'ppm', 'pfm', 'pgx']
 
 
@@ -39,6 +38,9 @@ def search_files(dirpath: str, recursive: bool) -> Iterable[str]:
 @click.option('-r', '--recursive', is_flag=True, help='Recursive')
 @click.option('-s', '--speed', default='kitten', help='Speed')
 def main(directory, recursive=False, speed='kitten'):
+    total = 0
+    num = 0
+
     if recursive:
         print('Processing recursively starting from', directory)
         recursive = True
@@ -53,12 +55,16 @@ def main(directory, recursive=False, speed='kitten'):
     for filepath in search_files(str(directory), recursive=recursive):
         fp = pathlib.PurePath(filepath)
         newpath = fp.parent.joinpath(fp.stem + '.' + 'jxl')
-        convert_cmd = f'cjxl -s {speed} {fp} {newpath}'
+        convert_cmd = f'cjxl --quiet -s {speed} {fp} {newpath}'
         conversion_return_code = run(convert_cmd, shell=True).returncode
         if conversion_return_code == 0:
-            print(colored(newpath, 'green'), 'ready')
+            saved = os.path.getsize(fp) - os.path.getsize(newpath)
+            total += saved
+            num += 1
+            print(newpath, 'ready, saved', round(saved / 1024), 'KB')
         else:
-            print(colored(fp, 'red'), 'error')
+            print(fp, 'error')
+    print('Total saved', round(total / 1024 / 1024), 'MB in', num, 'files')
 
 
 if __name__ == '__main__':

requirements.txt

@@ -1,2 +1 @@
-click~=7.1.2
-termcolor~=1.1.0
+click~=7.1.2

setup.py

@@ -11,16 +11,15 @@
     long_description = fh.read()
 
 install_requires = [
-    'click>=7.1.2',
-    'termcolor>=1.1.0'
+    'click>=7.1.2'
 ]
 
 setuptools.setup(
     name="makejxl",
     version=makejxl.__version__,
     author="Evgeny Varnavskiy",
     author_email="[email protected]",
-    description="This tool will bulk encode image files in given directory to [JPEG-XL]",
+    description="This tool will bulk encode image files in given directory to JPEG-XL",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/varnav/makejxl",