zhmiscellany 6.2.9__py3-none-any.whl → 6.3.0__py3-none-any.whl

zhmiscellany/macro.py

@@ -367,26 +367,35 @@ def get_mouse_buttons():
         bool(GetAsyncKeyState(VK_MBUTTON) & 0x8000)
     ]
 
-def better_wait_for(key):
+
+def better_wait_for(key, wait_for_release=False):
     import threading
     import keyboard
     import time
-    
+
     key_name = key.lower()
-    press_event = threading.Event() # Event to signal when the key is pressed
-    _last_press_time_map.setdefault(key_name, 0) # Initialize last press time for this key
+    event_signal = threading.Event()  # Event to signal when the key event occurs
+    _last_press_time_map.setdefault(key_name, 0)  # Initialize last press time for this key
 
     def _on_key_event(e):
-        if e.name == key_name and e.event_type == keyboard.KEY_DOWN:
-            current_time = time.time()
-            _last_press_time_map[key_name] = current_time # Update last press time
-            press_event.set() # Signal that the key was pressed
+        if e.name == key_name:
+            if wait_for_release and e.event_type == keyboard.KEY_UP:
+                event_signal.set()  # Signal that the key was released
+            elif not wait_for_release and e.event_type == keyboard.KEY_DOWN:
+                current_time = time.time()
+                _last_press_time_map[key_name] = current_time  # Update last press time
+                event_signal.set()  # Signal that the key was pressed
+
+    # Register the appropriate listener based on wait_for_release
+    if wait_for_release:
+        hook_id = keyboard.on_release(_on_key_event)
+    else:
+        hook_id = keyboard.on_press(_on_key_event)
 
-    hook_id = keyboard.on_press(_on_key_event) # Register the raw key press listener
-    press_event.wait() # Block execution until the press_event is set
-    keyboard.unhook(hook_id) # Clean up the listener after key is detected
+    event_signal.wait()  # Block execution until the event is set
+    keyboard.unhook(hook_id)  # Clean up the listener after key is detected
 
-def toggle_function(func, key='f8', blocking=True):
+def toggle_function(func, key='f8', blocking=True, hold=False):
     import kthread
     import threading
     # better_wait_for is in the same module, no import needed

{zhmiscellany-6.2.9.dist-info → zhmiscellany-6.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 6.2.9
+Version: 6.3.0
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh

{zhmiscellany-6.2.9.dist-info → zhmiscellany-6.3.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ zhmiscellany/fileio.py,sha256=-W1A_sEymfaqxhiEY-y6h_owBlAyVWNm4PSFn7LVoBI,21991
 zhmiscellany/gui.py,sha256=OVwuZ_kWHJlgKPeYR7fAAyomNmU-OnxOgXZelVNPm1w,10409
 zhmiscellany/image.py,sha256=6Hz5sfym_o7FHokGUKeXRsjl89VY_ZMSLnvuSam1icI,8265
 zhmiscellany/list.py,sha256=BnbYG-lpHmi0C4v8jLfaeXqQdc3opmNgkvY6yz4pasg,1475
-zhmiscellany/macro.py,sha256=4uxU1OrOiHV_CkYBPV1tugciFqb4cPOQQIOu_PMpXCY,27904
+zhmiscellany/macro.py,sha256=7qUZ7LFzWl8gD2K-uAxf3l3Qc2Wskezo7XAKKoqdowA,28263
 zhmiscellany/math.py,sha256=nNsrg4le3XIt1y36lQv5xNCjUoIu7Q1lV5BdpmyD_wk,2530
 zhmiscellany/misc.py,sha256=0vJFa0MRdKXjLLVeFfMx1Q-b-qrKqpdaq6FzWKz6SMY,32489
 zhmiscellany/netio.py,sha256=rN17uIbsWqDG9ssmouD7VZqOtlgWObaCsvn2Hrq-k6w,2413
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=RlHxsW_M_R6UJUIDgYVS_zfqUwO8kXG8j-0YG5qByjo,4637
 zhmiscellany/processing.py,sha256=S0Rb6ndTC6N23-kz4hLEeRNgAaWjcMAtt8QNDE8x4v4,11350
 zhmiscellany/rust.py,sha256=cHkSpdtq7QQW3yzBEAYL9lZxLW0h4wal2tsxIOnyTrA,494
 zhmiscellany/string.py,sha256=A4ilBWSYlrJ0AJ0axvepSSjYCYwYk5X-vRrHNphi_ow,4809
-zhmiscellany-6.2.9.dist-info/METADATA,sha256=92jIwQqgCsL9ZfTi7pPeFNrFYPAIYpjb_K6lNJ6ZlEM,43872
-zhmiscellany-6.2.9.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-zhmiscellany-6.2.9.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-6.2.9.dist-info/RECORD,,
+zhmiscellany-6.3.0.dist-info/METADATA,sha256=wfTYRCFcsryY7Lsh7KyLlieRexUdE5d_aAobSlCLmLM,43872
+zhmiscellany-6.3.0.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+zhmiscellany-6.3.0.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-6.3.0.dist-info/RECORD,,