zhmiscellany 5.8.2__py3-none-any.whl → 5.8.4__py3-none-any.whl

zhmiscellany/macro.py

@@ -401,11 +401,10 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
         # If it's some other type of key object (less common)
         return str(key)
 
-    def generate_code():
+    def generate_code(events, start_time):
         """
         Generates the Python script from the recorded events and copies it to the clipboard.
         """
-        global events, start_time
 
         if not events:
             print("No actions were recorded.")
@@ -437,8 +436,12 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
         ]
 
         last_time = start_time
-        for event in events:
+        for i, event in enumerate(events):
             current_time = event['time']
+            try:
+                next_event = events[i+1]
+            except:
+                next_event = None
             delay = current_time - last_time
 
             action = event['action']
@@ -466,6 +469,9 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
                     if key in action_str:
                         action_str = value
                         break
+                
+                if next_event and next_event['action'] == 'click' and (next_event['x'], next_event['y']) == (x, y):
+                    action_str = ''
 
                 code_lines.append(f"m(({x}, {y}), {button_str}{action_str}click_duration=click_down_time, click_end_duration=click_release_time, pre_click_wiggle=pre_click_wiggle, animation_time=animation_time)")
 
@@ -566,7 +572,7 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
     mouse_listener.stop()
 
     # Generate the replay script
-    return generate_code()
+    return generate_code(events, start_time)
 
 
 KEY_CODES = {

{zhmiscellany-5.8.2.dist-info → zhmiscellany-5.8.4.dist-info}/METADATA

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

{zhmiscellany-5.8.2.dist-info → zhmiscellany-5.8.4.dist-info}/RECORD

@@ -12,7 +12,7 @@ zhmiscellany/fileio.py,sha256=KmRnWWZJWBc5Or3_mKcRY2ehE_Fuk870iS-imtyERyg,18169
 zhmiscellany/gui.py,sha256=VgT5j5UIr-wWyL2P1qCHSNL7RrvZWDlm0TX00JGWmKo,7404
 zhmiscellany/image.py,sha256=qUjxiYpc2VVZp2vwr1vN36O2PVQ7YlMKzhegQ1u4c0M,8198
 zhmiscellany/list.py,sha256=S8Z85bLJEP9lk2JkGpzUcG6kpRB7a-NWDIHMPiF5bKo,1473
-zhmiscellany/macro.py,sha256=8Fwp0--03L6MMtgUYTGySTEwlw-DlJo00gKoWIXdREo,24764
+zhmiscellany/macro.py,sha256=2eJQ-pHzWepU6ISPd73BPlpKsGCbXA3_YmKhtatGiDM,25067
 zhmiscellany/math.py,sha256=btOQTe_GvqP0A7Zz84tmN_c8j1NGe_mKnhmAt40lhLU,2482
 zhmiscellany/misc.py,sha256=BsTbRWlXI5LZBG7Bl2MgLzHESyCMJnr_KNZAf2wY_H4,29689
 zhmiscellany/netio.py,sha256=GTamo5cJn4P6u8V_kgZ9kL8qeMUE7OQAmYkmj9Sp_GA,2236
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=PxO4aykFzC60xbTQuc66KzZYIxiW0KPebXZbncD2HcU,3795
 zhmiscellany/processing.py,sha256=srwlV8FZ--svF5e6rZZxhIs_6ZjOAwq2OcQEf6T2Le8,10410
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-5.8.2.dist-info/METADATA,sha256=qCEULsjGKmFPsHfnyve1eay_nnitpjk7DFxOwZEg2yQ,42153
-zhmiscellany-5.8.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-5.8.2.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-5.8.2.dist-info/RECORD,,
+zhmiscellany-5.8.4.dist-info/METADATA,sha256=jw6GB_T-q2shmVwmfHZu7Q7IYRfOT7iawiKCs93A28w,42153
+zhmiscellany-5.8.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zhmiscellany-5.8.4.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-5.8.4.dist-info/RECORD,,