Clarify application criteria code for module-{hide,forbid,tag}

jdechard · Feb 19, 2024 · 04a898e · 04a898e
1 parent 80c460d
commit 04a898e
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/tcl/mfcmd.tcl b/tcl/mfcmd.tcl
@@ -308,13 +308,18 @@ proc parseApplicationCriteriaArgs {aftbef nearsec args} {
    set isafter [expr {[info exists after] && [getState clock_seconds] >=\
       $after}]
 
-   # are criteria met
-   set apply [expr {!$notuser && !$notgroup && ($isbefore || $isafter ||\
-      (![info exists before] && ![info exists after]))}]
+
+   set user_or_group_excluded [expr {$notuser || $notgroup}]
+   set time_frame_defined [expr {[info exists before] || [info exists after]}]
+   set in_time_frame [expr {!$time_frame_defined || $isbefore || $isafter}]
+   set in_near_time_frame [expr {[info exists after] && !$isafter &&\
+      [getState clock_seconds] >= ($after - $nearsec)}]
+
+   set apply [expr {$in_time_frame && !$user_or_group_excluded}]
 
    # is end limit near ?
-   set isnearly [expr {!$apply && !$notuser && !$notgroup && [info exists\
-      after] && !$isafter && [getState clock_seconds] >= ($after - $nearsec)}]
+   set isnearly [expr {!$apply && !$user_or_group_excluded &&\
+      $in_near_time_frame}]
    if {![info exists afterraw]} {
       set afterraw {}
    }