Merge remote-tracking branch 'upstream/dev' into theme_switcher

internal/glance/widget-calendar.go

@@ -1,86 +1,45 @@
 package glance
 
 import (
-	"context"
+	"errors"
 	"html/template"
 	"time"
 )
 
 var calendarWidgetTemplate = mustParseTemplate("calendar.html", "widget-base.html")
 
+var calendarWeekdaysToInt = map[string]time.Weekday{
+	"sunday":    time.Sunday,
+	"monday":    time.Monday,
+	"tuesday":   time.Tuesday,
+	"wednesday": time.Wednesday,
+	"thursday":  time.Thursday,
+	"friday":    time.Friday,
+	"saturday":  time.Saturday,
+}
+
 type calendarWidget struct {
-	widgetBase  `yaml:",inline"`
-	Calendar    *calendar
-	StartSunday bool `yaml:"start-sunday"`
+	widgetBase     `yaml:",inline"`
+	FirstDayOfWeek string        `yaml:"first-day-of-week"`
+	FirstDay       int           `yaml:"-"`
+	cachedHTML     template.HTML `yaml:"-"`
 }
 
 func (widget *calendarWidget) initialize() error {
-	widget.withTitle("Calendar").withCacheOnTheHour()
+	widget.withTitle("Calendar").withError(nil)
+
+	if widget.FirstDayOfWeek == "" {
+		widget.FirstDayOfWeek = "monday"
+	} else if _, ok := calendarWeekdaysToInt[widget.FirstDayOfWeek]; !ok {
+		return errors.New("invalid first day of week")
+	}
+
+	widget.FirstDay = int(calendarWeekdaysToInt[widget.FirstDayOfWeek])
+	widget.cachedHTML = widget.renderTemplate(widget, calendarWidgetTemplate)
 
 	return nil
 }
 
-func (widget *calendarWidget) update(ctx context.Context) {
-	widget.Calendar = newCalendar(time.Now(), widget.StartSunday)
-	widget.withError(nil).scheduleNextUpdate()
-}
-
 func (widget *calendarWidget) Render() template.HTML {
-	return widget.renderTemplate(widget, calendarWidgetTemplate)
-}
-
-type calendar struct {
-	CurrentDay        int
-	CurrentWeekNumber int
-	CurrentMonthName  string
-	CurrentYear       int
-	Days              []int
-}
-
-// TODO: very inflexible, refactor to allow more customizability
-// TODO: allow changing between showing the previous and next week and the entire month
-func newCalendar(now time.Time, startSunday bool) *calendar {
-	year, week := now.ISOWeek()
-	weekday := now.Weekday()
-	if !startSunday {
-		weekday = (weekday + 6) % 7 // Shift Monday to 0
-	}
-
-	currentMonthDays := daysInMonth(now.Month(), year)
-
-	var previousMonthDays int
-
-	if previousMonthNumber := now.Month() - 1; previousMonthNumber < 1 {
-		previousMonthDays = daysInMonth(12, year-1)
-	} else {
-		previousMonthDays = daysInMonth(previousMonthNumber, year)
-	}
-
-	startDaysFrom := now.Day() - int(weekday) - 7
-
-	days := make([]int, 21)
-
-	for i := 0; i < 21; i++ {
-		day := startDaysFrom + i
-
-		if day < 1 {
-			day = previousMonthDays + day
-		} else if day > currentMonthDays {
-			day = day - currentMonthDays
-		}
-
-		days[i] = day
-	}
-
-	return &calendar{
-		CurrentDay:        now.Day(),
-		CurrentWeekNumber: week,
-		CurrentMonthName:  now.Month().String(),
-		CurrentYear:       year,
-		Days:              days,
-	}
-}
-
-func daysInMonth(m time.Month, year int) int {
-	return time.Date(year, m+1, 0, 0, 0, 0, 0, time.UTC).Day()
+	return widget.cachedHTML
 }