Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2022-06-12 17:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Sun Jun 12 17:37:54 2022 rev:49 rq:981819 version:22.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2022-05-14 22:53:32.795094717 +0200 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.1548/kitinerary.changes 2022-06-12 17:38:21.662074289 +0200 @@ -1,0 +2,8 @@ +Wed Jun 8 09:54:41 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.04.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.04.2/ + +------------------------------------------------------------------- Old: ---- kitinerary-22.04.1.tar.xz kitinerary-22.04.1.tar.xz.sig New: ---- kitinerary-22.04.2.tar.xz kitinerary-22.04.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.63oWJ6/_old 2022-06-12 17:38:22.138074968 +0200 +++ /var/tmp/diff_new_pack.63oWJ6/_new 2022-06-12 17:38:22.142074974 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: kitinerary -Version: 22.04.1 +Version: 22.04.2 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later ++++++ kitinerary-22.04.1.tar.xz -> kitinerary-22.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/CMakeLists.txt new/kitinerary-22.04.2/CMakeLists.txt --- old/kitinerary-22.04.1/CMakeLists.txt 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/CMakeLists.txt 2022-06-04 20:07:09.000000000 +0200 @@ -3,7 +3,7 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.20.1") +set(PIM_VERSION "5.20.2") project(KItinerary VERSION ${PIM_VERSION}) set(KF5_MIN_VERSION "5.91.0") @@ -41,8 +41,8 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -set(KMIME_VERSION "5.20.1") -set(PIM_PKPASS "5.20.1") +set(KMIME_VERSION "5.20.2") +set(PIM_PKPASS "5.20.2") find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/po/ca@valencia/kitinerary.po new/kitinerary-22.04.2/po/ca@valencia/kitinerary.po --- old/kitinerary-22.04.1/po/ca@valencia/kitinerary.po 2022-05-10 07:57:47.000000000 +0200 +++ new/kitinerary-22.04.2/po/ca@valencia/kitinerary.po 2022-06-07 09:19:20.000000000 +0200 @@ -24,7 +24,7 @@ #, kde-format msgctxt "canceled train/flight/loading reservation" msgid "Canceled: %1" -msgstr "Cancel??lat/da: %1" +msgstr "Cancelat/da: %1" #: calendarhandler.cpp:233 #, kde-format @@ -112,7 +112,7 @@ #: calendarhandler.cpp:369 #, kde-format msgid "Phone: %1" -msgstr "Tel??fon: %1" +msgstr "Tel??fon: %1" #: calendarhandler.cpp:372 #, kde-format @@ -147,7 +147,7 @@ #: calendarhandler.cpp:496 #, kde-format msgid "Rental car reservation: %1" -msgstr "Lloguer de cotxes: %1" +msgstr "Lloguer de coches: %1" #: calendarhandler.cpp:507 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/po/zh_CN/kitinerary.po new/kitinerary-22.04.2/po/zh_CN/kitinerary.po --- old/kitinerary-22.04.1/po/zh_CN/kitinerary.po 2022-05-10 07:57:47.000000000 +0200 +++ new/kitinerary-22.04.2/po/zh_CN/kitinerary.po 2022-06-07 09:19:20.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-03-13 03:06+0000\n" -"PO-Revision-Date: 2022-05-08 08:17\n" +"PO-Revision-Date: 2022-06-05 04:19\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/cli/org.kde.kitinerary-extractor.appdata.xml new/kitinerary-22.04.2/src/cli/org.kde.kitinerary-extractor.appdata.xml --- old/kitinerary-22.04.1/src/cli/org.kde.kitinerary-extractor.appdata.xml 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/cli/org.kde.kitinerary-extractor.appdata.xml 2022-06-04 20:07:09.000000000 +0200 @@ -10,7 +10,7 @@ <name>KItinerary Command Line Extractor</name> <name xml:lang="ar">???????????? ???????? ???????????? ???????? ??????????????</name> <name xml:lang="ca">Extractor del KItinerary per a la l??nia d'ordres</name> - <name xml:lang="ca-valencia">Extractor de KItinerary per a la l??nia d'ordres</name> + <name xml:lang="ca-valencia">Extractor de KItinerary per a la ll??nea d'ordres</name> <name xml:lang="cs">Extraktor v p????kazov?? ????dce pro KItinerary</name> <name xml:lang="da">KItinerary kommandolinjeudtr??kker</name> <name xml:lang="en-GB">KItinerary Command Line Extractor</name> @@ -39,7 +39,7 @@ <summary>Command line reservation data extractor.</summary> <summary xml:lang="ar">???????????? ???????????? ???????????????? ???????? ??????????????.</summary> <summary xml:lang="ca">Extractor de les dades de reserves mitjan??ant la l??nia d'ordres.</summary> - <summary xml:lang="ca-valencia">Extractor de les dades de reserves mitjan??ant la l??nia d'ordres.</summary> + <summary xml:lang="ca-valencia">Extractor de les dades de reserves mitjan??ant la ll??nea d'ordres.</summary> <summary xml:lang="cs">Extraktor dat rezervac?? v p????kazov?? ????dce.</summary> <summary xml:lang="da">Kommandolinjev??rkt??j til at udtr??kke reservationsdata.</summary> <summary xml:lang="en-GB">Command line reservation data extractor.</summary> @@ -71,7 +71,7 @@ </p> <p xml:lang="ar">???????????? ???????? ???????????? ???????? ??????????????.</p> <p xml:lang="ca">Extractor de les dades d'itineraris mitjan??ant la l??nia d'ordres, per a la integraci?? en aplicacions de tercers.</p> - <p xml:lang="ca-valencia">Extractor de les dades d'itineraris mitjan??ant la l??nia d'ordres, per a la integraci?? en aplicacions de tercers.</p> + <p xml:lang="ca-valencia">Extractor de les dades d'itineraris mitjan??ant la ll??nea d'ordres, per a la integraci?? en aplicacions de tercers.</p> <p xml:lang="da">Kommandolinjev??rkt??j til at udtr??kke rejseplan-data, til integration med tredjepartsprogrammer.</p> <p xml:lang="en-GB">Command line extractor for itinerary data, for integrating into 3rd party applications.</p> <p xml:lang="es">Extractor de l??nea de ??rdenes para datos de itinerario. para integraci??n en aplicaciones de terceros.</p> @@ -104,9 +104,9 @@ <binary>kitinerary-extractor</binary> </provides> <releases> + <release version="5.20.2" date="2022-06-09"/> <release version="5.20.1" date="2022-05-12"/> <release version="5.20.0" date="2022-04-21"/> <release version="5.19.3" date="2022-03-03"/> - <release version="5.19.2" date="2022-02-03"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/cli/org.kde.kitinerary-extractor.desktop new/kitinerary-22.04.2/src/cli/org.kde.kitinerary-extractor.desktop --- old/kitinerary-22.04.1/src/cli/org.kde.kitinerary-extractor.desktop 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/cli/org.kde.kitinerary-extractor.desktop 2022-06-04 20:07:09.000000000 +0200 @@ -30,7 +30,7 @@ GenericName=KItinerary command line extractor GenericName[ar]=???????????? ???????? ???????????? ???????? ?????????????? GenericName[ca]=Extractor del KItinerary per a la l??nia d'ordres -GenericName[ca@valencia]=Extractor de KItinerary per a la l??nia d'ordres +GenericName[ca@valencia]=Extractor de KItinerary per a la ll??nea d'ordres GenericName[cs]=Extraktor v p????kazov?? ????dce pro KItinerary GenericName[da]=KItinerary kommandolinjeudtr??kker GenericName[en_GB]=KItinerary command line extractor @@ -61,7 +61,7 @@ Comment=Command line reservation data extractor. Comment[ar]=???????????? ???????????? ???????????????? ???????? ??????????????. Comment[ca]=Extractor de les dades de reserves mitjan??ant la l??nia d'ordres. -Comment[ca@valencia]=Extractor de les dades de reserves mitjan??ant la l??nia d'ordres. +Comment[ca@valencia]=Extractor de les dades de reserves mitjan??ant la ll??nea d'ordres. Comment[cs]=Extraktor dat rezervac?? v p????kazov?? ????dce. Comment[da]=Kommandolinjev??rkt??j til at udtr??kke reservationsdata. Comment[en_GB]=Command line reservation data extractor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/barcodedecoder.cpp new/kitinerary-22.04.2/src/lib/barcodedecoder.cpp --- old/kitinerary-22.04.1/src/lib/barcodedecoder.cpp 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/lib/barcodedecoder.cpp 2022-06-04 20:07:09.000000000 +0200 @@ -36,7 +36,7 @@ }; -static constexpr const auto SQUARE_MAX_ASPECT = 1.2f; +static constexpr const auto SQUARE_MAX_ASPECT = 1.25f; static constexpr const auto PDF417_MIN_ASPECT = 1.5f; static constexpr const auto PDF417_MAX_ASPECT = 6.0f; static constexpr const auto ANY1D_MIN_ASPECT = 6.0f; @@ -249,7 +249,7 @@ if (std::any_of(res.text().begin(), res.text().end(), [](const auto c) { return c > 255; })) { result.contentType &= ~Result::ByteArray; } - if (std::any_of(res.text().begin(), res.text().end(), [](const auto c) { return c < 20; })) { + if (std::any_of(res.text().begin(), res.text().end(), [](const auto c) { return c < 0x20; })) { result.contentType &= ~Result::String; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/scripts/eventbrite.js new/kitinerary-22.04.2/src/lib/scripts/eventbrite.js --- old/kitinerary-22.04.1/src/lib/scripts/eventbrite.js 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/lib/scripts/eventbrite.js 2022-06-04 20:07:09.000000000 +0200 @@ -21,11 +21,13 @@ return res; } var addr = res.reservationFor.location.address; - if (addr.streetAddress.endsWith(addr.addressLocality)) { - addr.streetAddress = addr.streetAddress.substr(0, addr.streetAddress.length - addr.addressLocality.length).trim(); - } - if (addr.streetAddress.endsWith(addr.postalCode)) { - addr.streetAddress = addr.streetAddress.substr(0, addr.streetAddress.length - addr.postalCode.length); + for (var i of [0, 1]) { + if (addr.streetAddress.endsWith(addr.addressLocality)) { + addr.streetAddress = addr.streetAddress.substr(0, addr.streetAddress.length - addr.addressLocality.length).trim(); + } + if (addr.streetAddress.endsWith(addr.postalCode)) { + addr.streetAddress = addr.streetAddress.substr(0, addr.streetAddress.length - addr.postalCode.length).trim(); + } } res.reservationFor.location.address = addr; return res; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/scripts/extractors.qrc new/kitinerary-22.04.2/src/lib/scripts/extractors.qrc --- old/kitinerary-22.04.1/src/lib/scripts/extractors.qrc 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/lib/scripts/extractors.qrc 2022-06-04 20:07:09.000000000 +0200 @@ -92,6 +92,8 @@ <file>mav.js</file> <file>nationalexpress.json</file> <file>nationalexpress.js</file> + <file>nationalrail.json</file> + <file>nationalrail.js</file> <file>nh-hotels.json</file> <file>nh-hotels.js</file> <file>norwegian.json</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/scripts/nationalrail.js new/kitinerary-22.04.2/src/lib/scripts/nationalrail.js --- old/kitinerary-22.04.1/src/lib/scripts/nationalrail.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-22.04.2/src/lib/scripts/nationalrail.js 2022-06-04 20:07:09.000000000 +0200 @@ -0,0 +1,36 @@ +/* + SPDX-FileCopyrightText: 2022 Volker Krause <vkra...@kde.org> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +function parseTicket(pdf, node, triggerNode) { + const text = pdf.pages[triggerNode.location].text; + var res = JsonLd.newTrainReservation(); + const header = text.match(/= +(\d{2}[ -][A-Z][a-z]{2}[ -]\d{4}) +(?:Out: |Ret: )?([A-Z]{3}) ?- ?([A-Z]{3})\n(.*) +(.*)/); + const date = header[1].replace(/-/g, ' '); + const seat = text.match(/DEPART +COACH +SEAT\n(.*) +(\d{2}:\d{2}) +(.*?) +(.*)\n/); + const itinerary = text.match(/Itinerary.*\n +(.*)\n +(\d{2}:\d{2})\n +([\S\s]*?)\n +(\d{2}:\d{2})\n +(.*)/); + + res.reservationFor.departureStation.identifier = 'uk:' + header[2]; + res.reservationFor.arrivalStation.identifier = 'uk:' + header[3]; + if (itinerary) { + res.reservationFor.departureStation.name = itinerary[1]; + res.reservationFor.departureTime = JsonLd.toDateTime(date + ' ' + itinerary[2], 'dd MMM yyyy hh:mm', 'en'); + res.reservationFor.arrivalStation.name = itinerary[5]; + res.reservationFor.arrivalTime = JsonLd.toDateTime(date + ' ' + itinerary[4], 'dd MMM yyyy hh:mm', 'en'); + res.reservationFor.trainName = itinerary[3].replace(/(.*?)(?: .*)?(?:\n +|$)/g, '$1 '); + } else { + // unbound ticket + res.reservationFor.departureStation.name = header[4]; + res.reservationFor.arrivalStation.name = header[5]; + res.reservationFor.departureDay = JsonLd.toDateTime(date, 'dd MMM yyyy', 'en'); + } + if (seat && seat[4] != '*') { + res.reservedTicket.ticketedSeat.seatSection = seat[3]; + res.reservedTicket.ticketedSeat.seatNumber = seat[4]; + } + + res.reservationMumber = text.match(/Ticket Number (.*)/)[1]; + res.reservedTicket.ticketToken = 'aztec:' + triggerNode.content; + return res; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/scripts/nationalrail.json new/kitinerary-22.04.2/src/lib/scripts/nationalrail.json --- old/kitinerary-22.04.1/src/lib/scripts/nationalrail.json 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-22.04.2/src/lib/scripts/nationalrail.json 2022-06-04 20:07:09.000000000 +0200 @@ -0,0 +1,12 @@ +{ + "filter": [ + { + "match": "^06[A-Z0-9]{9}00", + "mimeType": "text/plain", + "scope": "Descendants" + } + ], + "function": "parseTicket", + "mimeType": "application/pdf", + "script": "nationalrail.js" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/scripts/thalys.js new/kitinerary-22.04.2/src/lib/scripts/thalys.js --- old/kitinerary-22.04.1/src/lib/scripts/thalys.js 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/lib/scripts/thalys.js 2022-06-04 20:07:09.000000000 +0200 @@ -54,3 +54,22 @@ res.underName.name = name[1]; return res; } + +function parsePdfTicket(pdf, node, triggerNode) +{ + const page = pdf.pages[triggerNode.location]; + var res = triggerNode.result[0]; + + const dep = page.textInRect(0.0, 0.15, 0.35, 0.3).match(/([\s\S]+)\nD??PART ??\n(\d\d:\d\d)/); + res.reservationFor.departureStation.name = dep[1]; + res.reservationFor.departureTime = res.reservationFor.departureDay.substr(0, 11) + dep[2]; + + const arr = page.textInRect(0.35, 0.15, 0.65, 0.3).match(/([\s\S]+)\nARRIV??E ??\n(\d\d:\d\d)/); + res.reservationFor.arrivalStation.name = arr[1]; + res.reservationFor.arrivalTime = res.reservationFor.departureDay.substr(0, 11) + arr[2]; + + const passenger = page.text.match(/PASSAGER\n(.*)\n/); + res.underName.name = passenger[1]; + + return res; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.04.1/src/lib/scripts/thalys.json new/kitinerary-22.04.2/src/lib/scripts/thalys.json --- old/kitinerary-22.04.1/src/lib/scripts/thalys.json 2022-05-07 12:07:42.000000000 +0200 +++ new/kitinerary-22.04.2/src/lib/scripts/thalys.json 2022-06-04 20:07:09.000000000 +0200 @@ -24,5 +24,18 @@ "function": "parseReservation", "script": "thalys.js", "mimeType": "text/html" + }, + { + "filter": [ + { + "mimeType": "internal/era-ssb", + "field": "issuerCode", + "match": "3018", + "scope": "Descendants" + } + ], + "function": "parsePdfTicket", + "script": "thalys.js", + "mimeType": "application/pdf" } ]
