From aa6a58a152b8ebe0e786682ffd84239ed862dba4 Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Thu, 5 Jan 2023 20:33:24 +1000 Subject: email: Support Date fields with missing seconds. * email/email.scm (parse-email-headers): Extend the date-time parser to match when seconds are missing, defaulting to "0". * tests/email.scm ("parse Date", "parse Date without seconds"): New tests. Signed-off-by: Arun Isaac --- email/email.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'email') diff --git a/email/email.scm b/email/email.scm index 71f0718..0d51eef 100644 --- a/email/email.scm +++ b/email/email.scm @@ -1,6 +1,7 @@ ;;; guile-email --- Guile email parser ;;; Copyright © 2018, 2019, 2020, 2021 Arun Isaac ;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2023 Andrew Whatson ;;; ;;; This file is part of guile-email. ;;; @@ -1050,9 +1051,14 @@ list of header keys and values." (received-token . ,(match-lambda* (`(received-token ,token) token))) (date-time . ,(lambda node - (match-let - ((`((day ,day) (month ,month) (year ,year) - (hours ,hours) (minutes ,minutes) (seconds ,seconds) (zone . ,zone)) + (match-let* + (;; Seconds are optional; provide a default + ;; binding which will be shadowed by match. + (seconds "0") + ((('day day) ('month month) ('year year) + ('hours hours) ('minutes minutes) + . (or (('seconds seconds) ('zone . zone)) + (('zone . zone)))) (flatten-and-filter '(day month year hours minutes seconds zone) node))) -- cgit v1.2.3