Better #1 handling. Auto tests.

Author: varnav

.github/workflows/python-linux.yml

@@ -13,26 +13,35 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.8', '3.9']
 
     steps:
     - uses: actions/checkout@v2
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install setuptools wheel twine flake8
+        python -m pip install setuptools wheel twine flake8 pytest Pillow
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=15 --max-line-length=250 --statistics
 
+    - name: Install cjxl
+      run: /bin/bash build_cjxl.sh
+
+    - name: Test
+      run: pytest
+
     - name: Build package
       run: python setup.py sdist bdist_wheel
 

build_cjxl.sh

@@ -5,20 +5,32 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-DEBIAN_FRONTEND=noninteractive
+if [ $(grep -c avx2 /proc/cpuinfo) == 0 ]
+  then echo "AVX2 support required"
+  exit
+fi
+
+set -ex
+
+
+export DEBIAN_FRONTEND=noninteractive
+
+export RUSTFLAGS="-C target-feature=+avx2,+fma"
+export CFLAGS="-mavx2 -mfma -ftree-vectorize -pipe"
+
+export CC=clang-7 CXX=clang++-7
 
 apt-get update
 apt-get -y install git wget ca-certificates cmake pkg-config libbrotli-dev libgif-dev libjpeg-dev libopenexr-dev libpng-dev libwebp-dev clang-7
-export CC=clang-7 CXX=clang++-7
 
 cd /tmp/
 rm -rf jpeg-xl
-git clone https://gitlab.com/wg1/jpeg-xl.git --recursive
+git clone  --recursive --depth=1 https://gitlab.com/wg1/jpeg-xl.git
 cd jpeg-xl
 rm -rf build
 mkdir build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF ..
-cmake --build . -- -j
+cmake --build . -- -j$(nproc)
 
 cp tools/cjxl /usr/bin/

makejxl.py

@@ -7,11 +7,10 @@
 from shutil import which
 from subprocess import run
 from typing import Iterable
-import shlex
 
 import click
 
-__version__ = '0.1.2'
+__version__ = '0.1.4'
 SUPPORTED_FORMATS = ['jpeg', 'jpg', 'png', 'apng', 'gif', 'exr', 'ppm', 'pfm', 'pgx']
 
 
@@ -63,8 +62,8 @@ 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 --quiet -s {speed} --num_threads={jobs} {fp} {newpath}'
-        conversion_return_code = run(shlex.split(convert_cmd)).returncode
+        convert_cmd = ['cjxl', '--quiet', '-s', speed, f'--num_threads={jobs}', fp, newpath]
+        conversion_return_code = run(convert_cmd).returncode
         if conversion_return_code == 0:
             saved = os.path.getsize(fp) - os.path.getsize(newpath)
             total += saved

test_main.py

@@ -0,0 +1,56 @@
+import os
+
+from PIL import Image
+import tempfile
+from click.testing import CliRunner
+
+from makejxl import main as conv
+
+tempdir = tempfile.mkdtemp() + os.sep
+# tempdir = '/mnt/c/temp/2/'
+
+n1 = tempdir + 'testimage1.jpg'
+n2 = tempdir + 'testimage with space.jpg'
+n3 = tempdir + 'testimage-with-dash.jpg'
+n4 = tempdir + 'testimage.with.dots.jpg'
+n5 = tempdir + 'файлик на кириллице.jpg'
+
+r1 = tempdir + 'testimage1.jxl'
+r2 = tempdir + 'testimage with space.jxl'
+r3 = tempdir + 'testimage-with-dash.jxl'
+r4 = tempdir + 'testimage.with.dots.jxl'
+r5 = tempdir + 'файлик на кириллице.jxl'
+
+# Generate test images
+img = Image.new('RGB', (1024, 1024), color='white')
+img.save(n1)
+img.save(n2)
+img.save(n3)
+img.save(n4)
+img.save(n5)
+
+
+def test_1():
+    runner = CliRunner()
+    result = runner.invoke(conv, tempdir)
+    assert result.exit_code == 0
+
+
+def test_2():
+    assert os.path.exists(r1)
+
+
+def test_3():
+    assert os.path.exists(r2)
+
+
+def test_4():
+    assert os.path.exists(r3)
+
+
+def test_5():
+    assert os.path.exists(r4)
+
+
+def test_6():
+    assert os.path.exists(r5)