Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2021-05-16 23:39:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Sun May 16 23:39:55 2021 rev:35 rq:892805 version:21.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2021-04-24 23:08:24.855332115 +0200 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.2988/kitinerary.changes 2021-05-16 23:40:13.330032020 +0200 @@ -1,0 +2,11 @@ +Wed May 12 06:07:47 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.04.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/21.04.1 +- Changes since 21.04.0: + * Detect booking.com cancelations + * Handle more variants of NH hotel booking confirmation emails + +------------------------------------------------------------------- Old: ---- kitinerary-21.04.0.tar.xz kitinerary-21.04.0.tar.xz.sig New: ---- kitinerary-21.04.1.tar.xz kitinerary-21.04.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.P58L5I/_old 2021-05-16 23:40:13.862030039 +0200 +++ /var/tmp/diff_new_pack.P58L5I/_new 2021-05-16 23:40:13.866030023 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: kitinerary -Version: 21.04.0 +Version: 21.04.1 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later ++++++ kitinerary-21.04.0.tar.xz -> kitinerary-21.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.04.0/CMakeLists.txt new/kitinerary-21.04.1/CMakeLists.txt --- old/kitinerary-21.04.0/CMakeLists.txt 2021-04-14 17:28:08.000000000 +0200 +++ new/kitinerary-21.04.1/CMakeLists.txt 2021-05-10 17:58:36.000000000 +0200 @@ -3,7 +3,7 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -set(PIM_VERSION "5.17.0") +set(PIM_VERSION "5.17.1") project(KItinerary VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 17) @@ -40,8 +40,8 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -set(KMIME_VERSION "5.17.0") -set(PIM_PKPASS "5.17.0") +set(KMIME_VERSION "5.17.1") +set(PIM_PKPASS "5.17.1") 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-21.04.0/po/zh_CN/kitinerary.po new/kitinerary-21.04.1/po/zh_CN/kitinerary.po --- old/kitinerary-21.04.0/po/zh_CN/kitinerary.po 2021-04-16 10:47:30.000000000 +0200 +++ new/kitinerary-21.04.1/po/zh_CN/kitinerary.po 2021-05-11 09:30:28.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-07-01 02:16+0200\n" -"PO-Revision-Date: 2021-03-27 17:31\n" +"PO-Revision-Date: 2021-04-24 15:44\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-21.04.0/src/cli/org.kde.kitinerary-extractor.appdata.xml new/kitinerary-21.04.1/src/cli/org.kde.kitinerary-extractor.appdata.xml --- old/kitinerary-21.04.0/src/cli/org.kde.kitinerary-extractor.appdata.xml 2021-04-14 17:28:08.000000000 +0200 +++ new/kitinerary-21.04.1/src/cli/org.kde.kitinerary-extractor.appdata.xml 2021-05-10 17:58:36.000000000 +0200 @@ -96,9 +96,9 @@ <binary>kitinerary-extractor</binary> </provides> <releases> + <release version="5.17.1" date="2021-05-13"/> <release version="5.17.0" date="2021-04-22"/> <release version="5.16.3" date="2021-03-04"/> <release version="5.16.2" date="2021-02-04"/> - <release version="5.16.1" date="2021-01-07"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.04.0/src/lib/extractors/booking.js new/kitinerary-21.04.1/src/lib/extractors/booking.js --- old/kitinerary-21.04.0/src/lib/extractors/booking.js 2021-04-14 17:28:08.000000000 +0200 +++ new/kitinerary-21.04.1/src/lib/extractors/booking.js 2021-05-10 17:58:36.000000000 +0200 @@ -120,6 +120,10 @@ res.reservationFor.address.addressLocality = addr[2]; res.reservationFor.address.postalCode = addr[3]; res.reservationFor.address.addressCountry = addr[4]; + + if (fullAddr.match(/CANCELED$/)) { + res.reservationStatus = "ReservationCancelled" + } } res.reservationFor.telephone = elem.eval(".//*[@class=\"u-phone\"]")[0].content; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.04.0/src/lib/extractors/nh-hotels.js new/kitinerary-21.04.1/src/lib/extractors/nh-hotels.js --- old/kitinerary-21.04.0/src/lib/extractors/nh-hotels.js 2021-04-14 17:28:08.000000000 +0200 +++ new/kitinerary-21.04.1/src/lib/extractors/nh-hotels.js 2021-05-10 17:58:36.000000000 +0200 @@ -12,6 +12,11 @@ return child; } +function parseDateTime(text) { + var dt = text.match(/([\d/]+).*?([\d:]+)/); + return JsonLd.toDateTime(dt[1] + dt[2], "dd/MM/yyyyhh:mm", "en"); +} + function parseHtml(doc) { var res = JsonLd.newObject("LodgingReservation"); @@ -38,22 +43,27 @@ } var bookingRef = doc.eval("//table//tr/td/table//tr/td[2]")[0]; - res.reservationNumber = bookingRef.content; - var bookingRow = bookingRef.parent.nextSibling.nextSibling; - - res.underName = JsonLd.newObject("Person"); - res.underName.name = bookingRow.firstChild.nextSibling.content; - bookingRow = bookingRow.nextSibling.nextSibling; - - res.underName.email = bookingRow.firstChild.nextSibling.recursiveContent; - bookingRow = bookingRow.nextSibling.nextSibling.nextSibling; - - var dt = bookingRow.firstChild.nextSibling.content.match(/([\d/]+).*?([\d:]+)/); - res.checkinTime = JsonLd.toDateTime(dt[1] + dt[2], "dd/MM/yyyyhh:mm", "en"); - bookingRow = bookingRow.nextSibling.nextSibling; - - dt = bookingRow.firstChild.nextSibling.content.match(/([\d/]+).*?([\d:]+)/); - res.checkoutTime = JsonLd.toDateTime(dt[1] + dt[2], "dd/MM/yyyyhh:mm", "en"); - + console.log(bookingRef.recursiveContent) + if (bookingRef.content) { + res.reservationNumber = bookingRef.content; + var bookingRow = bookingRef.parent.nextSibling.nextSibling; + + res.underName = JsonLd.newObject("Person"); + res.underName.name = bookingRow.firstChild.nextSibling.content; + bookingRow = bookingRow.nextSibling.nextSibling; + + res.underName.email = bookingRow.firstChild.nextSibling.recursiveContent; + bookingRow = bookingRow.nextSibling.nextSibling.nextSibling; + + res.checkinTime = parseDateTime(bookingRow.firstChild.nextSibling.content); + bookingRow = bookingRow.nextSibling.nextSibling; + res.checkoutTime = parseDateTime(bookingRow.firstChild.nextSibling.content); + } else { + res.reservationNumber = doc.eval("//td[@class='table-confirmation text-bold']/a")[0].content; + + dts = doc.eval("//td[2]/strong"); + res.checkinTime = parseDateTime(dts[0].content); + res.checkoutTime = parseDateTime(dts[1].content); + } return res; }
