Always specify a timezone

tbartelmess · May 16, 2020 · 5ccf29e · 5ccf29e
1 parent 77e0b1a
commit 5ccf29e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/Sources/SwiftIcal/Component.swift b/Sources/SwiftIcal/Component.swift
@@ -370,18 +370,18 @@ extension VEvent: LibicalComponentConvertible {
     func libicalComponent() -> LibicalComponent {
         let comp = icalcomponent_new_vevent()
 
-        let dtstampProperty = icalproperty_new_dtstamp(dtstamp.icalTime(utc: true))
+        let dtstampProperty = icalproperty_new_dtstamp(dtstamp.icalTime(timeZone: .utc))
         icalcomponent_add_property(comp, dtstampProperty)
 
-        let dtstartProperty = icalproperty_new_dtstart(dtstart.date!.icalTime())
+        let dtstartProperty = icalproperty_new_dtstart(dtstart.date!.icalTime(timeZone: dtstart.timeZone ?? .utc))
 
         if let timezone = dtstart.timeZone {
             icalproperty_add_parameter(dtstartProperty, icalparameter_new_tzid(String(cString: icaltimezone_tzid_prefix()!) + timezone.identifier))
         }
         icalcomponent_add_property(comp, dtstartProperty)
 
         if let dtend = dtend {
-            let dtendProperty = icalproperty_new_dtend(dtend.date!.icalTime())
+            let dtendProperty = icalproperty_new_dtend(dtend.date!.icalTime(timeZone: dtend.timeZone ?? .utc))
             if let timezone = dtend.timeZone {
                 icalproperty_add_parameter(dtendProperty, icalparameter_new_tzid(timezone.identifier))
             }
@@ -395,7 +395,7 @@ extension VEvent: LibicalComponentConvertible {
         }
 
         icalcomponent_add_property(comp, transparency.libicalProperty())
-        icalcomponent_add_property(comp, icalproperty_new_created(created.icalTime(utc: true)))
+        icalcomponent_add_property(comp, icalproperty_new_created(created.icalTime(timeZone: .utc)))
 
         attendees?.forEach({ (attendee) in
             icalcomponent_add_property(comp, attendee.libicalProperty())

diff --git a/Sources/SwiftIcal/Types.swift b/Sources/SwiftIcal/Types.swift
@@ -68,11 +68,7 @@ extension TimeZone {
 
 
 extension Date {
-    func icalTime(in calendar: Calendar = .autoupdatingCurrent, utc: Bool = false) -> icaltimetype {
-        var timeZone = calendar.timeZone
-        if utc {
-            timeZone = TimeZone(secondsFromGMT: 0)!
-        }
+    func icalTime(in calendar: Calendar = .autoupdatingCurrent, timeZone: TimeZone) -> icaltimetype {
         let components = calendar.dateComponents(in: timeZone, from: self)
         let day = components.day ?? 0
         let month = components.month ?? 0
@@ -82,11 +78,11 @@ extension Date {
         let minute = components.minute ?? 0
         let second = components.second ?? 0
 
-        var timezone: UnsafeMutablePointer<icaltimezone>? = nil
-        if utc {
-            timezone = icaltimezone_get_utc_timezone()
+        var zone: UnsafeMutablePointer<icaltimezone>? = nil
+        if timeZone == .utc {
+            zone = icaltimezone_get_utc_timezone()
         }
-        return icaltimetype(year: Int32(year), month: Int32(month), day: Int32(day), hour: Int32(hour), minute: Int32(minute), second: Int32(second), is_date: 0, is_daylight: 0, zone: timezone)
+        return icaltimetype(year: Int32(year), month: Int32(month), day: Int32(day), hour: Int32(hour), minute: Int32(minute), second: Int32(second), is_date: 0, is_daylight: 0, zone: zone)
     }
 }
 

diff --git a/Sources/SwiftIcal/Utilities.swift b/Sources/SwiftIcal/Utilities.swift
@@ -6,15 +6,17 @@
 //
 
 import Foundation
+extension TimeZone {
+    static public let utc = TimeZone(identifier: "GMT")!
+}
 
-public let SantiagoTimezone = TimeZone(identifier: "America/Santiago")!
 
 extension Date {
     /// Convenience to return date components.
     ///
     /// - parameter timezone: `TimeZone` used to generate the date components. By default the current timezone is used.
     /// - parameter calendar: `Calendar` used to generate the data components. By default the gregorian calendar is used. Currently SwiftIcal can only supports Gregorian calendars.
-    public func components(in timezone: TimeZone = SantiagoTimezone,
+    public func components(in timezone: TimeZone = .utc,
                            calendar: Calendar = Calendar(identifier: .gregorian)) -> DateComponents {
         var components = calendar.dateComponents(in: timezone, from: self)
         components.calendar = calendar

diff --git a/Tests/SwiftIcalTests/EventTests.swift b/Tests/SwiftIcalTests/EventTests.swift
@@ -10,7 +10,7 @@ import SwiftIcal
 import XCTest
 
 
-let testTimezone =  TimeZone(identifier: "America/Santiago")!
+let testTimezone =  TimeZone(identifier: "Europe/Berlin")!
 extension Date {
 
     var components: DateComponents {
@@ -50,8 +50,8 @@ class EventTests: XCTestCase {
         VERSION:2.0
         BEGIN:VEVENT
         DTSTAMP:19700101T000000Z
-        DTSTART;TZID=America/Santiago:20200509T110000
-        DTEND;TZID=America/Santiago:20200509T120000
+        DTSTART;TZID=Europe/Berlin:20200509T110000
+        DTEND;TZID=Europe/Berlin:20200509T120000
         SUMMARY:Hello World
         UID:TEST-UID
         TRANSP:OPAQUE
@@ -79,8 +79,8 @@ class EventTests: XCTestCase {
         VERSION:2.0
         BEGIN:VEVENT
         DTSTAMP:19700101T000000Z
-        DTSTART;TZID=America/Santiago:20200509T110000
-        DTEND;TZID=America/Santiago:20200509T120000
+        DTSTART;TZID=Europe/Berlin:20200509T110000
+        DTEND;TZID=Europe/Berlin:20200509T120000
         SUMMARY:Hello World
         UID:TEST-UID
         TRANSP:OPAQUE