ticket-decoder 0.20.2__tar.gz → 0.20.4__tar.gz

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/.gitignore

@@ -3,6 +3,8 @@
 /out
 /.venv
 /venv
+/conan2
+/uvc
 myeasylog.log
 ticketdecoder.log
 **/.DS_Store

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/CMakeLists.txt

@@ -10,6 +10,11 @@ cmake_policy(SET CMP0063 NEW) # To make the visibility setting below working
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 
+if(WIN32)
+  # To avoid the min/max macros from windows.h to conflict with std::min/std::max
+  add_compile_definitions(NOMINMAX)
+endif()
+
 IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE Release)
 ENDIF()

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ticket-decoder
-Version: 0.20.2
+Version: v0.20.4
 Summary: Train ticket barcode to json decoding library, using zxing-cpp decoding in combination with record interpreter, to transform content into json structure
 Keywords: train-ticket,barcode,aztec-code,uic918,vdv,sbb,oebb
 Author: user4223
@@ -19,9 +19,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 Optional arguments for instance creation of DecoderFacade.
 * `uic_public_key_xml_file` = "cert/UIC_PublicKeys.xml"  
-  Relative path to the XML file containing UIC public keys you can obtain here: https://railpublickey.uic.org/ .
+  Relative path to the XML file containing UIC public keys to verify UIC barcode content.
+  You can use [install-uic-keys.py](https://github.com/user4223/ticket-decoder/blob/main/cert/install-uic-keys.py) to retrieve the file.
 * `vdv_certificate_ldif_file` = "cert/VDV_Certificates.ldif"  
   Relative path to the LDIF file containing VDV certificates to decrypt VDV barcode content.
+  You can use [install-vdv-certificates.py](https://github.com/user4223/ticket-decoder/blob/main/cert/install-vdv-certificates.py) to retrieve the file.
 * `fail_on_decoder_error` = false  
   Fail when the aztec/barcode decoder gets an error if true or deliver an empty result when false.
 * `fail_on_interpreter_error` = false  

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/README.md

@@ -3,15 +3,11 @@ SPDX-FileCopyrightText: (C) 2022 user4223 and (other) contributors to ticket-dec
 SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
-[![arm64-macos](https://github.com/user4223/ticket-decoder/actions/workflows/arm64-macos.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/arm64-macos.yml)
-[![x64-macos](https://github.com/user4223/ticket-decoder/actions/workflows/x64-macos.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/x64-macos.yml)
-[![ubuntu24-clang18](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu24-clang18.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu24-clang18.yml)
-[![ubuntu24-gcc13](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu24-gcc13.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu24-gcc13.yml)
+[![macos](https://github.com/user4223/ticket-decoder/actions/workflows/macos.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/macos.yml)
 [![pypi](https://github.com/user4223/ticket-decoder/actions/workflows/pypi.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/pypi.yml)
+[![ubuntu](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu.yml)
+[![ubuntu-clang](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu-clang.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu-clang.yml)
 
-<!--
-[![ubuntu22-gcc11](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu22-gcc11.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu22-gcc11.yml)
--->
 # Overview
 
 Provide optimized and robust methods to detect and decode aztec-codes by using opencv and zxing-cpp in combination and to transcode UIC918 information with **signature validation** into json structure. (UIC918-3 and UIC918-9)<br>
@@ -41,7 +37,7 @@ For more details about usage see here: [README](./source/python/README.md)
 
 Prefer using the official module, but when you want to build the module locally,
 the following steps should work:
-```
+```sh
 export CMAKE_POLICY_VERSION_MINIMUM=3.5         # To make easyloggingcpp building properly using a quite old minimum cmake version
 
 uv build --wheel
@@ -53,7 +49,7 @@ uv run python
 
 When the module has been built und installed successfully, it should be possible
 to execute the following minimal Python script:
-```
+```python
 from ticket_decoder import DecoderFacade
 
 decoder_facade = DecoderFacade()
@@ -152,7 +148,7 @@ This step is required only when the UIC specificatation gets updated and the cha
   * MacOS: `brew install asn1c`
   * Ubuntu: `apt install -y asn1c`
 * Generate required code by using the following support script:
-```
+```sh
 # Clones the repository and calls asn1c with matching parameters at the right places
 #
 ./etc/generate-uic-asn1-pods.sh
@@ -191,19 +187,15 @@ This step is required only when the UIC specificatation gets updated and the cha
 
 # Signature Checking / Message Decryption / Id-Mapping
 
-* Place XML file containing public keys from UIC at default location  
-  `cert/UIC_PublicKeys.xml`
-  * https://railpublickey.uic.org/
+* Place XML file containing public UIC keys at default location `cert/UIC_PublicKeys.xml` by calling:
+  ```
+  python cert/install-uic-keys.py
+  ```
 
-* Place LDIF export file containing public certificates from VDV at default location  
-  `cert/VDV_Certificates.ldif`
-  * Install 'Apache Directory Studio' or another useful tool to export LDIF:
-    - on macos via `brew install apache-directory-studio`  
-    - on linux see: https://directory.apache.org/studio/download/download-linux.html
-  * Create a new connection to `ldaps://ldap-vdv-ion.telesec.de:636`
-  * Navigate to `c=de,o=VDV Kernapplikations GmbH,ou=VDV KA`
-  * Right click to `ou=VDV KA` and select 'Export' and 'LDIF Export'
-  * Click continue, select a file name and continue until the export starts
+* Place LDIF export file containing public VDV certificates at default location `cert/VDV_Certificates.ldif` by calling:
+  ```
+  python cert/install-vdv-certificates.py
+  ```
 
 * List of numeric codes for railway companies (RICS Code)  
   https://uic.org/support-activities/it/rics
@@ -214,6 +206,11 @@ This step is required only when the UIC specificatation gets updated and the cha
 
 # Further Documentation and Ticket Samples
 
+You can download known public sample images into `images/` folder by calling:
+```
+python images/install-sample-tickets.py
+```
+
 * Interoperability UIC/VDV codes, UIC918-3 and UIC918-9 example tickets and mappings for ids used in VDV codes  
   https://www.bahn.de/angebot/regio/barcode
   * [UIC918-3 Muster](https://assets.static-bahn.de/dam/jcr:c362849f-210d-4dbe-bb18-34141b5ba274/mdb_320951_muster-tickets_nach_uic_918-3_2.zip)
@@ -223,7 +220,7 @@ This step is required only when the UIC specificatation gets updated and the cha
   * [Testbarcodes VDV-KA und UIC](https://www.kcd-nrw.de/fileadmin/user_upload/2023-05-05_Testtickets.zip)
   
   You can use the following command to convert PDF file into images for further processing if you want, but you don't have to because the application is able to precess pdf files directly. But decoding quality might differ depending on parameters like DPI, so when you want to play with that...
-  ```
+  ```sh
   # brew|apt install imagemagick
   convert -density 250 -trim -quality 100 -flatten <file name>.pdf <file name>.png
   ```
@@ -252,7 +249,7 @@ This step is required only when the UIC specificatation gets updated and the cha
 
 ## Requirements
 
-* **gcc >= 13 or clang >= 18 or apple-clang >= 17**  
+* **gcc >= 13 or clang >= 18 or apple-clang >= 17 or msvc >= 19**
   other compilers and versions may work but are not tested
 * **python >= 3.13**
   older versions might work but are untested
@@ -317,7 +314,7 @@ Workaround for poppler: since the official version of this library on conancente
 via conan but with own recipe to get minimal and up-to-date version: see `etc/poppler/conanfile.py`.
 Library creation is integrated in `etc/conan-install.sh` script which is called from common setup scripts automatically.
 
-## Ubuntu 22/24
+## Ubuntu 24/26
 
 ### Inside docker build container
 
@@ -328,7 +325,7 @@ As long as the conanfile.py is unchanged, you can re-use the container with pre-
 
 * [etc/docker/setup.ubuntu24.gcc13.sh](etc/docker/setup.ubuntu24.gcc13.sh)
 * [etc/docker/setup.ubuntu24.clang18.sh](etc/docker/setup.ubuntu24.clang18.sh)
-* [etc/docker/setup.ubuntu22.gcc11.Python.sh](etc/docker/setup.ubuntu22.gcc11.Python.sh)
+* [etc/docker/setup.ubuntu24.gcc13.Python.sh](etc/docker/setup.ubuntu24.gcc13.Python.sh)
 
 When the preparation of the build environment has been successful, it should be possible to build the project by using `./build.sh -j3` **inside the build container**.
 (When your container environment has enough memory, you can try `./build.sh` as well. But often this leads to out-of-memory-errors due to lots of files getting compiled in parallel and the container environment is killing the compilers when they reach the memory limit.)
@@ -348,7 +345,7 @@ tools.system.package_manager:sudo_askpass=True
 ```
 **Otherwise**, please install required xorg dependencies manually. For details about specific required packages,
 please check the error message carefully and/or check `etc/install-ubuntu-dependencies.sh` for a list of dev-package names.
-```
+```bash
 apt-get install --no-install-recommends -y build-essential cmake git wget python-is-python3 python3-pip python3-dev libgtk2.0-dev
 ./etc/install-ubuntu-dependencies.sh
 
@@ -360,7 +357,8 @@ pip install -r requirements.txt
 
 ./setup.All.sh
 
-cert/install-uic-keys.sh
+python cert/install-uic-keys.py
+python cert/install-vdv-certificates.py
 
 build/Release/bin/ticket-decoder-test
 etc/python-test.sh
@@ -373,7 +371,7 @@ It might be required for dependencies to get built properly during conan install
 it might be required to create a link via `sudo ln -s $(which python3) /usr/local/bin/python` since there
 is no package python-is-python3 in homebrew available, as it is for ubuntu. Verify your $PATH environment
 variable to ensure `python` interpreter is taken from `/usr/local/bin` for the shell you are using.
-```
+```zsh
 xcode-select --install
 brew install cmake
 
@@ -385,12 +383,50 @@ pip install -r requirements.txt
 
 ./setup.All.sh
 
-cert/install-uic-keys.sh
+python cert/install-uic-keys.py
+python cert/install-vdv-certificates.py
 
 build/Release/bin/ticket-decoder-test
 etc/python-test.sh
 ```
 
-## Windows
+## Windows with MSVC 19
 
-For sure, it should be possible to get it built by using visual compiler and toolchain as well. But I never tried and you might need to modify some build parameters/arguments and you have know (or to find out) how to setup toolchain, conan and cmake in Windows environment. Furthermore, the compiler might complain about things gcc and clang are not complaining about. Pull request welcome!
+Scripting for simplification of configuration and build should be unified in future, but for now the commands
+can be called manually. It's not required to have a full blown Visual Studio installed, it's enough to install
+**Visual Studio Build Tools** by using the [vs_buildtools.exe installer](https://aka.ms/vs/stable/vs_buildtools.exe)
+as documented [here](https://learn.microsoft.com/en-us/cpp/overview/acquire-msvc).
+git, cmake and python must be installed as well to make this work.
+
+```powershell
+python -m venv venv
+.\venv\Scripts\activate
+pip install -r requirements.txt
+
+# Some dependencies ignore explicitly given parameters, so to force we define this env vars.
+$env:CMAKE_POLICY_VERSION_MINIMUM="3.5"
+$env:CMAKE_BUILD_TYPE="Release"
+
+conan profile detect # May fail when default profile already exists, ignore in this case
+conan install . --build missing -of .\build\Release\ -s:a="build_type=Release" -s:a="compiler.cppstd=20" `
+  -o:a="&:with_ticket_analyzer=True" `
+  -o:a="&:with_ticket_decoder=True" `
+  -o:a="&:with_python_module=True" `
+  -o:a="&:with_square_detector=True" `
+  -o:a="&:with_classifier_detector=True" `
+  -o:a="&:with_barcode_decoder=True" `
+  -o:a="&:with_pdf_input=True" `
+  -o:a="&:with_signature_verifier=True" `
+  -o:a="&:with_uic_interpreter=True" `
+  -o:a="&:with_vdv_interpreter=True" `
+  -o:a="&:with_sbb_interpreter=True"
+
+cmake -S . -B .\build\Release\ --toolchain .\build\Release\build\generators\conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
+cmake --build .\build\Release\ --config Release
+
+python cert\install-uic-keys.py
+python cert\install-vdv-certificates.py
+python images\install-sample-tickets.py
+
+.\build\Release\bin\Release\ticket-decoder -i '.\images\Muster-UIC918-9\Muster 918-9 CityTicket.pdf'
+```

ticket_decoder-0.20.4/cert/install-uic-keys.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+#
+# Download UIC public keys from public key server to allow verification of UIC tickets
+#
+
+from pathlib import Path
+from urllib.request import urlopen
+from datetime import date
+from xml.dom import minidom
+
+
+def main() -> None:
+
+    project_root = Path(__file__).resolve().parents[1]
+    certificate_root = project_root / "cert"
+    certificate_root.mkdir(parents=True, exist_ok=True)
+
+    with urlopen("https://railpublickey.uic.org/download.php", timeout=30) as response:
+        key_content = response.read().decode("utf-8")
+
+    if not key_content:
+        raise RuntimeError("No UIC public keys found")
+
+    key_file = certificate_root / "UIC_PublicKeys.xml"
+    if key_file.exists():
+        key_file.replace(certificate_root / f"UIC_PublicKeys_{date.today().isoformat()}.xml")
+
+    with minidom.parseString(key_content) as key_xml:
+        key_file.write_text(key_xml.toprettyxml(newl='\n'))
+        print(f'Installed {len(key_xml.getElementsByTagName('publicKey'))} UIC keys in: {str(key_file)}')
+
+
+if __name__ == "__main__":
+    main()

ticket_decoder-0.20.4/cert/install-vdv-certificates.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+#
+# Download VDV certificates from the public LDAP server
+#
+
+from pathlib import Path
+from ldap3 import Server, Connection, ANONYMOUS
+from datetime import date
+
+
+def main() -> None:
+
+    project_root = Path(__file__).resolve().parents[1]
+    certificate_root = project_root / "cert"
+    certificate_root.mkdir(parents=True, exist_ok=True)
+
+    server = Server('ldaps://ldap-vdv-ion.telesec.de:636', connect_timeout=30)
+    with Connection(server, authentication=ANONYMOUS, auto_bind=True) as connection:
+        connection.search('o=VDV Kernapplikations GmbH,c=DE', '(objectClass=*)', attributes=['*'])
+
+        if not connection.entries:
+            raise RuntimeError("No matching VDV certificates found")
+
+        certificate_file = certificate_root / "VDV_Certificates.ldif"
+        if certificate_file.exists():
+            certificate_file.replace(certificate_root / f"VDV_Certificates_{date.today().isoformat()}.ldif")
+
+        certificate_file.write_text(connection.response_to_ldif(line_separator='\n'))
+        print(f'Installed {len(connection.entries)} VDV certificates in: {str(certificate_file)}')
+
+
+if __name__ == "__main__":
+    main()

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/conanfile.py

@@ -8,7 +8,7 @@ from os import path
 
 class TicketDecoderConan(ConanFile):
    name = 'ticket-decoder'
-   version = 'v0.20.2'
+   version = 'v0.20.4'
    settings = "os", "compiler", "build_type", "arch"
    generators = "CMakeDeps"
    options = {
@@ -77,7 +77,7 @@ class TicketDecoderConan(ConanFile):
 
       if self.options.with_barcode_decoder:
          # https://conan.io/center/recipes/zxing-cpp
-         self.requires("zxing-cpp/2.3.0")
+         self.requires("zxing-cpp/3.1.1")
 
       if self.options.with_uic_interpreter:
          # https://conan.io/center/recipes/zlib

ticket_decoder-0.20.4/etc/conan/profiles/clang21

@@ -0,0 +1,6 @@
+
+[settings]
+compiler=clang
+compiler.cppstd=20
+compiler.libcxx=libc++
+compiler.version=21

ticket_decoder-0.20.4/etc/conan/profiles/gcc15

@@ -0,0 +1,6 @@
+
+[settings]
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=15

ticket_decoder-0.20.2/etc/conan/profiles/ubuntu24 → ticket_decoder-0.20.4/etc/conan/profiles/ubuntu

@@ -1,4 +1,3 @@
-include(./gcc13)
 
 [settings]
 os=Linux

ticket_decoder-0.20.4/etc/conan/profiles/ubuntu24

@@ -0,0 +1,2 @@
+include(./gcc13)
+include(./ubuntu)

ticket_decoder-0.20.4/etc/conan/profiles/ubuntu26

@@ -0,0 +1,2 @@
+include(./gcc15)
+include(./ubuntu)

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/etc/docker/ubuntu24.clang.Dockerfile

@@ -27,7 +27,7 @@ WORKDIR /ticket-decoder
 COPY etc/conan-config.sh etc/conan-install.sh etc/cmake-config.sh etc/cmake-build.sh etc/python-test.sh etc/
 COPY etc/poppler/ etc/poppler
 COPY etc/conan/profiles etc/conan/profiles
-COPY cert/install-uic-keys.sh cert/install-vdv-certificates.sh cert/
+COPY cert/install-uic-keys.py cert/install-vdv-certificates.py cert/
 COPY .env.default .env
 COPY requirements.txt conanfile.py ./
 
@@ -39,7 +39,7 @@ RUN etc/conan-config.sh clang $CLANG_VERSION
 ### clang does not support armv8crypto intrinsics used by botan, so we have to disable for clang on arm
 RUN echo $TARGETARCH
 RUN etc/conan-install.sh Release \
-    -pr:a="./etc/conan/profiles/ubuntu24" \
+    -pr:a="./etc/conan/profiles/ubuntu" \
     -pr:a="./etc/conan/profiles/clang$CLANG_VERSION" \
     -o:a="libxml2/*:zlib=False" \
     $(if [ "$TARGETARCH" = "arm64" ]; then echo '-o:a="botan/*:with_armv8crypto=False"'; fi)
@@ -54,5 +54,5 @@ COPY <<EOF build.sh
 EOF
 RUN chmod 755 build.sh
 
-RUN cert/install-uic-keys.sh
-RUN cert/install-vdv-certificates.sh
+RUN python cert/install-uic-keys.py
+RUN python cert/install-vdv-certificates.py

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/etc/docker/ubuntu24.gcc.Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /ticket-decoder
 COPY etc/conan-config.sh etc/conan-install.sh etc/cmake-config.sh etc/cmake-build.sh etc/python-test.sh etc/
 COPY etc/poppler/ etc/poppler
 COPY etc/conan/profiles etc/conan/profiles
-COPY cert/install-uic-keys.sh cert/install-vdv-certificates.sh cert/
+COPY cert/install-uic-keys.py cert/install-vdv-certificates.py cert/
 COPY .env.default .env
 COPY requirements.txt conanfile.py ./
 
@@ -33,7 +33,8 @@ RUN pip install -r requirements.txt
 
 RUN etc/conan-config.sh gcc $GCC_VERSION
 RUN etc/conan-install.sh Release \
-    -pr:a="./etc/conan/profiles/ubuntu24" \
+    -pr:a="./etc/conan/profiles/ubuntu" \
+    -pr:a="./etc/conan/profiles/gcc$GCC_VERSION" \
     -o:a="libxml2/*:zlib=False"
 
 COPY <<EOF build.sh
@@ -46,5 +47,5 @@ COPY <<EOF build.sh
 EOF
 RUN chmod 755 build.sh
 
-RUN cert/install-uic-keys.sh
-RUN cert/install-vdv-certificates.sh
+RUN python cert/install-uic-keys.py
+RUN python cert/install-vdv-certificates.py

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/etc/docker/ubuntu24.gcc.Python.Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /ticket-decoder
 COPY etc/python-test.sh etc/
 COPY etc/poppler/ etc/poppler
 COPY etc/conan/profiles etc/conan/profiles
-COPY cert/install-uic-keys.sh cert/install-vdv-certificates.sh cert/
+COPY cert/install-uic-keys.py cert/install-vdv-certificates.py cert/
 COPY LICENSES/ LICENSES
 COPY README.md pyproject.toml conanfile.py source/python/requirements.txt ./
 
@@ -42,5 +42,5 @@ RUN chmod 755 build.sh
 
 RUN uv pip install ldap3 -r requirements.txt
 
-RUN cert/install-uic-keys.sh
-RUN cert/install-vdv-certificates.sh
+RUN python cert/install-uic-keys.py
+RUN python cert/install-vdv-certificates.py

ticket_decoder-0.20.4/images/install-sample-tickets.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# Download public UIC and VDV sample tickets
+#
+
+from pathlib import Path
+from urllib.request import urlopen
+from io import BytesIO
+from zipfile import ZipFile
+
+def main() -> None:
+
+    project_root = Path(__file__).resolve().parents[1]
+    image_root = project_root / "images"
+    image_root.mkdir(parents=True, exist_ok=True)
+
+    count = 0
+    for entry in [
+        {'folder': 'Muster-UIC918-3', 'url': 'https://assets.static-bahn.de/dam/jcr:c362849f-210d-4dbe-bb18-34141b5ba274/mdb_320951_muster-tickets_nach_uic_918-3_2.zip'},
+        {'folder': 'Muster-UIC918-9', 'url': 'https://assets.static-bahn.de/dam/jcr:ec74454d-557b-438f-8ed9-689abcc276f5/Muster%20918-9.zip'},
+        {'folder': 'Muster-VDV-KA', 'url': 'https://www.kcd-nrw.de/fileadmin/user_upload/2023-05-05_Testtickets.zip'}]:
+
+        destination_root = image_root / entry['folder']
+
+        with urlopen(entry['url']) as response:
+            with ZipFile(BytesIO(response.read())) as zip:
+                for info in zip.infolist():
+                    if info.is_dir():
+                        continue
+
+                    info.filename = Path(info.filename).name
+                    zip.extract(info, destination_root)
+                    count = count + 1
+
+    print(f'Installed {count} sample images in: {str(image_root)}')
+
+
+if __name__ == "__main__":
+    main()

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "ticket-decoder"
-version = "v0.20.2"
+version = "v0.20.4"
 description = "Train ticket barcode to json decoding library, using zxing-cpp decoding in combination with record interpreter, to transform content into json structure"
 license = "GPL-3.0-or-later"
 authors = [ { name = "user4223" } ]
@@ -31,28 +31,37 @@ build-backend = "scikit_build_core_conan.build"
 [tool.cibuildwheel.environment]
 CMAKE_POLICY_VERSION_MINIMUM = "3.5"             # easylogging has a quite old cmake requirement, that fails with cmake >= 4 due to deprecation
 
+[tool.cibuildwheel.macos.environment]
+CMAKE_POLICY_VERSION_MINIMUM = "3.5"
+MACOSX_DEPLOYMENT_TARGET = "10.15"               # stdlib c++17 features required: https://cibuildwheel.pypa.io/en/stable/cpp_standards/#macos-and-deployment-target-versions
+
 [tool.cibuildwheel]
 build-verbosity = 2                              # https://cibuildwheel.pypa.io/en/stable/options/#build-verbosity
 build = [                                        # https://cibuildwheel.pypa.io/en/stable/options/#build-skip
     "cp31?-macosx_arm64",
-    # "cp31?-macosx_x86_64",                       # No runner right now other than self hosted and thereby untrusted
+    "cp31?-macosx_x86_64",
     "cp31?-manylinux_aarch64",
-    "cp31?-manylinux_x86_64"
+    "cp31?-manylinux_x86_64",
+    "cp31?-win_arm64",
+    "cp31?-win_amd64",
     ]
 manylinux-aarch64-image = "manylinux_2_34"       # https://cibuildwheel.pypa.io/en/stable/options/#linux-image
 manylinux-x86_64-image = "manylinux_2_34"
-before-test = "mkdir -p cert && curl --output cert/UIC_PublicKeys.xml -s 'https://railpublickey.uic.org/download.php'"
-test-command = """python -c '
-from ticket_decoder import DecoderFacade
-decoder = DecoderFacade()
-result = decoder.decode_base64("I1VUMDExMDgwMDAwMDEwLQIUNDW6hIQDALJXkeinsN8LGG6JJ9kCFQCbqcKtFige6dO0zRFzeaDKaTWlgwAAADAzNTh4nAuN93B1dDEwNDAwNTY0sDCwCIkwc3cxCGRAAgZmhgZGBkZGhibGFgYuri6uofEhPo6RQE1GRmYBPo6eBgZAnSZA0tDIAATMvXMSi4tTrQxMgRwjiJhZQGpRsZ4VmG1oAbLQwNItMaMoO7GoJBXMhWg2NHI/vCenJDM9OzWzxMrA0NAUZAJQ3sQwLD9PwchAz9BAD+QaBQNLoGlcTpnFCkaGCEFjkBUmhpYg46CmmgJ5RlCeqYEx3AFGpsHJGTmpxeWZ6boe+TnFJamZebohmcnZqSWh8W4+rhGGxiD7kzYxtD3kPbjo9A1RQY5GVpkWi5WJWyp6NBZwNTZwzDj07AXfsmMXnlw686KMsaFJiUGeoUGQr5STL+lMk7A0X1/Uh08vp7AvPNYgmMF0wKFBEqeVoDAMCwXHhBFDCjDYWRn1+pp0JUqYf0mUO4Z4MDiGSjAwCBqABNnvsAoIdzAIAAAFHHyh")
-print(result)
-'"""
+before-test = "python {project}/cert/install-uic-keys.py"
+test-command = "python {project}/source/test/python/wheel_smoke_test.py"
 
 [tool.cibuildwheel.linux]
 before-build = "rm -rf build/Release"
+# auditwheel should be called in any case to unify wheels but it requires at least some .so files, but our dependencies are fully statically linked.
+# we don't have the path to the build directory here, so we unzip the two ...u_flex.so files from the wheel to include them right afterwards again.
 repair-wheel-command = "unzip -o -j -d .libs {wheel} \"*lib*.so\" && LD_LIBRARY_PATH=`pwd`/.libs auditwheel repair -w {dest_dir} {wheel}"
 
+[tool.cibuildwheel.windows]
+before-build = "python -m pip install delvewheel"
+# delvewheel should be called in any case to unify wheels but it requires at least some .dll files, but our dependencies are fully statically linked.
+# we don't have the path to the build directory here, so we unzip the two ...u_flex.dll files from the wheel to include them right afterwards again.
+repair-wheel-command = "python -m zipfile -e \"{wheel}\" \".libs\" && delvewheel repair --add-path \".libs\\ticket_decoder\" -w \"{dest_dir}\" \"{wheel}\""
+
 [tool.scikit-build-core-conan]
 path = "."
 build = "missing"
@@ -61,6 +70,10 @@ settings-all = [
     "build_type=Release", 
     "compiler.cppstd=20"
     ]
+config-all = [
+    # We have to define the build type here additionally, because some depenencies does not work with the default build type of conan.
+    "tools.cmake:configure_args=[\"-DCMAKE_BUILD_TYPE=Release\"]"
+    ]
 options-all = [
     "&:with_system_boost=False",
     "&:with_ticket_analyzer=False",
@@ -76,8 +89,8 @@ options-all = [
     "&:with_sbb_interpreter=True"
     ]
 
-[[tool.scikit-build-core-conan.local-recipes]]
-path = "etc/poppler/conanfile.py"
+# [[tool.scikit-build-core-conan.local-recipes]]
+# path = "etc/poppler/conanfile.py"
 
 [tool.scikit-build]
 strict-config = true
@@ -89,10 +102,10 @@ build.requires = ["conan>=2.28", "nanobind"]
 build.targets = ["ticket_decoder"]
 
 cmake.build-type = "Release"
-cmake.args = [ "--toolchain build/Release/build/Release/generators/conan_toolchain.cmake", "-G Ninja" ]
-cmake.define = { CMAKE_BUILD_TYPE = "Release", CMAKE_POLICY_VERSION_MINIMUM = "3.5" }
+cmake.args = [ "--toolchain build/Release/build/Release/generators/conan_toolchain.cmake" ]
+cmake.define = { CMAKE_BUILD_TYPE = "Release", CMAKE_CONFIGURATION_TYPES = "Release", CMAKE_POLICY_VERSION_MINIMUM = "3.5" }
 
-sdist.exclude = ["build/", "conan2/", ".github/", ".vscode/", "dist/", "out/", "venv/", "*.log", "*.pnm", "setup.*.sh"]
+sdist.exclude = ["build/", "conan2/", "uvc/", ".github/", ".vscode/", "dist/", "out/", "venv/", "*.log", "*.pnm", "setup.*.sh"]
 sdist.include = ["doc/*", "cert/*", "images/*"]
 sdist.inclusion-mode = "default"
 sdist.reproducible = true

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/requirements.txt

@@ -2,4 +2,4 @@
 
 conan>=2.28 # C++ package manager
 nanobind    # Python bindings: https://nanobind.readthedocs.io/en/latest/index.html
-ldap3       # Used by cert/install-vdv-certificates.sh to download VDV certificates via LDAP
+ldap3       # Used by cert/install-vdv-certificates.py to download VDV certificates via LDAP

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/source/app/source/analyzer.cpp

@@ -23,7 +23,7 @@
 
 int main(int argc, char **argv)
 {
-    auto cmd = TCLAP::CmdLine("ticket-analyzer", ' ', "v0.20.2");
+    auto cmd = TCLAP::CmdLine("ticket-analyzer", ' ', "v0.20.4");
     auto const verboseArg = TCLAP::SwitchArg(
         "v", "verbose",
         "More verbose debug logging",

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/source/app/source/decoder.cpp

@@ -15,7 +15,7 @@
 
 int main(int argc, char **argv)
 {
-    auto cmd = TCLAP::CmdLine("ticket-decoder", ' ', "v0.20.2");
+    auto cmd = TCLAP::CmdLine("ticket-decoder", ' ', "v0.20.4");
     auto const verboseArg = TCLAP::SwitchArg(
         "v", "verbose",
         "More verbose debug logging",

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/source/lib/api/source/DecoderFacade.cpp

@@ -344,7 +344,7 @@ namespace api
                                             LOG_DEBUG(internal->logger) << "Source could not be decoded: " << source.getAnnotation();
                                             return;
                                         }
-                                        transformer(std::move(decoderResult), source.getUniquePath()); });
+                                        transformer(std::move(decoderResult), source.getUniquePath().string()); });
     }
 
     template <typename T>
@@ -456,7 +456,7 @@ namespace api
     std::string DecoderFacade::decodeRawFileToJson(std::filesystem::path filePath)
     {
         auto const rawData = utility::readBinary(filePath);
-        return decodeRawBytesToJson(rawData, filePath);
+        return decodeRawBytesToJson(rawData, filePath.string());
     }
 
     std::string DecoderFacade::decodeRawBytesToJson(std::vector<std::uint8_t> rawData, std::string origin)

{ticket_decoder-0.20.2 → ticket_decoder-0.20.4}/source/lib/detector/detail/classifier/source/ClassifierDetector.cpp

@@ -26,7 +26,7 @@ namespace detector::detail
       {
         throw std::domain_error("Path to classifier file does not reference a file: " + classifierFile.string());
       }
-      classifier = std::make_unique<cv::CascadeClassifier>(classifierFile);
+      classifier = std::make_unique<cv::CascadeClassifier>(classifierFile.string());
     }
   };