either of cron or loop can be set and unset, mark invalids as invalid and unfinish

server/ajax/ajax.go

@@ -128,23 +128,29 @@ func (a *Ajax) loopTasks() (time.Time, error) {
 			if task.Loop == 0 && task.Cron == "" {
 				continue
 			}
-			nextLoopTrigger := task.Completed.Add(task.Loop)
+			var nextTask time.Time
-			if task.Loop == 0 {
+			if task.Loop > 0 {
-				nextLoopTrigger2 := task.Cron.Next(task.Completed)
+				nextTask = task.Completed.Add(task.Loop)
-				if nextLoopTrigger2.Before(nextLoopTrigger) {
+			}
-					nextLoopTrigger = nextLoopTrigger2
+			if string(task.Cron) != "" {
+				nextTask2 := task.Cron.Next(task.Completed)
+				if nextTask2 != (time.Time{}) && (nextTask == (time.Time{}) || nextTask2.Before(nextTask)) {
+					nextTask = nextTask2
 				}
 			}
-			if time.Now().Before(nextLoopTrigger) {
+			if time.Now().After(nextTask) {
-				if nextLoopTrigger.Before(nextDue) {
+				task.Complete = false
-					nextDue = nextLoopTrigger
+				task.Completed = time.Time{}
+				if nextTask == (time.Time{}) {
+					task.Title += " !!!INVALID CRON/LOOP!!!"
+				}
+				if err := a.storageSetTask(list.UUID, task); err != nil {
+					return nextDue, err
+				}
+			} else {
+				if nextTask.Before(nextDue) {
+					nextDue = nextTask
 				}
-				continue
-			}
-			task.Complete = false
-			task.Completed = time.Time{}
-			if err := a.storageSetTask(list.UUID, task); err != nil {
-				return nextDue, err
 			}
 		}
 	}

server/ajax/form/cron.go

@@ -1,6 +1,7 @@
 package form
 
 import (
+	"log"
 	"time"
 
 	"github.com/robfig/cron/v3"
@@ -11,6 +12,7 @@ type Cron string
 func (c Cron) Next(since time.Time) time.Time {
 	schedule, err := cron.ParseStandard(string(c))
 	if err != nil {
+		log.Printf("failed to parse cron %q: %v", string(c), err)
 		return time.Time{}
 	}
 	return schedule.Next(since)