wip
This commit is contained in:
@@ -96,7 +96,7 @@ func (b *Backend) ListCalendars(ctx context.Context) ([]caldav.Calendar, error)
|
||||
|
||||
cals := []caldav.Calendar{b.birthdaysCalendarMeta(p.Username)}
|
||||
for _, cal := range names {
|
||||
if err := b.store.EnsureCollection(p.Username, "cal-"+cal.Name); err != nil {
|
||||
if err := b.store.EnsureCollection(p.Username, "col/calendars/"+cal.Name); err != nil {
|
||||
b.logger.Warn("ensuring calendar directory", "calendar", cal.Name, "error", err)
|
||||
continue
|
||||
}
|
||||
@@ -116,11 +116,11 @@ func (b *Backend) ListCalendars(ctx context.Context) ([]caldav.Calendar, error)
|
||||
disk, _ := b.store.ListCollections(p.Username)
|
||||
configured := make(map[string]bool)
|
||||
for _, cal := range names {
|
||||
configured["cal-"+cal.Name] = true
|
||||
configured["col/calendars/"+cal.Name] = true
|
||||
}
|
||||
for _, dir := range disk {
|
||||
if strings.HasPrefix(dir, "cal-") && !configured[dir] {
|
||||
name := strings.TrimPrefix(dir, "cal-")
|
||||
if strings.HasPrefix(dir, "col/calendars/") && !configured[dir] {
|
||||
name := strings.TrimPrefix(dir, "col/calendars/")
|
||||
cals = append(cals, b.calendarMeta(p.Username, name, name))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user