Improve VDV ticket interpreter

.github/workflows/arm64-macos.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: |
           . venv/bin/activate
-          etc/conan-install.sh Release -pr:a ./etc/conan/profiles/macos${{ steps.retrieve-version.outputs.MACOS_MAJOR_VERSION }}
+          etc/conan-install.sh Release -pr:a="./etc/conan/profiles/macos${{ steps.retrieve-version.outputs.MACOS_MAJOR_VERSION }}"
 
       - name: Build
         run: |
@@ -56,7 +56,7 @@ jobs:
 
       - name: Unit-Test C++
         run: |
-          etc/install-uic-keys.sh
+          cert/install-uic-keys.sh
           build/Release/bin/ticket-decoder-test
 
       - name: Unit-Test Python3

.github/workflows/ubuntu22-gcc11.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Install dependencies
         run: |
           . venv/bin/activate
-          etc/conan-install.sh Release -pr:a ./etc/conan/profiles/ubuntu22
+          etc/conan-install.sh Release -pr:a="./etc/conan/profiles/ubuntu22" -o:a="&:with_signature_verifier=False"
 
       - name: Build
         run: |
@@ -60,7 +60,7 @@ jobs:
 
       - name: Unit-Test C++
         run: |
-          etc/install-uic-keys.sh
+          cert/install-uic-keys.sh
           build/Release/bin/ticket-decoder-test
 
       - name: Unit-Test Python3

.github/workflows/ubuntu24-clang16.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Install dependencies
         run: |
           . venv/bin/activate
-          etc/conan-install.sh Release -pr:a ./etc/conan/profiles/ubuntu24 -pr:a ./etc/conan/profiles/clang$CLANG_VERSION
+          etc/conan-install.sh Release -pr:a="./etc/conan/profiles/ubuntu24" -pr:a="./etc/conan/profiles/clang$CLANG_VERSION"
 
       - name: Build
         run: |
@@ -64,7 +64,7 @@ jobs:
 
       - name: Unit-Test C++
         run: |
-          etc/install-uic-keys.sh
+          cert/install-uic-keys.sh
           build/Release/bin/ticket-decoder-test
 
       - name: Unit-Test Python3

.github/workflows/ubuntu24-gcc13.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Install dependencies
         run: |
           . venv/bin/activate
-          etc/conan-install.sh Release -pr:a ./etc/conan/profiles/ubuntu24
+          etc/conan-install.sh Release -pr:a="./etc/conan/profiles/ubuntu24"
 
       - name: Build
         run: |
@@ -60,7 +60,7 @@ jobs:
 
       - name: Unit-Test C++
         run: |
-          etc/install-uic-keys.sh
+          cert/install-uic-keys.sh
           build/Release/bin/ticket-decoder-test
 
       - name: Unit-Test Python3

.github/workflows/x64-macos.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Install dependencies
         run: |
           . venv/bin/activate
-          etc/conan-install.sh Release -pr:a ./etc/conan/profiles/macos${{ steps.retrieve-version.outputs.MACOS_MAJOR_VERSION }}
+          etc/conan-install.sh Release -pr:a="./etc/conan/profiles/macos${{ steps.retrieve-version.outputs.MACOS_MAJOR_VERSION }}"
 
       - name: Build
         run: |
@@ -49,7 +49,7 @@ jobs:
 
       - name: Unit-Test C++
         run: |
-          etc/install-uic-keys.sh
+          cert/install-uic-keys.sh
           build/Release/bin/ticket-decoder-test
 
       - name: Unit-Test Python3

.vscode/launch.json

@@ -145,6 +145,18 @@
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "build debug"
     },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "decoder - debug - image (VDV Einzelfahrausweis Ermäßigt)",
+      "program": "${workspaceFolder}/build/Debug/bin/ticket-decoder",
+      "args": [
+        "-i",
+        "images/VDV Einzelfahrausweis Ermäßigt Berlin Rheinsberg.png"
+      ],
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "build debug"
+    },
     {
       "type": "lldb",
       "request": "launch",

README.md

@@ -214,7 +214,7 @@ Optional and minimal user interaction methods to support fast interactive experi
 * 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)
-  * [UIC918-9 Muster](https://assets.static-bahn.de/dam/jcr:3c7a020a-7632-4f23-8716-6ebfc9f93ccb/Muster%20918-9.zip)
+  * [UIC918-9 Muster](https://assets.static-bahn.de/dam/jcr:ec74454d-557b-438f-8ed9-689abcc276f5/Muster%20918-9.zip)
   ```
   # You can use the following command to convert PDF file into images for further processing, but you don't have to because application is able to precess pdf files directly. But decoding quality might differ depending on parameters like DPI.
   # brew|apt install imagemagick
@@ -277,7 +277,7 @@ It is possible to enable/disable parts of the application or the Python module *
 * **with_sbb_interpreter=False**  
   skips creation of SBB interpreter module and avoids dependency to protobuf
 
-To enable/disable, please use prepared scripts like [setup.Python.sh](setup.Python.sh) or [setup.Decoder.sh](setup.Decoder.sh) and change desired feature toggles there. Or pass options like `-o "&:with_ticket_analyzer=False"` to conan install script. Check the script mentioned above as a guideline.
+To enable/disable, please use prepared scripts like [setup.Python.sh](setup.Python.sh) or [setup.Decoder.sh](setup.Decoder.sh) and change desired feature toggles there. Or pass options like `-o:a="&:with_ticket_analyzer=False"` to conan install script. Check the script mentioned above as a guideline.
 
 Following libraries are used by the project. Usually you should not care about it since conan will do that for you.
 
@@ -332,7 +332,7 @@ Take a look into `./build/` folder to discover artifacts. You should be able to
 When opencv has to be built from source because of missing pre-built package for your arch/os/compiler/config mix, it might
 be necessary to install some further xorg/system libraries to make highgui stuff building inside conan install process.
 To get this handled automatically, use the conan config flags shown below in `~/conan2/profiles/default` or pass additional
-argument `-pr:a ./etc/conan/profiles/package-manager-config` to conan-install call in `setup.All.sh`.
+argument `-pr:a="./etc/conan/profiles/package-manager-config"` to conan-install call in `setup.All.sh`.
 ```
 [conf]
 tools.system.package_manager:mode=install
@@ -351,7 +351,7 @@ pip install -r requirements.txt
 git clone https://github.com/user4223/ticket-decoder.git && cd ticket-decoder
 ./setup.All.sh -- -j
 
-etc/install-uic-keys.sh
+cert/install-uic-keys.sh
 build/Release/bin/ticket-decoder-test
 
 etc/python-test.sh
@@ -375,7 +375,7 @@ pip install -r requirements.txt
 git clone https://github.com/user4223/ticket-decoder.git && cd ticket-decoder
 ./setup.All.sh -- -j
 
-etc/install-uic-keys.sh
+cert/install-uic-keys.sh
 build/Release/bin/ticket-decoder-test
 
 etc/python-test.sh

etc/install-uic-keys.sh → cert/install-uic-keys.sh

@@ -9,6 +9,11 @@ readonly WORKSPACE_ROOT="$(readlink -f $(dirname "$0"))"/..
 # curl --output ${WORKSPACE_ROOT}/cert/UIC_PublicKeys.xml \
 #     --show-error --fail 'https://railpublickey.uic.org/download.php'
 
-mkdir -p ${WORKSPACE_ROOT}/cert
-wget -nv -O ${WORKSPACE_ROOT}/cert/UIC_PublicKeys.xml \
-    'https://railpublickey.uic.org/download.php'
+readonly DESTINATION_FILE="${WORKSPACE_ROOT}/cert/UIC_PublicKeys.xml"
+
+if [ -f ${DESTINATION_FILE} ]; then
+    readonly DATE=$(date +%F)
+    cp ${DESTINATION_FILE} "${WORKSPACE_ROOT}/cert/UIC_PublicKeys_before_${DATE}.xml"
+fi
+
+wget -nv -O ${DESTINATION_FILE} 'https://railpublickey.uic.org/download.php'

conanfile.py

@@ -62,8 +62,7 @@ def requirements(self):
          # https://conan.io/center/recipes/pugixml
          self.requires("pugixml/1.15")
          # https://conan.io/center/recipes/botan
-         # - version 3.x is available but has breaking changes
-         self.requires("botan/2.19.5")
+         self.requires("botan/3.10.0")
 
       if self.options.with_pdf_input:
          # https://conan.io/center/recipes/poppler

etc/conan-install.sh

@@ -24,10 +24,13 @@ export CMAKE_BUILD_TYPE=${BUILD_TYPE}
 conan install ${WORKSPACE_ROOT} \
     --build missing \
     -of ${WORKSPACE_ROOT}/build/${BUILD_TYPE} \
-    -s:a build_type=${BUILD_TYPE} \
-    -s:a compiler.cppstd=20 \
+    -s:a="build_type=${BUILD_TYPE}" \
+    -s:a="compiler.cppstd=20" \
     ${@:2}
 
 # Remove temporary stuff like source and build folders 2 keep cache folder as small as possible.
 # This does NOT remove the created binaries.
-conan cache clean '*'
+# In Debug config, we do need source folders for debugging
+if [ "$BUILD_TYPE" = "Release" ]; then
+    conan cache clean -p="build_type=Release"
+fi

etc/docker/ubuntu22.gcc.Dockerfile

@@ -20,18 +20,20 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$GCC_VERSION 800
 RUN update-alternatives --install /usr/bin/cc  cc  /usr/bin/gcc-$GCC_VERSION 800
 
 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/install-uic-keys.sh etc/
+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/
 
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 RUN etc/conan-config.sh gcc $GCC_VERSION
 
 COPY conanfile.py .
 RUN etc/conan-install.sh Release \
-    -pr:a ./etc/conan/profiles/ubuntu22 \
-    -o libxml2/*:zlib=False
+    -pr:a="./etc/conan/profiles/ubuntu22" \
+    -o:a="libxml2/*:zlib=False" \
+    -o:a="with_signature_verifier=False"
 
 COPY <<EOF /ticket-decoder/build.sh
     #!/usr/bin/env bash
@@ -42,6 +44,6 @@ COPY <<EOF /ticket-decoder/build.sh
     ./etc/cmake-build.sh Release \$\@
 EOF
 RUN chmod 755 build.sh
-RUN etc/install-uic-keys.sh
+RUN cert/install-uic-keys.sh
 
 ENV PYTHONPATH=/ticket-decoder/build/Release/bin

etc/docker/ubuntu22.gcc.Python.Dockerfile

@@ -20,19 +20,20 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$GCC_VERSION 800
 RUN update-alternatives --install /usr/bin/cc  cc  /usr/bin/gcc-$GCC_VERSION 800
 
 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/install-uic-keys.sh etc/
+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/
 
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 RUN etc/conan-config.sh gcc $GCC_VERSION
 
 COPY conanfile.py .
 RUN etc/conan-install.sh Release \
-    -pr:a ./etc/conan/profiles/ubuntu22 \
-    -o with_ticket_analyzer=False \
-    -o libxml2/*:zlib=False
+    -pr:a="./etc/conan/profiles/ubuntu22" \
+    -o:a="with_ticket_analyzer=False" \
+    -o:a="libxml2/*:zlib=False"
 
 COPY <<EOF /ticket-decoder/build.sh
     #!/usr/bin/env bash

etc/docker/ubuntu24.clang.Dockerfile

@@ -24,9 +24,10 @@ RUN update-alternatives --install /usr/bin/ld.lld  lld     /usr/bin/ld.lld-$CLAN
 RUN update-alternatives --install /usr/bin/ld      ld      /usr/bin/ld.lld-$CLANG_VERSION  800
 
 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/install-uic-keys.sh etc/
+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/
 
 COPY requirements.txt .
 RUN python3 -m venv venv && \
@@ -40,10 +41,10 @@ COPY conanfile.py .
 # 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/clang16 \
-    -o libxml2/*:zlib=False \
-    $(if [ "$TARGETARCH" = "arm64" ]; then echo '-o botan/*:with_armv8crypto=False'; fi)
+    -pr:a="./etc/conan/profiles/ubuntu24" \
+    -pr:a="./etc/conan/profiles/clang16" \
+    -o:a="libxml2/*:zlib=False" \
+    $(if [ "$TARGETARCH" = "arm64" ]; then echo '-o:a="botan/*:with_armv8crypto=False"'; fi)
 
 COPY <<EOF build.sh
     #!/usr/bin/env bash
@@ -54,6 +55,6 @@ COPY <<EOF build.sh
     ./etc/cmake-build.sh Release \$\@
 EOF
 RUN chmod 755 build.sh
-RUN etc/install-uic-keys.sh
+RUN cert/install-uic-keys.sh
 
 ENV PYTHONPATH=/ticket-decoder/build/Release/bin

etc/docker/ubuntu24.gcc.Dockerfile

@@ -20,9 +20,10 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$GCC_VERSION 800
 RUN update-alternatives --install /usr/bin/cc  cc  /usr/bin/gcc-$GCC_VERSION 800
 
 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/install-uic-keys.sh etc/
+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/
 
 COPY requirements.txt .
 RUN python3 -m venv venv && \
@@ -34,8 +35,8 @@ RUN etc/conan-config.sh gcc $GCC_VERSION
 
 COPY conanfile.py .
 RUN etc/conan-install.sh Release \
-    -pr:a ./etc/conan/profiles/ubuntu24 \
-    -o libxml2/*:zlib=False
+    -pr:a="./etc/conan/profiles/ubuntu24" \
+    -o:a="libxml2/*:zlib=False"
 
 COPY <<EOF /ticket-decoder/build.sh
     #!/usr/bin/env bash
@@ -46,6 +47,6 @@ COPY <<EOF /ticket-decoder/build.sh
     ./etc/cmake-build.sh Release \$\@
 EOF
 RUN chmod 755 build.sh
-RUN etc/install-uic-keys.sh
+RUN cert/install-uic-keys.sh
 
 ENV PYTHONPATH=/ticket-decoder/build/Release/bin

etc/poppler/conan-create.sh

@@ -16,9 +16,12 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5
 
 conan create ${WORKSPACE_ROOT}/etc/poppler \
     --build=missing \
-    -s build_type=${BUILD_TYPE} \
+    -s:a="build_type=${BUILD_TYPE}" \
     ${@:2}
 
 # Remove temporary stuff like source and build folders 2 keep cache folder as small as possible.
 # This does NOT remove the created binaries.
-conan cache clean '*'
+# In Debug config, we do need source folders for debugging
+if [ "$BUILD_TYPE" = "Release" ]; then
+    conan cache clean -p="build_type=Release"
+fi

etc/install-sample-tickets.sh → images/install-sample-tickets.sh

@@ -12,7 +12,7 @@ mkdir -p ${WORKSPACE_ROOT}/images/temp/
 
 wget https://assets.static-bahn.de/dam/jcr:c362849f-210d-4dbe-bb18-34141b5ba274/mdb_320951_muster-tickets_nach_uic_918-3_2.zip \
     -O ${WORKSPACE_ROOT}/images/temp/uic918-3.zip
-wget https://assets.static-bahn.de/dam/jcr:95540b93-5c38-4554-8f00-676214f4ba76/Muster%20918-9.zip \
+wget https://assets.static-bahn.de/dam/jcr:ec74454d-557b-438f-8ed9-689abcc276f5/Muster%20918-9.zip \
     -O ${WORKSPACE_ROOT}/images/temp/uic918-9.zip
 
 # on macos, default unzip app is not able to handle german character encoding (-I) 4 filenames properly, so we use python
@@ -21,6 +21,7 @@ wget https://assets.static-bahn.de/dam/jcr:95540b93-5c38-4554-8f00-676214f4ba76/
 
 python3 -m zipfile -e ${WORKSPACE_ROOT}/images/temp/uic918-3.zip ${WORKSPACE_ROOT}/images/
 mv "${WORKSPACE_ROOT}/images/Muster-Tickets nach UIC 918-3" ${WORKSPACE_ROOT}/images/Muster-UIC918-3/
-python3 -m zipfile -e ${WORKSPACE_ROOT}/images/temp/uic918-9.zip ${WORKSPACE_ROOT}/images/Muster-UIC918-9/
+python3 -m zipfile -e ${WORKSPACE_ROOT}/images/temp/uic918-9.zip ${WORKSPACE_ROOT}/images/
+mv "${WORKSPACE_ROOT}/images/Muster 918-9" ${WORKSPACE_ROOT}/images/Muster-UIC918-9/
 
 rm -rf ${WORKSPACE_ROOT}/images/temp

setup.All.sh

@@ -9,17 +9,17 @@ readonly BUILD_TYPE=${1:-Release}
 
 ${WORKSPACE_ROOT}/etc/conan-config.sh
 ${WORKSPACE_ROOT}/etc/conan-install.sh ${BUILD_TYPE} \
-    -o "&:with_ticket_analyzer=True" \
-    -o "&:with_ticket_decoder=True" \
-    -o "&:with_python_module=True" \
-    -o "&:with_square_detector=True" \
-    -o "&:with_classifier_detector=True" \
-    -o "&:with_barcode_decoder=True" \
-    -o "&:with_pdf_input=True" \
-    -o "&:with_signature_verifier=True" \
-    -o "&:with_uic_interpreter=True" \
-    -o "&:with_vdv_interpreter=True" \
-    -o "&:with_sbb_interpreter=True"
+    -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"
 
 ${WORKSPACE_ROOT}/etc/cmake-config.sh ${BUILD_TYPE}
 ${WORKSPACE_ROOT}/build.sh ${BUILD_TYPE} ${@:2}