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

ticket_decoder-0.20.1/.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.1}/.gitignore

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ticket-decoder
-Version: 0.20.0
+Version: 0.20.1
 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.1}/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.1}/pyproject.toml

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

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

ticket_decoder-0.20.0/release.env

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