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

ticket_decoder-0.20.2/.env.default

@@ -0,0 +1,5 @@
+# For most cases, you can just copy this file to .env
+
+# This makes the python module directly loadable from build target folder
+# Note: This is only for development purposes or to simplify test discovery in vscode
+PYTHONPATH=./build/Release/bin

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

@@ -8,3 +8,4 @@ ticketdecoder.log
 **/.DS_Store
 CMakeUserPresets.json
 thresholds_new.pnm
+.env

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ticket-decoder
-Version: 0.20.0
+Version: 0.20.2
 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

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

@@ -5,7 +5,7 @@ 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-clang16](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu24-clang16.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/ubuntu24-clang16.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)
 [![pypi](https://github.com/user4223/ticket-decoder/actions/workflows/pypi.yml/badge.svg)](https://github.com/user4223/ticket-decoder/actions/workflows/pypi.yml)
 
@@ -218,6 +218,9 @@ This step is required only when the UIC specificatation gets updated and the cha
   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:ec74454d-557b-438f-8ed9-689abcc276f5/Muster%20918-9.zip)
+* Some public technical documents about VDV-Kernapplikation (VDV-KA) and sample tickets using UIC and VDV standards  
+  https://www.kcd-nrw.de/service/downloads/technische-dokumente.html
+  * [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...
   ```
@@ -241,15 +244,15 @@ This step is required only when the UIC specificatation gets updated and the cha
 ## Considerations about optical Resolution
 
 * Printed code size: 48mm (1.89inch)
-* With 200dpi:       1.89 inch/code * 200 dot/inch ~ 380 dot/code
-* With UIC-918-3:    380  dot       / 87 blocks    ~ 4.37 dot/block
+* With 200dpi:          1.89 inch/code * 200 dot/inch ~ 380 dot/code
+* With UIC-918-3:    380 dot            /    87 blocks    ~ 4.37 dot/block
 
 
 # Build Instructions
 
 ## Requirements
 
-* **gcc >= 12 or clang >= 16 or apple-clang >= 17**  
+* **gcc >= 13 or clang >= 18 or apple-clang >= 17**  
   other compilers and versions may work but are not tested
 * **python >= 3.13**
   older versions might work but are untested
@@ -324,7 +327,7 @@ As long as the conanfile.py is unchanged, you can re-use the container with pre-
 **This will install dependencies and run the build inside a ubuntu docker build container**
 
 * [etc/docker/setup.ubuntu24.gcc13.sh](etc/docker/setup.ubuntu24.gcc13.sh)
-* [etc/docker/setup.ubuntu24.clang16.sh](etc/docker/setup.ubuntu24.clang16.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)
 
 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**.

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/REUSE.toml

@@ -10,7 +10,7 @@ path = [
     "images/**",
     "cert/**",
     "doc/**",
-    "*.env",
+    ".env*",
     ]
 SPDX-FileCopyrightText = "(C) 2022 user4223 and (other) contributors to ticket-decoder <https://github.com/user4223/ticket-decoder>"
 SPDX-License-Identifier = "CC0-1.0"

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

@@ -8,7 +8,7 @@ from os import path
 
 class TicketDecoderConan(ConanFile):
    name = 'ticket-decoder'
-   version = 'v0.20'
+   version = 'v0.20.2'
    settings = "os", "compiler", "build_type", "arch"
    generators = "CMakeDeps"
    options = {
@@ -47,7 +47,7 @@ class TicketDecoderConan(ConanFile):
 
    def requirements(self):
       # https://conan.io/center/recipes/opencv
-      self.requires("opencv/4.12.0")
+      self.requires("opencv/4.14.0")
       # https://conan.io/center/recipes/nlohmann_json
       self.requires("nlohmann_json/3.12.0")
       # https://conan.io/center/recipes/easyloggingpp
@@ -55,7 +55,8 @@ class TicketDecoderConan(ConanFile):
 
       if not self.options.with_system_boost:
          # https://conan.io/center/recipes/boost
-         self.requires("boost/1.90.0")
+         self.requires("boost/1.89.0") # libpoppler build requires <= 1.89.0
+         # self.requires("boost/1.91.0")
 
       #
       # CONDITIONAL dependencies
@@ -66,13 +67,13 @@ class TicketDecoderConan(ConanFile):
 
       if self.options.with_signature_verifier:
          # https://conan.io/center/recipes/pugixml
-         self.requires("pugixml/1.15")
+         self.requires("pugixml/1.16")
          # https://conan.io/center/recipes/botan
-         self.requires("botan/3.10.0")
+         self.requires("botan/3.13.0")
 
       if self.options.with_pdf_input:
          # https://conan.io/center/recipes/poppler
-         self.requires("poppler-cpp/25.10.0")
+         self.requires("poppler/25.11.0")
 
       if self.options.with_barcode_decoder:
          # https://conan.io/center/recipes/zxing-cpp
@@ -80,18 +81,18 @@ class TicketDecoderConan(ConanFile):
 
       if self.options.with_uic_interpreter:
          # https://conan.io/center/recipes/zlib
-         self.requires("zlib/1.3.1")
+         self.requires("zlib/1.3.2")
 
       if self.options.with_sbb_interpreter:
          # https://conan.io/center/recipes/protobuf
-         self.requires("protobuf/6.32.1")
+         self.requires("protobuf/7.35.0")
 
       #
       # OVERWRITES
       #
       # https://conan.io/center/recipes/libiconv
-      self.requires("libiconv/1.18", override=True)
-      self.requires("libpng/1.6.58", override=True)
+      # self.requires("libiconv/1.18", override=True)
+      # self.requires("libpng/1.6.58", override=True)
 
    def build_requirements(self):
       # https://conan.io/center/recipes/cmake
@@ -99,7 +100,7 @@ class TicketDecoderConan(ConanFile):
       #https://conan.io/center/recipes/ninja
       self.tool_requires("ninja/[>=1.13]")
       # https://conan.io/center/recipes/gtest
-      self.test_requires("gtest/1.17.0")
+      self.test_requires("gtest/1.18.0")
 
    def generate(self):
       toolchain = CMakeToolchain(self)

ticket_decoder-0.20.0/etc/conan/profiles/clang16 → ticket_decoder-0.20.2/etc/conan/profiles/clang18

@@ -3,4 +3,4 @@
 compiler=clang
 compiler.cppstd=20
 compiler.libcxx=libc++
-compiler.version=16
+compiler.version=18

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/etc/conan-install.sh

@@ -10,7 +10,7 @@ readonly BUILD_TYPE=${1:-Release}
 # We're building poppler with cpp bindings with minimal dependencies for our own since
 # the official recipe is quite old and there is a lot of complexity due to lots of wrappers,
 # options and stuff like this. We avoid this by using an own stripped minimal recipe.
-${WORKSPACE_ROOT}/etc/poppler/conan-create.sh ${BUILD_TYPE} ${@:2}
+# ${WORKSPACE_ROOT}/etc/poppler/conan-create.sh ${BUILD_TYPE} ${@:2}
 
 # Dependencies like eaasyloggingcpp are still compatible with quite old cmake versions
 # like v2.8 but the support for this has been remove in cmake v4. So to make them

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

@@ -9,9 +9,9 @@ ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y --no-install-recommends cmake wget python-is-python3 python3-pip python3-dev python3-venv git
+RUN apt-get install -y --no-install-recommends make cmake wget git python-is-python3 python3-pip python3-venv
 # Keep all commands above equal in all build container docker files to make layers re-usable
-RUN apt-get install -y --no-install-recommends clang-$CLANG_VERSION libc++-$CLANG_VERSION-dev libc++abi-$CLANG_VERSION-dev lld-$CLANG_VERSION libgtk2.0-dev
+RUN apt-get install -y --no-install-recommends clang-$CLANG_VERSION libc++-$CLANG_VERSION-dev libc++abi-$CLANG_VERSION-dev lld-$CLANG_VERSION libgtk2.0-dev python3-dev
 RUN apt-get clean
 
 RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-$CLANG_VERSION 800
@@ -27,22 +27,20 @@ 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/
+COPY cert/install-uic-keys.sh cert/install-vdv-certificates.sh cert/
+COPY .env.default .env
+COPY requirements.txt conanfile.py ./
 
-COPY requirements.txt .
-RUN python3 -m venv venv && \
-    . venv/bin/activate && \
-    pip install -r requirements.txt
-ENV PATH="/ticket-decoder/venv/bin:$PATH"
+RUN python3 -m venv venv
+ENV PATH="venv/bin:$PATH"
+RUN pip install -r requirements.txt
 
 RUN etc/conan-config.sh clang $CLANG_VERSION
-
-COPY conanfile.py .
-# clang does not support armv8crypto intrinsics used by botan, so we have to disable for clang on arm
+### 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" \
+    -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)
 
@@ -55,6 +53,6 @@ COPY <<EOF build.sh
     ./etc/cmake-build.sh Release \$\@
 EOF
 RUN chmod 755 build.sh
-RUN cert/install-uic-keys.sh
 
-# ENV PYTHONPATH=/ticket-decoder/build/Release/bin
+RUN cert/install-uic-keys.sh
+RUN cert/install-vdv-certificates.sh

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

@@ -9,9 +9,9 @@ ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y --no-install-recommends cmake wget python-is-python3 python3-pip python3-dev python3-venv git
+RUN apt-get install -y --no-install-recommends make cmake wget git python-is-python3 python3-pip python3-venv
 # Keep all commands above equal in all build container docker files to make layers re-usable
-RUN apt-get install -y --no-install-recommends gcc-$GCC_VERSION g++-$GCC_VERSION cpp-$GCC_VERSION libstdc++-$GCC_VERSION-dev libgtk2.0-dev
+RUN apt-get install -y --no-install-recommends gcc-$GCC_VERSION g++-$GCC_VERSION cpp-$GCC_VERSION libstdc++-$GCC_VERSION-dev libgtk2.0-dev python3-dev
 RUN apt-get clean
 
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-$GCC_VERSION 800
@@ -23,22 +23,20 @@ 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/
+COPY cert/install-uic-keys.sh cert/install-vdv-certificates.sh cert/
+COPY .env.default .env
+COPY requirements.txt conanfile.py ./
 
-COPY requirements.txt .
-RUN python3 -m venv venv && \
-    . venv/bin/activate && \
-    pip install -r requirements.txt
-ENV PATH="/ticket-decoder/venv/bin:$PATH"
+RUN python3 -m venv venv
+ENV PATH="venv/bin:$PATH"
+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/ubuntu24" \
     -o:a="libxml2/*:zlib=False"
 
-COPY <<EOF /ticket-decoder/build.sh
+COPY <<EOF build.sh
     #!/usr/bin/env bash
 
     set -o errexit
@@ -47,6 +45,6 @@ COPY <<EOF /ticket-decoder/build.sh
     ./etc/cmake-build.sh Release \$\@
 EOF
 RUN chmod 755 build.sh
-RUN cert/install-uic-keys.sh
 
-# ENV PYTHONPATH=/ticket-decoder/build/Release/bin
+RUN cert/install-uic-keys.sh
+RUN cert/install-vdv-certificates.sh

ticket_decoder-0.20.0/etc/docker/ubuntu22.gcc.Python.Dockerfile → ticket_decoder-0.20.2/etc/docker/ubuntu24.gcc.Python.Dockerfile

@@ -2,14 +2,14 @@
 # SPDX-FileCopyrightText: (C) 2022 user4223 and (other) contributors to ticket-decoder <https://github.com/user4223/ticket-decoder>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG GCC_VERSION
 ARG TARGETARCH
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y --no-install-recommends cmake wget python-is-python3 python3-pip python3-dev python3-venv git
+RUN apt-get install -y --no-install-recommends make cmake wget git python-is-python3 python3-pip python3-venv
 # Keep all commands above equal in all build container docker files to make layers re-usable
 RUN apt-get install -y --no-install-recommends gcc-$GCC_VERSION g++-$GCC_VERSION cpp-$GCC_VERSION libstdc++-$GCC_VERSION-dev pkg-config
 RUN apt-get clean
@@ -23,14 +23,24 @@ 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/
-
+COPY cert/install-uic-keys.sh cert/install-vdv-certificates.sh cert/
 COPY LICENSES/ LICENSES
-COPY README.md .
-COPY pyproject.toml .
-COPY conanfile.py .
-
-RUN python -m venv venv && . venv/bin/activate
-RUN pip install uv
-# RUN uv build
-# RUN pip install dist/ticket_decoder*.whl
+COPY README.md pyproject.toml conanfile.py source/python/requirements.txt ./
+
+RUN pip install uv --break-system-packages && uv venv ./venv
+ENV PATH="venv/bin:$PATH"
+
+COPY <<EOF build.sh
+    #!/usr/bin/env bash
+
+    set -o errexit
+    
+    uv build --wheel
+    uv pip install --upgrade dist/ticket_decoder*.whl
+EOF
+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

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/etc/poppler/conanfile.py

@@ -15,7 +15,7 @@ class PopplerCppConan(ConanFile):
     """
 
     name = "poppler-cpp"
-    version = "25.10.0"
+    version = "26.08.0"
     license = "GPL-2.0-or-later", "GPL-3.0-or-later"
     homepage = "https://poppler.freedesktop.org/"
     url = "https://github.com/user4223/ticket-decoder"
@@ -49,17 +49,17 @@ class PopplerCppConan(ConanFile):
 
     def source(self):
         git = Git(self)
-        git.clone(url="https://gitlab.freedesktop.org/poppler/poppler.git", target='.', args=["--depth", "1", "--branch", "poppler-25.10.0"])
+        git.clone(url="https://gitlab.freedesktop.org/poppler/poppler.git", target='.', args=["--depth", "1", "--branch", "poppler-26.08.0"])
 
     def requirements(self):
         # https://conan.io/center/recipes/fontconfig
-        self.requires("fontconfig/2.15.0")
+        self.requires("fontconfig/2.17.1")
         # https://conan.io/center/recipes/libiconv
         self.requires("libiconv/1.18")
         # https://conan.io/center/recipes/libjpeg
         self.requires("libjpeg/9f")
         # https://conan.io/center/recipes/libpng
-        self.requires("libpng/1.6.50")
+        self.requires("libpng/1.6.58")
 
     def build_requirements(self):
         # https://conan.io/center/recipes/pkgconf
@@ -110,7 +110,7 @@ class PopplerCppConan(ConanFile):
                 ("ENABLE_LCMS", "OFF"),
                 ("ENABLE_LIBCURL", "OFF"),
                 ("ENABLE_LIBTIFF", "OFF"),
-                ("ENABLE_LIBOPENJPEG", "none"),
+                ("ENABLE_LIBOPENJPEG", "OFF"),
                 ("ENABLE_NSS3", "OFF"),
                 ("ENABLE_GPGME", "OFF"),
                 ("ENABLE_PGP_SIGNATURES", "OFF"),
@@ -130,8 +130,8 @@ class PopplerCppConan(ConanFile):
     def package_info(self):
         self.cpp_info.libs = ["poppler-cpp", "poppler"]
         self.cpp_info.includedirs.append(os.path.join("include", "poppler", "cpp"))
-        self.cpp_info.set_property("cmake_file_name", "Poppler")
-        self.cpp_info.set_property("cmake_target_name", "Poppler::Poppler")
+        self.cpp_info.set_property("cmake_file_name", "poppler")
+        self.cpp_info.set_property("cmake_target_name", "poppler::libpoppler-cpp")
         self.cpp_info.set_property("pkg_config_name", "poppler-cpp")
 
         self.cpp_info.requires.append("fontconfig::fontconfig")

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/images/install-sample-tickets.sh

@@ -6,22 +6,39 @@ set -o errexit
 
 readonly WORKSPACE_ROOT="$(readlink -f $(dirname "$0"))"/../
 
-rm -rfI ${WORKSPACE_ROOT}/images/Muster-UIC918-3
-rm -rfI ${WORKSPACE_ROOT}/images/Muster-UIC918-9
+# create tempory storage location
+#
 mkdir -p ${WORKSPACE_ROOT}/images/temp/
 
+# download sample ticket files first
+#
 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:ec74454d-557b-438f-8ed9-689abcc276f5/Muster%20918-9.zip \
     -O ${WORKSPACE_ROOT}/images/temp/uic918-9.zip
+wget https://www.kcd-nrw.de/fileadmin/user_upload/2023-05-05_Testtickets.zip \
+    -O ${WORKSPACE_ROOT}/images/temp/vdv-ka.zip
+
+# only when download succeeded, remove folders containing legacy files
+#
+rm -rfI ${WORKSPACE_ROOT}/images/Muster-UIC918-3
+rm -rfI ${WORKSPACE_ROOT}/images/Muster-UIC918-9
+rm -rfI ${WORKSPACE_ROOT}/images/Testtickets
 
 # on macos, default unzip app is not able to handle german character encoding (-I) 4 filenames properly, so we use python
 #unzip -I ISO-8859-1 -j ${WORKSPACE_ROOT}/images/temp/uic918-3.zip -d ${WORKSPACE_ROOT}/images/Muster-UIC918-3/
 #unzip -I ISO-8859-1 -j ${WORKSPACE_ROOT}/images/temp/uic918-9.zip -d ${WORKSPACE_ROOT}/images/Muster-UIC918-9/
 
+# unzip and move zip file content into subfolder in images
+#
 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/
 mv "${WORKSPACE_ROOT}/images/Muster 918-9" ${WORKSPACE_ROOT}/images/Muster-UIC918-9/
 
+python3 -m zipfile -e ${WORKSPACE_ROOT}/images/temp/vdv-ka.zip ${WORKSPACE_ROOT}/images/
+
+# remove temporary storage location
+#
 rm -rf ${WORKSPACE_ROOT}/images/temp

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

@@ -3,7 +3,7 @@
 
 [project]
 name = "ticket-decoder"
-version = "v0.20.0"
+version = "v0.20.2"
 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" } ]

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

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

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

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

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/source/lib/input/detail/pdf/CMakeLists.txt

@@ -13,4 +13,4 @@ target_include_directories(${PROJECT_NAME} PRIVATE)
 target_link_libraries(${PROJECT_NAME} PRIVATE 
    opencv::opencv_core_alias
    easyloggingpp::easyloggingpp
-   Poppler::Poppler)
+   poppler::libpoppler-cpp)

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/source/lib/interpreter/detail/vdv/source/VDVInterpreter.cpp

@@ -15,10 +15,21 @@
 
 #include "lib/infrastructure/include/Logging.h"
 
+#include <type_traits>
+#include <optional>
+
 namespace interpreter::detail::vdv
 {
   using namespace common;
 
+  template <typename T>
+  constexpr std::optional<T> hideZero(T value)
+  {
+    static_assert(std::is_integral_v<T>, "Integral types are supported only");
+
+    return value != 0 ? std::make_optional(value) : std::nullopt;
+  }
+
   /* This is actually not a fixed ident. 0x9e is a BER-TLV tag (signature) and 0x81+0x80 a length (128 bytes).
      But it should be sufficient for now to identify VDV tickets.
   */
@@ -34,10 +45,19 @@ namespace interpreter::detail::vdv
   static void decodePrimaryData(std::span<std::uint8_t const> bytes, utility::JsonBuilder &jsonResult)
   {
     auto context = Context(bytes);
-    context.ignoreBytes(7); // TODO This heading block is not always 7 bytes, i guess, so find out what structure is used for EFS here
-    auto const price = NumberDecoder::consumeUInteger4(context);
     jsonResult
-        .add("price", price);
+        .add("paymentType", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("passengerType", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("includedItem1Type", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("includedItem1Count", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("includedItem2Type", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("includedItem2Count", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("transportCategory", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("serviceClass", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("price", hideZero(NumberDecoder::consumeUInteger3(context)))
+        .add("vatRate", hideZero(BCDDecoder::consumePackedInteger2(context) / 100))
+        .add("priceLevel", hideZero(NumberDecoder::consumeUInteger1(context)))
+        .add("internalProductNumber", hideZero(NumberDecoder::consumeUInteger3(context)));
   }
 
   static void decodePassengerData(std::span<std::uint8_t const> bytes, utility::JsonBuilder &jsonResult)
@@ -47,7 +67,7 @@ namespace interpreter::detail::vdv
     auto const dateOfBirth = DateTimeDecoder::consumeBCDDate4(context);
     auto const name = StringDecoder::decodeLatin1(context.consumeRemainingBytes());
     jsonResult
-        .add("gender", gender)
+        .add("gender", hideZero(gender))
         .add("name", name)
         .add("dateOfBirth", dateOfBirth);
   }

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/source/lib/interpreter/detail/verifier/source/Certificate.cpp

@@ -8,6 +8,7 @@
 #include <botan/x509_ca.h>
 #include <botan/dsa.h>
 #include <botan/pubkey.h>
+#include <botan/data_src.h>
 
 #include <regex>
 #include <map>
@@ -28,9 +29,9 @@ namespace interpreter::detail::verifier
   static auto const sha224 = "SHA-224";
   static auto const sha256 = "SHA-256";
 
-  static auto const sha1Der46 = std::make_tuple(sha1, 46, Botan::Signature_Format::DER_SEQUENCE);
-  static auto const sha224Der62 = std::make_tuple(sha224, 62, Botan::Signature_Format::DER_SEQUENCE);
-  static auto const sha256Plain64 = std::make_tuple(sha256, 64, Botan::Signature_Format::IEEE_1363);
+  static auto const sha1Der46 = std::make_tuple(sha1, 46, Botan::Signature_Format::DerSequence);
+  static auto const sha224Der62 = std::make_tuple(sha224, 62, Botan::Signature_Format::DerSequence);
+  static auto const sha256Plain64 = std::make_tuple(sha256, 64, Botan::Signature_Format::Standard);
 
   using Config = std::tuple<std::string, std::uint8_t, Botan::Signature_Format>;
 

{ticket_decoder-0.20.0 → ticket_decoder-0.20.2}/source/python/CMakeLists.txt

@@ -44,8 +44,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     easyloggingpp::easyloggingpp
     opencv::opencv_core_alias
     ticket-decoder-api
-    ticket-decoder-dip
-    Boost::headers)
+    ticket-decoder-dip)
 
 IF (SKBUILD_PLATLIB_DIR)
     install(FILES ${PROJECT_SOURCE_DIR}/etc/__init__.py DESTINATION ${SKBUILD_PROJECT_NAME})

ticket_decoder-0.20.0/debug.env

@@ -1 +0,0 @@
-PYTHONPATH=./build/Debug/bin/ticket_decoder

ticket_decoder-0.20.0/etc/docker/ubuntu22.gcc.Dockerfile

@@ -1,48 +0,0 @@
-# syntax=docker/dockerfile:1
-# SPDX-FileCopyrightText: (C) 2022 user4223 and (other) contributors to ticket-decoder <https://github.com/user4223/ticket-decoder>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-FROM ubuntu:22.04
-
-ARG GCC_VERSION
-ARG TARGETARCH
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install -y --no-install-recommends cmake wget python-is-python3 python3-pip python3-dev git
-# Keep all commands above equal in all build container docker files to make layers re-usable
-RUN apt-get install -y --no-install-recommends gcc-$GCC_VERSION g++-$GCC_VERSION cpp-$GCC_VERSION libstdc++-$GCC_VERSION-dev libgtk2.0-dev
-RUN apt-get clean
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-$GCC_VERSION 800
-RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-$GCC_VERSION 800
-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/
-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:a="libxml2/*:zlib=False"
-
-COPY <<EOF /ticket-decoder/build.sh
-    #!/usr/bin/env bash
-
-    set -o errexit
-
-    ./etc/cmake-config.sh Release
-    ./etc/cmake-build.sh Release \$\@
-EOF
-RUN chmod 755 build.sh
-RUN cert/install-uic-keys.sh
-
-# ENV PYTHONPATH=/ticket-decoder/build/Release/bin

ticket_decoder-0.20.0/release.env

@@ -1 +0,0 @@
-PYTHONPATH=./build/Release/bin/ticket_decoder