From 9a697b41cb2ad5dc7bf39553274638b346cdb894 Mon Sep 17 00:00:00 2001 From: Sylvain Chouleur Date: Thu, 9 Oct 2014 19:08:04 +0200 Subject: [PATCH] Support vcal format timezones Old version only supported emacs known timezone. Here we reuse icalendar code to extract timezone definition from vcalendar format Signed-off-by: Sylvain Chouleur --- lisp/ChangeLog | 7 +++++++ lisp/gnus-icalendar.el | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 214a8bf3eb4c..b872ca665595 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-10-15 Sylvain Chouleur + + * gnus-icalendar.el: Support vcal format timezones + (gnus-icalendar-event--decode-datefield): use icalendar functions to + compute dates with associated timezone + (gnus-icalendar-event-from-ical): compute all timezones + 2014-10-14 Teodor Zlatanov * gnus-start.el (gnus-save-newsrc-file-check-timestamp): New option to diff --git a/lisp/gnus-icalendar.el b/lisp/gnus-icalendar.el index 3362cc878110..a9e4a24c93b0 100644 --- a/lisp/gnus-icalendar.el +++ b/lisp/gnus-icalendar.el @@ -141,12 +141,13 @@ (defmethod gnus-icalendar-event:start ((event gnus-icalendar-event)) (format-time-string "%Y-%m-%d %H:%M" (gnus-icalendar-event:start-time event))) -(defun gnus-icalendar-event--decode-datefield (ical field) - (let* ((date (icalendar--get-event-property ical field)) - (date-props (icalendar--get-event-property-attributes ical field)) - (tz (plist-get date-props 'TZID))) - - (date-to-time (timezone-make-date-arpa-standard date nil tz)))) +(defun gnus-icalendar-event--decode-datefield (event field zone-map) + (let* ((dtdate (icalendar--get-event-property event field)) + (dtdate-zone (icalendar--find-time-zone + (icalendar--get-event-property-attributes + event field) zone-map)) + (dtdate-dec (icalendar--decode-isodatetime dtdate nil dtdate-zone))) + (apply 'encode-time dtdate-dec))) (defun gnus-icalendar-event--find-attendee (ical name-or-email) (let* ((event (car (icalendar--all-events ical))) @@ -204,10 +205,11 @@ ("REQ-PARTICIPANT" 'required) ("OPT-PARTICIPANT" 'optional) (_ 'non-participant))) + (zone-map (icalendar--convert-all-timezones ical)) (args (list :method method :organizer organizer - :start-time (gnus-icalendar-event--decode-datefield event 'DTSTART) - :end-time (gnus-icalendar-event--decode-datefield event 'DTEND) + :start-time (gnus-icalendar-event--decode-datefield event 'DTSTART zone-map) + :end-time (gnus-icalendar-event--decode-datefield event 'DTEND zone-map) :rsvp (string= (plist-get (cadr attendee) 'RSVP) "TRUE") :participation-type participation-type :req-participants (car attendee-names) -- 2.1.1