ok-script 0.0.24__tar.gz → 0.0.26__tar.gz

{ok-script-0.0.24 → ok-script-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.24
+Version: 0.0.26
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok-script-0.0.24 → ok-script-0.0.26}/ok/task/BaseTask.py

@@ -103,6 +103,7 @@ class BaseTask(ExecutorOperation):
 
     def disable(self):
         self._enabled = False
+        self.executor.current_task = None
         communicate.task.emit(self)
 
     def get_status(self):

{ok-script-0.0.24 → ok-script-0.0.26}/ok/task/TaskExecutor.py

@@ -110,14 +110,15 @@ class TaskExecutor:
             if self.exit_event.is_set():
                 logger.info("Exit event set. Exiting early.")
                 return
-            if self.current_task and not self.current_task.enabled:
+            if (self.current_task and not self.current_task.enabled) or self.current_task is None:
                 raise TaskDisabledException()
             if not (self.paused or (
                     self.current_task is not None and self.current_task.paused) or self.interaction is None or not self.interaction.should_capture()):
                 to_sleep = self.pause_end_time - time.time()
                 if to_sleep <= 0:
                     return
-            time.sleep(0.001)
+                time.sleep(to_sleep)
+            time.sleep(0.1)
 
     def pause(self, task=None):
         if task is not None:
@@ -197,14 +198,12 @@ class TaskExecutor:
             try:
                 task, cycled = self.next_task()
                 if not task:
-                    self.sleep(1)
+                    time.sleep(1)
                     continue
+                self.current_task = task
                 if isinstance(task, OneTimeTask):
-                    self.current_task = task
                     task.running = True
                     communicate.task.emit(task)
-                else:
-                    self.current_task = None
                 if cycled or self._frame is None:
                     self.next_frame()
                     processing_time = 0
@@ -222,8 +221,12 @@ class TaskExecutor:
                 elif isinstance(task, OneTimeTask):
                     task.set_done()
                     communicate.task.emit(task)
+                self.current_task = None
             except TaskDisabledException:
-                logger.info(f"{task.name} is disabled, breaking")
+                logger.info(f"task is disabled, go to next task")
+            except FinishedException:
+                logger.info(f"FinishedException, breaking")
+                break
             except Exception as e:
                 traceback.print_exc()
                 stack_trace_str = traceback.format_exc()
@@ -232,7 +235,6 @@ class TaskExecutor:
             if isinstance(task, OneTimeTask):
                 task.running = False
                 communicate.task.emit(task)
-            self.sleep(0.001)
         logger.debug(f'exit_event is set, destroy all tasks')
         for task in self.onetime_tasks:
             task.on_destroy()

{ok-script-0.0.24 → ok-script-0.0.26}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.24
+Version: 0.0.26
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok-script-0.0.24 → ok-script-0.0.26}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.24",
+    version="0.0.26",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",