Merge pull request #8 from KingWaffleIII/dev

v1.2.2

Author: KingWaffleIII

actions/defaults.py

@@ -81,7 +81,7 @@
         ),
         actions.Sleep(600),
         actions.Say(
-            text="Break's over! Get back to work, those As aren't gonna earn themselves.",
+            text="Break's over! Get back to work, those A's aren't gonna earn themselves.",
             pause_media=True,
             condition_func=None,
         ),

actions/notify.py

@@ -1,4 +1,4 @@
-from util.functions import icon
+from util import icon
 
 from .action import Action
 

main.py

@@ -4,7 +4,6 @@
 import multiprocessing.popen_spawn_win32 as forking
 import os
 import sys
-import threading
 import time
 
 import win32gui
@@ -68,9 +67,12 @@ def procrastination():
         asyncio.run(OnProcrastinationActionSet.execute())
 
 
-async def watch():
+async def watch(break_event: multiprocessing.Event):
     proc = None
     while True:
+        if break_event.is_set():
+            raise asyncio.CancelledError
+
         window = win32gui.GetWindowText(win32gui.GetForegroundWindow())
         if (
             window
@@ -89,31 +91,33 @@ async def watch():
 
                 await AfterProcrastinationActionSet.execute()
 
-                time.sleep(60)
+                time.sleep(1)
 
         time.sleep(1)
 
 
-def run():
-    asyncio.run(startup())
-    asyncio.run(watch())
+def run_watchdog(break_event: multiprocessing.Event):
+    while True:
+        if not break_event.is_set():
+            try:
+                asyncio.run(watch(break_event))
+            except asyncio.CancelledError:
+                continue
+        else:
+            time.sleep(1)
 
 
 if __name__ == "__main__":
     multiprocessing.freeze_support()
 
-    def run_with_watchdog():
-        try:
-            run()
-        except asyncio.CancelledError:
-            pass
+    asyncio.run(startup())
 
-    run_thread = threading.Thread(target=run_with_watchdog, daemon=True)
-    run_thread.start()
+    watchdog = Process(target=run_watchdog, args=(util.break_event,), name="watchdog")
+    watchdog.start()
 
     try:
-        util.functions.icon.run()
+        util.icon.run()
     finally:
-        if run_thread.is_alive():
-            asyncio.get_event_loop().stop()
-            run_thread.join()
+        if watchdog.is_alive():
+            # asyncio.get_event_loop().stop()
+            watchdog.kill()

util/__init__.py

@@ -1,16 +1,70 @@
-from . import config
-from . import functions
+import asyncio
+import multiprocessing
+import os
+import sys
+import threading
+
+import pystray
+from PIL import Image
+
+from . import config, functions
 
 
 class Colour:
-    PURPLE = '\033[95m'
-    CYAN = '\033[96m'
-    DARKCYAN = '\033[36m'
-    BLUE = '\033[94m'
-    GREEN = '\033[92m'
-    YELLOW = '\033[93m'
-    RED = '\033[91m'
-    BOLD = '\033[1m'
-    UNDERLINE = '\033[4m'
-    END = '\033[0m'
+    PURPLE = "\033[95m"
+    CYAN = "\033[96m"
+    DARKCYAN = "\033[36m"
+    BLUE = "\033[94m"
+    GREEN = "\033[92m"
+    YELLOW = "\033[93m"
+    RED = "\033[91m"
+    BOLD = "\033[1m"
+    UNDERLINE = "\033[4m"
+    END = "\033[0m"
+
+
+def run_configurator():
+    if not hasattr(sys, "frozen"):
+        os.system('start cmd /k "python configurator.py"')
+    else:
+        # run configutator.exe
+        os.system("configurator.exe")
+
+
+break_event = multiprocessing.Event()
+
+
+def take_break():
+    break_event.set()
+
+    from actions import Actionset
+
+    BreakActionSet = Actionset()
+    BreakActionSet.load_json(config.config["break"])
+
+    def run_break():
+        asyncio.run(BreakActionSet.execute())
+        break_event.clear()
+
+    threading.Thread(target=run_break, daemon=True).start()
+
 
+icon = pystray.Icon(
+    "AntiProcrastinator",
+    Image.open(functions.eval_file_path(r"{runtime_dir}\icon2.png")),
+    title="AntiProcrastinator",
+    menu=pystray.Menu(
+        pystray.MenuItem(
+            "Open Configurator",
+            run_configurator,
+        ),
+        pystray.MenuItem(
+            "Break",
+            take_break,
+        ),
+        pystray.MenuItem(
+            "Exit",
+            lambda icon: (icon.stop(), os._exit(0)),
+        ),
+    ),
+)

util/functions.py

@@ -250,40 +250,3 @@ def deconstruct_condition_function(condition_func: str) -> tuple[str, bool, list
     if args == [""]:
         args = []
     return function, inverse, args
-
-
-def run_configurator():
-    if not hasattr(sys, "frozen"):
-        os.system('start cmd /k "python configurator.py"')
-    else:
-        # run configutator.exe
-        os.system("configurator.exe")
-
-
-def take_break():
-    from actions import Actionset
-
-    BreakActionSet = Actionset()
-    BreakActionSet.load_json(config.config["break"])
-    asyncio.get_event_loop().run_until_complete(BreakActionSet.execute())
-
-
-icon = pystray.Icon(
-    "AntiProcrastinator",
-    Image.open(eval_file_path(r"{runtime_dir}\icon2.png")),
-    title="AntiProcrastinator",
-    menu=pystray.Menu(
-        pystray.MenuItem(
-            "Open Configurator",
-            run_configurator,
-        ),
-        pystray.MenuItem(
-            "Break",
-            take_break,
-        ),
-        pystray.MenuItem(
-            "Exit",
-            lambda icon: (icon.stop(), os._exit(0)),
-        ),
-    ),
-)