scheduler: midnight as default HH:MM

allow just "UTC", "Monday", "05-01", etc. clarify webui paragraph and mention KEYWORD as an element ignore sunrise and sunset keywords when sun module is disabled move all of parsing to time module, test whether combined match works
xoseperez · May 27, 2024 · d6f807d · d6f807d
1 parent 17a599f
commit d6f807d
Show file tree

Hide file tree

Showing 25 changed files with 11,097 additions and 10,754 deletions.
diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.curtain.html.gz b/code/espurna/data/index.curtain.html.gz
diff --git a/code/espurna/data/index.garland.html.gz b/code/espurna/data/index.garland.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.lightfox.html.gz b/code/espurna/data/index.lightfox.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/data/index.thermostat.html.gz b/code/espurna/data/index.thermostat.html.gz
diff --git a/code/espurna/scheduler.cpp b/code/espurna/scheduler.cpp
@@ -321,55 +321,7 @@ struct Parsed {
 };
 
 Schedule schedule(size_t index) {
-    Schedule out;
-
-    bool parsed_date { false };
-    bool parsed_weekdays { false };
-    bool parsed_time { false };
-
-    const auto time = settings::time(index);
-    auto split = SplitStringView(time);
-
-    while (split.next()) {
-        auto elem = split.current();
-
-        // most expected order, starting with date
-        if (!parsed_date && ((parsed_date = parse_date(out.date, elem)))) {
-            continue;
-        }
-
-        // then weekdays
-        if (!parsed_weekdays && ((parsed_weekdays = parse_weekdays(out.weekdays, elem)))) {
-            continue;
-        }
-
-        // then time
-        if (!parsed_time && ((parsed_time = parse_time(out.time, elem)))) {
-            continue;
-        }
-
-        // and keyword is always at the end. forcibly stop the parsing, regardless of the state
-        if (parse_time_keyword(out.time, elem)) {
-            if (want_utc(out.time)) {
-                break;
-            }
-
-#if SCHEDULER_SUN_SUPPORT
-            // do not want both time and sun{rise,set}
-            if (want_sunrise_sunset(out.time)) {
-                parsed_time = !parsed_time;
-            }
-#endif
-
-            break;
-        }
-    }
-
-    out.ok = parsed_date
-        || parsed_weekdays
-        || parsed_time;
-
-    return out;
+    return parse_schedule(settings::time(index));
 }
 
 size_t count() {
@@ -1339,6 +1291,10 @@ void run_today(Context& ctx) {
             context_pending(ctx, index, schedule);
             continue;
         }
+#else
+        if (want_sunrise_sunset(schedule.time)) {
+            continue;
+        }
 #endif
 
         handle_today(ctx, index, schedule);
@@ -1394,6 +1350,10 @@ void check(const datetime::Context& ctx) {
         if (!sun::update_schedule(schedule)) {
             continue;
         }
+#else
+        if (want_sunrise_sunset(schedule.time)) {
+            continue;
+        }
 #endif
 
         const auto& time = select_time(ctx, schedule);

diff --git a/code/espurna/scheduler_time.re b/code/espurna/scheduler_time.re
@@ -688,6 +688,75 @@ using parse::parse_weekdays;
 using parse::parse_time;
 using parse::parse_time_keyword;
 
+Schedule parse_schedule(StringView view) {
+    Schedule out;
+
+    // DATE " " WDS " " TIME " " KW
+    const auto spaces = std::count(view.begin(), view.end(), ' ');
+    if (spaces > 3) {
+        return out;
+    }
+
+    auto split = SplitStringView(view);
+
+    bool parsed_date { false };
+    bool parsed_weekdays { false };
+    bool parsed_time { false };
+    bool parsed_keyword { false };
+
+    int parsed { 0 };
+
+    while (split.next()) {
+        auto elem = split.current();
+
+        // most expected order, starting with date
+        if (!parsed_date && ((parsed_date = parse_date(out.date, elem)))) {
+            ++parsed;
+            continue;
+        }
+
+        // then weekdays
+        if (!parsed_weekdays && ((parsed_weekdays = parse_weekdays(out.weekdays, elem)))) {
+            ++parsed;
+            continue;
+        }
+
+        // then time
+        if (!parsed_time && ((parsed_time = parse_time(out.time, elem)))) {
+            ++parsed;
+            continue;
+        }
+
+        // and keyword is always at the end. forcibly stop the parsing, regardless of the state
+        if ((parsed_keyword = parse_time_keyword(out.time, elem))) {
+            ++parsed;
+            break;
+        }
+    }
+
+    // expect one of each element, plus optional keyword
+    if (parsed != (1 + spaces)) {
+        return out;
+    }
+
+    // do not want both time and sun{rise,set}
+    if (want_sunrise_sunset(out.time) && parsed_time) {
+        return out;
+    }
+
+    out.ok = parsed_date
+        || parsed_weekdays
+        || parsed_time
+        || parsed_keyword;
+
+    if (out.ok && !parsed_time && !want_sunrise_sunset(out.time)) {
+        out.time.hour = 0b1;
+        out.time.minute = 0b1;
+    }
+
+    return out;
+}
+
 } // namespace
 } // namespace scheduler
 } // namespace espurna
diff --git a/code/espurna/scheduler_time.re.ipp b/code/espurna/scheduler_time.re.ipp
@@ -1631,6 +1631,75 @@ using parse::parse_weekdays;
 using parse::parse_time;
 using parse::parse_time_keyword;
 
+Schedule parse_schedule(StringView view) {
+    Schedule out;
+
+    // DATE " " WDS " " TIME " " KW
+    const auto spaces = std::count(view.begin(), view.end(), ' ');
+    if (spaces > 3) {
+        return out;
+    }
+
+    auto split = SplitStringView(view);
+
+    bool parsed_date { false };
+    bool parsed_weekdays { false };
+    bool parsed_time { false };
+    bool parsed_keyword { false };
+
+    int parsed { 0 };
+
+    while (split.next()) {
+        auto elem = split.current();
+
+        // most expected order, starting with date
+        if (!parsed_date && ((parsed_date = parse_date(out.date, elem)))) {
+            ++parsed;
+            continue;
+        }
+
+        // then weekdays
+        if (!parsed_weekdays && ((parsed_weekdays = parse_weekdays(out.weekdays, elem)))) {
+            ++parsed;
+            continue;
+        }
+
+        // then time
+        if (!parsed_time && ((parsed_time = parse_time(out.time, elem)))) {
+            ++parsed;
+            continue;
+        }
+
+        // and keyword is always at the end. forcibly stop the parsing, regardless of the state
+        if ((parsed_keyword = parse_time_keyword(out.time, elem))) {
+            ++parsed;
+            break;
+        }
+    }
+
+    // expect one of each element, plus optional keyword
+    if (parsed != (1 + spaces)) {
+        return out;
+    }
+
+    // do not want both time and sun{rise,set}
+    if (want_sunrise_sunset(out.time) && parsed_time) {
+        return out;
+    }
+
+    out.ok = parsed_date
+        || parsed_weekdays
+        || parsed_time
+        || parsed_keyword;
+
+    if (out.ok && !parsed_time && !want_sunrise_sunset(out.time)) {
+        out.time.hour = 0b1;
+        out.time.minute = 0b1;
+    }
+
+    return out;
+}
+
 } // namespace
 } // namespace scheduler
 } // namespace espurna