vikunja/vikunja
6
43
Fork 73
Code Issues 150 Pull Requests 21 Packages Releases 32 Activity

fix: lint errors
Some checks failed
continuous-integration/drone/pr Build is failing
Details

Browse Source
This commit is contained in:
cernst 2023-03-17 08:23:52 +01:00
parent 32cb200f87
commit 4018bd6078
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/caldav/parsing.go
View File

@ -143,8 +143,7 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
reminders := make([]*models.TaskReminder, 0) reminders := make([]*models.TaskReminder, 0)
for _, vAlarm := range vTodo.SubComponents() { for _, vAlarm := range vTodo.SubComponents() {
switch vAlarm := vAlarm.(type) { if vAlarm, ok := vAlarm.(*ics.VAlarm); ok {
case *ics.VAlarm:
reminders = parseVAlarm(vAlarm, reminders) reminders = parseVAlarm(vAlarm, reminders)
} }
} }
@ -158,14 +157,14 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
func parseVAlarm(vAlarm *ics.VAlarm, reminders []*models.TaskReminder) []*models.TaskReminder { func parseVAlarm(vAlarm *ics.VAlarm, reminders []*models.TaskReminder) []*models.TaskReminder {
for _, property := range vAlarm.UnknownPropertiesIANAProperties() { for _, property := range vAlarm.UnknownPropertiesIANAProperties() {
if property.IANAToken == "TRIGGER" { if property.IANAToken == "TRIGGER" {
if len(property.ICalParameters["VALUE"]) > 0 { switch {
switch property.ICalParameters["VALUE"][0] { case len(property.ICalParameters["VALUE"]) > 0:
case "DATE-TIME": if property.ICalParameters["VALUE"][0] == "DATE-TIME" {
// Example: TRIGGER;VALUE=DATE-TIME:20181201T011210Z // Example: TRIGGER;VALUE=DATE-TIME:20181201T011210Z
reminders = append(reminders, &models.TaskReminder{ reminders = append(reminders, &models.TaskReminder{
Reminder: caldavTimeToTimestamp(property.Value)}) Reminder: caldavTimeToTimestamp(property.Value)})
} }
} else if len(property.ICalParameters["RELATED"]) > 0 { case len(property.ICalParameters["RELATED"]) > 0:
duration := parseDuration(property.Value) duration := parseDuration(property.Value)
switch property.ICalParameters["RELATED"][0] { switch property.ICalParameters["RELATED"][0] {
case "START": case "START":
@ -179,14 +178,12 @@ func parseVAlarm(vAlarm *ics.VAlarm, reminders []*models.TaskReminder) []*models
RelativePeriod: int64(duration.Seconds()), RelativePeriod: int64(duration.Seconds()),
RelativeTo: models.ReminderRelationEndDate}) RelativeTo: models.ReminderRelationEndDate})
} }
} else { default:
duration := parseDuration(property.Value) duration := parseDuration(property.Value)
if duration != 0 { // Example: TRIGGER:-PT60M
// Example: TRIGGER:-PT60M reminders = append(reminders, &models.TaskReminder{
reminders = append(reminders, &models.TaskReminder{ RelativePeriod: int64(duration.Seconds()),
RelativePeriod: int64(duration.Seconds()), RelativeTo: models.ReminderRelationDueDate})
RelativeTo: models.ReminderRelationDueDate})
}
} }
} }
} }

8
pkg/caldav/parsing_test.go
View File

@ -166,6 +166,10 @@ DESCRIPTION:Lorem Ipsum
DTSTART:20230228T170000Z DTSTART:20230228T170000Z
DUE:20230304T150000Z DUE:20230304T150000Z
BEGIN:VALARM BEGIN:VALARM
TRIGGER:PT0S
ACTION:DISPLAY
END:VALARM
BEGIN:VALARM
TRIGGER:-PT60M TRIGGER:-PT60M
ACTION:DISPLAY ACTION:DISPLAY
END:VALARM END:VALARM
@ -187,6 +191,10 @@ END:VCALENDAR`,
StartDate: time.Date(2023, 2, 28, 17, 0, 0, 0, config.GetTimeZone()), StartDate: time.Date(2023, 2, 28, 17, 0, 0, 0, config.GetTimeZone()),
DueDate: time.Date(2023, 3, 4, 15, 0, 0, 0, config.GetTimeZone()), DueDate: time.Date(2023, 3, 4, 15, 0, 0, 0, config.GetTimeZone()),
Reminders: []*models.TaskReminder{ Reminders: []*models.TaskReminder{
{
RelativeTo: models.ReminderRelationDueDate,
RelativePeriod: 0,
},
{ {
RelativeTo: models.ReminderRelationDueDate, RelativeTo: models.ReminderRelationDueDate,
RelativePeriod: -3600, RelativePeriod: -3600,