Add files via upload

PuloV/ics-golang - Duration support thanks to @nemosupremo
https://github.com/ChannelMeter/iso8601duration

PuloV/ics-golang - Pull Request by @lpereira
PuloV#10

Author: RobToMars

parse.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"github.com/ChannelMeter/iso8601duration"
 )
 
 func init() {
@@ -281,6 +282,12 @@ func (p *Parser) parseEvents(cal *Calendar, eventsData []string) {
 
 		start := p.parseEventStart(eventData)
 		end := p.parseEventEnd(eventData)
+
+		duration := p.parseEventDuration(eventData)
+		if end.Before(start) {
+			end = start.Add(duration)
+		}
+
 		// whole day event when both times are 00:00:00
 		wholeDay := start.Hour() == 0 && end.Hour() == 0 && start.Minute() == 0 && end.Minute() == 0 && start.Second() == 0 && end.Second() == 0
 
@@ -518,55 +525,73 @@ func (p *Parser) parseEventModified(eventData string) time.Time {
 	return t
 }
 
+func parseDateTime(str string) time.Time {
+	if !strings.Contains(str, "Z") {
+		str = fmt.Sprintf("%sZ", str)
+	}
+
+	t, _ := time.Parse(IcsFormat, str)
+	return t
+}
+
 // parses the event start time
 func (p *Parser) parseEventStart(eventData string) time.Time {
 	reWholeDay, _ := regexp.Compile(`DTSTART;VALUE=DATE:.*?\n`)
 	re, _ := regexp.Compile(`DTSTART(;TZID=.*?){0,1}:.*?\n`)
-	resultWholeDay := reWholeDay.FindString(eventData)
-	var t time.Time
+	reDateTime, _ := regexp.Compile(`DTSTART;VALUE=DATE-TIME:.*?\n`)
 
-	if resultWholeDay != "" {
+	if resultWholeDay := reWholeDay.FindString(eventData); resultWholeDay != "" {
 		// whole day event
 		modified := trimField(resultWholeDay, "DTSTART;VALUE=DATE:")
-		t, _ = time.Parse(IcsFormatWholeDay, modified)
-	} else {
-		// event that has start hour and minute
-		result := re.FindString(eventData)
-		modified := trimField(result, "DTSTART(;TZID=.*?){0,1}:")
-
-		if !strings.Contains(modified, "Z") {
-			modified = fmt.Sprintf("%sZ", modified)
-		}
-
-		t, _ = time.Parse(IcsFormat, modified)
+		t, _ := time.Parse(IcsFormatWholeDay, modified)
+		return t
 	}
-
-	return t
+	if resultDateTime := reDateTime.FindString(eventData); resultDateTime != "" {
+		// date time event
+		modified := trimField(resultDateTime, "DTSTART;VALUE=DATE-TIME:")
+		return parseDateTime(modified)
+	}
+	// event that has start hour and minute
+	result := re.FindString(eventData)
+	modified := trimField(result, "DTSTART(;TZID=.*?){0,1}:")
+	return parseDateTime(modified)
 }
 
 // parses the event end time
 func (p *Parser) parseEventEnd(eventData string) time.Time {
 	reWholeDay, _ := regexp.Compile(`DTEND;VALUE=DATE:.*?\n`)
 	re, _ := regexp.Compile(`DTEND(;TZID=.*?){0,1}:.*?\n`)
-	resultWholeDay := reWholeDay.FindString(eventData)
-	var t time.Time
+	reDateTime, _ := regexp.Compile(`DTEND;VALUE=DATE-TIME:.*?\n`)
 
-	if resultWholeDay != "" {
+	if resultWholeDay := reWholeDay.FindString(eventData); resultWholeDay != "" {
 		// whole day event
 		modified := trimField(resultWholeDay, "DTEND;VALUE=DATE:")
-		t, _ = time.Parse(IcsFormatWholeDay, modified)
-	} else {
-		// event that has end hour and minute
-		result := re.FindString(eventData)
-		modified := trimField(result, "DTEND(;TZID=.*?){0,1}:")
-
-		if !strings.Contains(modified, "Z") {
-			modified = fmt.Sprintf("%sZ", modified)
-		}
-		t, _ = time.Parse(IcsFormat, modified)
+		t, _ := time.Parse(IcsFormatWholeDay, modified)
+		return t
+	}
+	if resultDateTime := reDateTime.FindString(eventData); resultDateTime != "" {
+		// date time event
+		modified := trimField(resultDateTime, "DTEND;VALUE=DATE-TIME:")
+		return parseDateTime(modified)
+	}
+	// event that has end hour and minute
+	result := re.FindString(eventData)
+	modified := trimField(result, "DTEND(;TZID=.*?){0,1}:")
+	return parseDateTime(modified)
+}
+
+func (p *Parser) parseEventDuration(eventData string) time.Duration {
+	reDuration, _ := regexp.Compile(`DURATION:.*?\n`)
+	result := reDuration.FindString(eventData)
+	trimmed := trimField(result, "DURATION:")
+	parsedDuration, err := duration.FromString(trimmed)
+	var output time.Duration
+
+	if err == nil {
+		output = parsedDuration.ToDuration()
 	}
-	return t
 
+	return output
 }
 
 // parses the event RRULE (the repeater)