BreakQueue: skip upcoming long break right away

Author: deltragon

safeeyes/model.py

@@ -250,13 +250,22 @@ def __set_next_break(self, break_type: typing.Optional[BreakType] = None) -> Non
         self.context["session"]["break"] = self.__current_break.name
 
     def skip_long_break(self) -> None:
-        if self.__short_queue:
-            for break_object in self.__short_queue:
-                break_object.time = self.__short_break_time
-
-        if self.__long_queue:
-            for break_object in self.__long_queue:
-                break_object.time = self.__long_break_time
+        if not (self.__short_queue and self.__long_queue):
+            return
+
+        for break_object in self.__short_queue:
+            break_object.time = self.__short_break_time
+
+        for break_object in self.__long_queue:
+            break_object.time = self.__long_break_time
+
+        if self.__current_break.type == BreakType.LONG_BREAK:
+            # Note: this skips the long break, meaning the following long break
+            # won't be the current one, but the next one after
+            # we could decrement the __current_long counter, but then we'd need to
+            # handle wraparound and possibly randomizing, which seems complicated
+            self.__current_break = self.__next_short()
+            self.context["session"]["break"] = self.__current_break.name
 
     def is_empty(self, break_type: BreakType) -> bool:
         """Check if the given break type is empty or not."""

safeeyes/tests/test_core.py

@@ -874,8 +874,7 @@ def test_idle_skip_long_before_long(
         """Test idling for longer than long break time, right before the next long
         break.
 
-        FIXME: this test is broken, it should not work this way. Instead of just
-        skipping the long break, it skips all the short breaks too.
+        This used to skip all the short breaks too.
         """
         context: dict[str, typing.Any] = {
             "session": {},
@@ -986,29 +985,58 @@ def test_idle_skip_long_before_long(
             sequential_threading_handle,
             safe_eyes_core,
             context,
-            long_break_duration,
-            "translated!: long break 1",
+            short_break_duration,
+            "translated!: break 1",
         )
 
-        # Time passed: 16min 10s
-        # 15min short_break_interval (from previous, as long_break_interval must be
-        # multiple)
-        # 10 seconds pre_break_warning_time, 1 minute long_break_duration
-        self.assert_datetime("2024-08-25T15:18:55")
+        self.assert_datetime("2024-08-25T14:18:10")
 
         self.run_next_break(
             sequential_threading_handle,
             time_machine,
             safe_eyes_core,
             context,
             short_break_duration,
-            "translated!: break 1",
+            "translated!: break 2",
         )
 
-        # Time passed: 15min 25s
-        # 15min short_break_interval, 10 seconds pre_break_warning_time,
-        # 15 seconds short_break_duration
-        self.assert_datetime("2024-08-25T15:34:20")
+        self.assert_datetime("2024-08-25T14:33:35")
+
+        self.run_next_break(
+            sequential_threading_handle,
+            time_machine,
+            safe_eyes_core,
+            context,
+            short_break_duration,
+            "translated!: break 3",
+        )
+
+        self.assert_datetime("2024-08-25T14:49:00")
+
+        self.run_next_break(
+            sequential_threading_handle,
+            time_machine,
+            safe_eyes_core,
+            context,
+            short_break_duration,
+            "translated!: break 4",
+        )
+
+        self.assert_datetime("2024-08-25T15:04:25")
+
+        # note that long break 1 was skipped, and we went directly to long break 2
+        # there's a note in BreakQueue.skip_long_break, we could fix it if needed, but
+        # it seems too much effort to be worth it right now
+        self.run_next_break(
+            sequential_threading_handle,
+            time_machine,
+            safe_eyes_core,
+            context,
+            long_break_duration,
+            "translated!: long break 2",
+        )
+
+        self.assert_datetime("2024-08-25T15:20:35")
 
         safe_eyes_core.stop()
 

safeeyes/tests/test_model.py

@@ -437,9 +437,8 @@ def test_skip_long_break_before_long_break(
 
         bq.skip_long_break()
 
-        assert bq.get_break().name == "translated!: long break 2"
+        assert bq.get_break().name == "translated!: break 1"
 
-        assert bq.next().name == "translated!: break 1"
         assert bq.next().name == "translated!: break 2"
         assert bq.next().name == "translated!: break 3"
         assert bq.next().name == "translated!: break 4"