zhmiscellany 5.9.0__py3-none-any.whl → 5.9.2__py3-none-any.whl

zhmiscellany/macro.py

@@ -258,7 +258,7 @@ def type_string(text=None, delay=None, key_hold_time=None, vk_codes=None, combin
                 press_key(vk_code, False, act_start=False, act_end=True, key_hold_time=key_hold_time)
 
 
-def scroll(amount, delay=None):
+def scroll(amount, delay=None, post_scroll_delay=None):
     def raw_scroll(amount):
         # Constants for mouse input
         INPUT_MOUSE = 0
@@ -305,6 +305,8 @@ def scroll(amount, delay=None):
         for _ in range(amount):
             raw_scroll(direction)
             zhmiscellany.misc.high_precision_sleep(delay/amount)
+    if post_scroll_delay:
+        zhmiscellany.misc.high_precision_sleep(post_scroll_delay)
 
 
 def get_mouse_buttons():
@@ -425,6 +427,7 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
             "mouse_move_dly = 1/60",
             "key_down_time = 1/30",
             "scroll_dly = 1/30",
+            "post_scroll_dly = 1/10",
             "",
             "pre_click_wiggle = True",
             "",
@@ -436,10 +439,10 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
         ]
 
         last_time = start_time
-        skip_next = False
+        skip_next = 0
         for i, event in enumerate(events):
             if skip_next:
-                skip_next = False
+                skip_next -= 1
                 continue
             current_time = event['time']
             try:
@@ -476,7 +479,7 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
 
                 if next_event and next_event['action'] == 'click' and (next_event['x'], next_event['y']) == (x, y):
                     action_str = ''
-                    skip_next = True
+                    skip_next = 1
 
                 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)")
 
@@ -485,8 +488,22 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
                 code_lines.append(f"m(({x}, {y}), click_end_duration=mouse_move_dly)")
 
             elif action == 'scroll':
-                dx, dy = event['dx'], event['dy']
-                code_lines.append(f"s({dy}, scroll_dly)")
+                x, y, dx, dy = event['x'], event['y'], event['dx'], event['dy']
+                j = i
+                count = 0
+                while True:
+                    count += 1
+                    j += 1
+                    try:
+                        t_event = events[j]
+                    except:
+                        t_event = None
+                    if t_event and t_event['action'] == 'scroll' and t_event['dy'] == dy and (t_event['x'], t_event['y']) == (x, y):
+                        skip_next += 1
+                    else:
+                        break
+                code_lines.append(f"m(({x}, {y}), click_end_duration=mouse_move_dly)")
+                code_lines.append(f"s({dy*count}, scroll_dly, post_scroll_dly)")
 
             elif action in ('key_press', 'key_release'):
                 key = event['key']
@@ -549,8 +566,7 @@ def record_actions_to_code(RECORD_MOUSE_MOVEMENT=False, STOP_KEY='f9'):
         events.append({'action': 'click', 'x': x, 'y': y, 'button': button, 'pressed': pressed, 'time': time.time()})
 
     def on_scroll(x, y, dx, dy):
-        # pynput scroll listener reports the mouse position at time of scroll, which we don't need for replay
-        events.append({'action': 'scroll', 'dx': dx, 'dy': dy, 'time': time.time()})
+        events.append({'action': 'scroll', 'x': x, 'y': y, 'dx': dx, 'dy': dy, 'time': time.time()})
 
     def on_press(key):
         events.append({'action': 'key_press', 'key': key, 'time': time.time()})

{zhmiscellany-5.9.0.dist-info → zhmiscellany-5.9.2.dist-info}/METADATA

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

{zhmiscellany-5.9.0.dist-info → zhmiscellany-5.9.2.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=wFJ_vr_fyO89Za7r4-yhFbfzwF9lJmXCwpZ0rUFwd2Y,25292
+zhmiscellany/macro.py,sha256=IHkIDUgRqciD9-p9vF0j_Qfzir0mIIueax8MwQIZmOY,25996
 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.9.0.dist-info/METADATA,sha256=OUhSHqhda-rSgLQk3SdBge-BwJ33E9wto2U-grM0ucA,42153
-zhmiscellany-5.9.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-5.9.0.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-5.9.0.dist-info/RECORD,,
+zhmiscellany-5.9.2.dist-info/METADATA,sha256=L9yJYmR9aLlil_sbCyAfXXOWqsM96VMG6NcA74o_ktg,42153
+zhmiscellany-5.9.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zhmiscellany-5.9.2.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-5.9.2.dist-info/RECORD,,