fix(macos): extract active wait logic to helper method to fix review comments

Author: ShresthSamyak

mpv.py

@@ -1045,6 +1045,52 @@ def shutdown_handler(event):
                 pass
         return shutdown_handler.unregister_mpv_events
 
+    def _wait_for_future(self, result, timeout):
+        """Wait for a future to complete. On macOS main thread, this actively pumps the CoreFoundation event loop."""
+        self.check_core_alive()
+        
+        if sys.platform == 'darwin' and threading.current_thread() is threading.main_thread():
+            import time
+            import ctypes
+            import ctypes.util
+
+            global _core_foundation
+            global _cf_runloop_default_mode
+            try:
+                if _core_foundation is None or _cf_runloop_default_mode is None:
+                    _core_foundation = ctypes.cdll.LoadLibrary(ctypes.util.find_library('CoreFoundation'))
+                    
+                    # CFRunLoopRunInMode(CFStringRef mode, CFTimeInterval seconds, Boolean returnAfterSourceHandled)
+                    _core_foundation.CFRunLoopRunInMode.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_bool]
+                    _core_foundation.CFRunLoopRunInMode.restype = ctypes.c_int32
+                
+                    _cf_runloop_default_mode = ctypes.c_void_p.in_dll(_core_foundation, 'kCFRunLoopDefaultMode')
+                
+                start_time = time.monotonic()
+                while not result.done():
+                    remaining = 0
+                    if timeout is not None:
+                        remaining = timeout - (time.monotonic() - start_time)
+                        if remaining <= 0:
+                            break
+                            
+                        # Pump events for up to 0.05 seconds, or remaining timeout if smaller
+                        sleep_time = min(0.05, remaining)
+                    else:
+                        sleep_time = 0.05
+                        
+                    _core_foundation.CFRunLoopRunInMode(_cf_runloop_default_mode, sleep_time, False)
+                    self.check_core_alive()
+            except ShutdownError:
+                raise
+            except Exception as e:
+                # Fallback if CoreFoundation loading fails
+                warn(f"Failed to load CoreFoundation for mpv macOS event loop: {e}", RuntimeWarning)
+                
+            return result.result(0 if timeout is not None else None)
+        else:
+            return result.result(timeout)
+
     @contextmanager
     def prepare_and_wait_for_property(self, name, cond=lambda val: val, level_sensitive=True, timeout=None, catch_errors=True):
         """Context manager that waits until ``cond`` evaluates to a truthy value on the named property. See
@@ -1084,8 +1130,7 @@ def observer(name, val):
                     result.set_result(rv)
                     return
 
-            self.check_core_alive()
-            result.result(timeout)
+            self._wait_for_future(result, timeout)
 
         except InvalidStateError:
             pass
@@ -1144,44 +1189,7 @@ def target_handler(evt):
 
             yield result
 
-            self.check_core_alive()
-            
-            self.check_core_alive()
-            
-            if sys.platform == 'darwin' and threading.current_thread() is threading.main_thread():
-                import time
-                import ctypes
-                import ctypes.util
-
-                global _core_foundation
-                global _cf_runloop_default_mode
-                try:
-                    if _core_foundation is None:
-                        _core_foundation = ctypes.cdll.LoadLibrary(ctypes.util.find_library('CoreFoundation'))
-                        
-                        # CFRunLoopRunInMode(CFStringRef mode, CFTimeInterval seconds, Boolean returnAfterSourceHandled)
-                        _core_foundation.CFRunLoopRunInMode.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_bool]
-                        _core_foundation.CFRunLoopRunInMode.restype = ctypes.c_int32
-                    
-                        _cf_runloop_default_mode = ctypes.c_void_p.in_dll(_core_foundation, 'kCFRunLoopDefaultMode')
-                    
-                    start_time = time.monotonic()
-                    while not result.done():
-                        remaining = 0
-                        if timeout is not None:
-                            remaining = timeout - (time.monotonic() - start_time)
-                            if remaining <= 0:
-                                break
-                            
-                        # Pump events for up to 0.05 seconds, or remaining timeout if smaller
-                        sleep_time = min(0.05, remaining) if timeout is not None else 0.05
-                        _core_foundation.CFRunLoopRunInMode(_cf_runloop_default_mode, sleep_time, False)
-                        self.check_core_alive()
-                except Exception as e:
-                    # Fallback if CoreFoundation loading fails
-                    warn(f"Failed to load CoreFoundation for mpv macOS event loop: {e}", RuntimeWarning)
-                    
-            result.result(timeout)
+            self._wait_for_future(result, timeout)
 
         finally:
             err_unregister()