Merge pull request #15 from KingWaffleIII/dev

v1.2.5

Author: KingWaffleIII

AntiProcrastinator.spec

@@ -4,7 +4,7 @@ main = Analysis(
     ["main.py"],
     pathex=[],
     binaries=[],
-    datas=[("annoying.mp3", "."), ("icon.png", "."), ("icon2.png", ".")],
+    datas=[("annoying.mp3", "."), ("icon.png", ".")],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},
@@ -32,13 +32,14 @@ main_exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
+    icon="./icon.ico",
 )
 
 configurator = Analysis(
     ["configurator.py"],
     pathex=[],
-    binaries=[("icon.png", "."), ("icon2.png", ".")],
-    datas=[],
+    binaries=[],
+    datas=[("icon.png", ".")],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},
@@ -66,4 +67,5 @@ configurator_exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
+    icon="./icon.ico",
 )

actions/notify.py

@@ -1,4 +1,4 @@
-from util import icon
+from util import functions
 
 from .action import Action
 
@@ -19,10 +19,9 @@ def to_json(self):
         Converts the action to JSON.
         :return: JSON representation of the action.
         """
-        import util
 
         if self.condition_func is not None:
-            condition_func_str = util.functions.deconstruct_condition_function(
+            condition_func_str = functions.deconstruct_condition_function(
                 self.raw_condition_func
             )
             condition_func = {
@@ -38,7 +37,8 @@ async def execute(self):
         if not await super().execute():
             return False
 
-        import util
+        text = functions.replace_wildcards(self.text)
 
-        text = util.functions.replace_wildcards(self.text)
-        icon.notify(text)
+        functions.show_notif(text)
+
+        return True

icon.ico

@@ -4,6 +4,7 @@
 import multiprocessing.popen_spawn_win32 as forking
 import os
 import sys
+import threading
 import time
 
 import win32gui
@@ -62,16 +63,14 @@ async def startup():
     await OnStartupActionSet.execute()
 
 
-def procrastination():
+def procrastination(notif_conn):
+    util.functions.set_notification_pipe(notif_conn)
     while True:
         asyncio.run(OnProcrastinationActionSet.execute())
 
 
-procrastination_proc: multiprocessing.Process | None = None
-
-
 async def watch(break_event):
-    global procrastination_proc
+    procrastination_proc: multiprocessing.Process | None = None
 
     while True:
         if break_event.is_set():
@@ -90,7 +89,9 @@ async def watch(break_event):
                 util.functions.start_timer()
                 util.functions.set_window(window)
                 procrastination_proc = Process(
-                    target=procrastination, name="procrastination"
+                    target=procrastination,
+                    args=(util.notif_send_conn,),
+                    name="procrastination",
                 )
                 procrastination_proc.start()
         else:
@@ -105,7 +106,8 @@ async def watch(break_event):
         time.sleep(1)
 
 
-def run_watchdog(break_event):
+def run_watchdog(break_event, notif_conn):
+    util.functions.set_notification_pipe(notif_conn)
     while True:
         if not break_event.is_set():
             try:
@@ -121,9 +123,18 @@ def run_watchdog(break_event):
 
     asyncio.run(startup())
 
-    watchdog = Process(target=run_watchdog, args=(util.break_event,), name="watchdog")
+    watchdog = Process(
+        target=run_watchdog,
+        args=(util.break_event, util.notif_send_conn),
+        name="watchdog",
+    )
     watchdog.start()
 
+    util.functions.set_notification_pipe(util.notif_send_conn)
+
+    notifs = threading.Thread(target=util.notify_worker, daemon=True, name="notifs")
+    notifs.start()
+
     try:
         util.icon.run()
     finally:

icon.png

@@ -3,6 +3,7 @@
 import os
 import sys
 import threading
+import time
 
 import pystray
 from PIL import Image
@@ -51,9 +52,38 @@ def run_break():
     threading.Thread(target=run_break, daemon=True).start()
 
 
+notif_recv_conn, notif_send_conn = multiprocessing.Pipe()
+
+
+def notify_worker():
+    while True:
+        try:
+            if notif_recv_conn.poll(0.1):
+                notif = notif_recv_conn.recv()
+                print(f"Got notification: {notif}")
+
+                # Try using pystray notification
+                if hasattr(icon, "_thread") and getattr(icon, "visible", False):
+                    try:
+                        print("Trying to notify with pystray...")
+                        icon.notify(notif)
+                        print("Notification sent with pystray")
+                        continue  # Skip to next notification if successful
+                    except Exception as e:
+                        print(f"Pystray notification failed: {e}")
+                else:
+                    print("Icon not ready for notification")
+            else:
+                time.sleep(0.5)
+
+        except Exception as e:
+            print(f"Notification worker error: {e}")
+            time.sleep(1)
+
+
 icon = pystray.Icon(
     "AntiProcrastinator",
-    Image.open(functions.eval_file_path(r"{runtime_dir}\icon2.png")),
+    Image.open(functions.eval_file_path(r"{runtime_dir}\icon.png")),
     title="AntiProcrastinator",
     menu=pystray.Menu(
         pystray.MenuItem(

icon2.png

@@ -250,3 +250,29 @@ def deconstruct_condition_function(condition_func: str) -> tuple[str, bool, list
     if args == [""]:
         args = []
     return function, inverse, args
+
+
+_process_notif_conn = None
+
+
+def set_notification_pipe(conn):
+    """
+    Set the notification pipe connection for this process.
+    """
+    global _process_notif_conn
+    _process_notif_conn = conn
+
+
+def show_notif(notif: str) -> None:
+    """
+    Shows a notification via the tray icon.
+    :param notif: the notification to show.
+    """
+    # Use the process-specific connection if available
+    if _process_notif_conn is not None:
+        try:
+            _process_notif_conn.send(notif)
+            print(f"Process {os.getpid()} sent notification: {notif}")
+            return
+        except Exception as e:
+            print(f"Failed to send notification via process pipe: {e}")