From 07d4dfae5e5707b280907e873f006a470e092816 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 24 Feb 2020 17:52:25 +0100
Subject: [PATCH] Use new ical library

---
 caldav/caldav.go |  2 +-
 caldav/client.go | 11 +++--------
 go.mod           |  2 +-
 go.sum           |  4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/caldav/caldav.go b/caldav/caldav.go
index 3d53453..d12ff7e 100644
--- a/caldav/caldav.go
+++ b/caldav/caldav.go
@@ -6,7 +6,7 @@ package caldav
 import (
 	"time"
 
-	"github.com/luxifer/ical"
+	"github.com/emersion/go-ical"
 )
 
 type Calendar struct {
diff --git a/caldav/client.go b/caldav/client.go
index f54b3c2..1155703 100644
--- a/caldav/client.go
+++ b/caldav/client.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/emersion/go-ical"
 	"github.com/emersion/go-webdav"
 	"github.com/emersion/go-webdav/internal"
-	"github.com/luxifer/ical"
 )
 
 // Client provides access to a remote CardDAV server.
@@ -174,13 +174,8 @@ func decodeCalendarObjectList(ms *internal.Multistatus) ([]CalendarObject, error
 			return nil, err
 		}
 
-		// Normalize line endings
-		// TODO: make the ical package less strict
-		b := calData.Data
-		b = bytes.ReplaceAll(b, []byte{'\r', '\n'}, []byte{'\n'})
-		b = bytes.ReplaceAll(b, []byte{'\n'}, []byte{'\r', '\n'})
-
-		data, err := ical.Parse(bytes.NewReader(b), nil)
+		r := bytes.NewReader(calData.Data)
+		data, err := ical.NewDecoder(r).DecodeCalendar()
 		if err != nil {
 			return nil, err
 		}
diff --git a/go.mod b/go.mod
index 04c3ce3..0c4f6f2 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@ module github.com/emersion/go-webdav
 go 1.13
 
 require (
+	github.com/emersion/go-ical v0.0.0-20200224161826-aa4584e92c62
 	github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7
-	github.com/luxifer/ical v0.0.0-20191105105432-84b768eb6395
 )
diff --git a/go.sum b/go.sum
index c0e8232..1ccff55 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,4 @@
+github.com/emersion/go-ical v0.0.0-20200224161826-aa4584e92c62 h1:kP9BxopsBc1jfYfHgbgnDBJeCfZt9GkyWXFmNOcRsps=
+github.com/emersion/go-ical v0.0.0-20200224161826-aa4584e92c62/go.mod h1:4xVTBPcT43a1pp3vdaa+FuRdX5XhKCZPpWv7m0z9ByM=
 github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7 h1:SE+tcd+0kn0cT4MqTo66gmkjqWHF1Z+Yha5/rhLs/H8=
 github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM=
-github.com/luxifer/ical v0.0.0-20191105105432-84b768eb6395 h1:H7Rbug09BDCzr6k/PASDjSMjbJGzXswwqesaDiBNJz8=
-github.com/luxifer/ical v0.0.0-20191105105432-84b768eb6395/go.mod h1:TGCe94U3u9fXQl4yHJ8W87z1czj057aVLxYnFYTDC08=