Scheduling improvements

Makefile

@@ -87,6 +87,10 @@ $(GOBIN)/mockery: verify $(GOBIN)/eget
 	@echo "[*] $@"
 	"$(GOBIN)/eget" vektra/mockery --upgrade-only --to '$(GOBIN)'
 
+$(GOBIN)/golangci-lint: verify $(GOBIN)/eget
+	@echo "[*] $@"
+	"$(GOBIN)/eget" golangci/golangci-lint --tag v1.63.4 --asset=tar.gz --upgrade-only --to '$(GOBIN)'
+
 prepare_build: verify download
 	@echo "[*] $@"
 
@@ -296,14 +300,14 @@ checklinks:
 	muffet -b 8192 --exclude="(linux.die.net|stackoverflow.com)" http://localhost:1313/resticprofile/
 
 .PHONY: lint
-lint:
+lint: $(GOBIN)/golangci-lint
 	@echo "[*] $@"
 	GOOS=darwin golangci-lint run
 	GOOS=linux golangci-lint run
 	GOOS=windows golangci-lint run
 
 .PHONY: fix
-fix:
+fix: $(GOBIN)/golangci-lint
 	@echo "[*] $@"
 	$(GOCMD) mod tidy
 	$(GOCMD) fix ./...

calendar/event.go

@@ -97,6 +97,11 @@ func (e *Event) Parse(input string) error {
 func (e *Event) Next(from time.Time) time.Time {
 	// start from time and increment of 1 minute each time
 	next := from.Truncate(time.Minute) // truncate all the seconds
+	// if we're already partway through a minute, skip to the next minute
+	// to avoid scheduling events in the past
+	if from.Second() > 0 {
+		next = next.Add(time.Minute) // it's too late for the current minute
+	}
 	// should stop in 2 years time to avoid an infinite loop
 	endYear := from.Year() + 2
 	for next.Year() <= endYear {

calendar/event_test.go

@@ -161,24 +161,31 @@ func TestNextTrigger(t *testing.T) {
 	// the base time is the example in the Go documentation https://golang.org/pkg/time/
 	ref, err := time.Parse(time.ANSIC, "Mon Jan 2 15:04:05 2006")
 	require.NoError(t, err)
+	refNoSecond, err := time.Parse(time.ANSIC, "Mon Jan 2 15:04:00 2006")
+	require.NoError(t, err)
 
-	testData := []struct{ event, trigger string }{
-		{"*:*:*", "2006-01-02 15:04:00"}, // seconds are zeroed out
-		{"03-*", "2006-03-01 00:00:00"},
-		{"*-01", "2006-02-01 00:00:00"},
-		{"*:*:11", "2006-01-02 15:04:00"}, // again, seconds are zeroed out
-		{"*:11:*", "2006-01-02 15:11:00"},
-		{"11:*:*", "2006-01-03 11:00:00"},
-		{"tue", "2006-01-03 00:00:00"},
-		{"2003-*-*", "0001-01-01 00:00:00"},
+	testData := []struct {
+		event, trigger string
+		ref            time.Time
+	}{
+		{"*:*:*", "2006-01-02 15:04:00", refNoSecond}, // at the exact same second
+		{"*:*:*", "2006-01-02 15:05:00", ref},         // seconds are zeroed out => take next minute
+		{"03-*", "2006-03-01 00:00:00", ref},
+		{"*-01", "2006-02-01 00:00:00", ref},
+		{"*:*:11", "2006-01-02 15:04:00", refNoSecond}, // at the exact same second
+		{"*:*:11", "2006-01-02 15:05:00", ref},         // seconds are zeroed out => take next minute
+		{"*:11:*", "2006-01-02 15:11:00", ref},
+		{"11:*:*", "2006-01-03 11:00:00", ref},
+		{"tue", "2006-01-03 00:00:00", ref},
+		{"2003-*-*", "0001-01-01 00:00:00", ref},
 	}
 
 	for _, testItem := range testData {
 		t.Run(testItem.event, func(t *testing.T) {
 			event := NewEvent()
 			err = event.Parse(testItem.event)
 			assert.NoError(t, err)
-			assert.Equal(t, testItem.trigger, event.Next(ref).String()[0:len(testItem.trigger)])
+			assert.Equal(t, testItem.trigger, event.Next(testItem.ref).String()[0:len(testItem.trigger)])
 		})
 	}
 }

codecov.yml

@@ -11,6 +11,7 @@ ignore:
   - run_profile.go
   - syslog.go
   - syslog_windows.go
+  - "**/mocks/*.go"
 
 codecov:
   notify:

commands.go

@@ -11,6 +11,7 @@
 	"slices"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/creativeprojects/clog"
@@ -25,6 +26,7 @@
 
 var (
 	ownCommands = NewOwnCommands()
+	elevation   sync.Once
 )
 
 func init() {
@@ -99,7 +101,8 @@
 			needConfiguration: true,
 			hide:              false,
 			flags: map[string]string{
-				"--no-start": "don't start the timer/service (systemd/launch only)",
+				"--no-start": "don't start the job after installing (systemd/launch only)",
+				"--start":    "start the job after installing (systemd/launch only)",
 				"--all":      "add all scheduled jobs of all profiles and groups",
 			},
 		},
@@ -323,8 +326,11 @@
 	}
 	// maybe can find a better way than searching for the word "denied"?
 	if platform.IsWindows() && !flags.isChild && strings.Contains(err.Error(), "denied") {
-		clog.Info("restarting resticprofile in elevated mode...")
-		err := elevated()
+		// we try only once, otherwise we return the original error
+		elevation.Do(func() {
+			clog.Info("restarting resticprofile in elevated mode...")
+			err = elevated()
+		})
 		if err != nil {
 			return err
 		}