Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #118

Merged
merged 3 commits into from
Jul 17, 2023
Merged

Dev #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc93e93
Update keyword and dev version
JE-Chen Jul 17, 2023
4b50766
Update dev version
JE-Chen Jul 17, 2023
7860272
Update stable version
JE-Chen Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "je_auto_control_dev"
version = "0.0.91"
version = "0.0.93"
authors = [
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
]
Expand Down
4 changes: 2 additions & 2 deletions je_auto_control/linux_with_x11/record/x11_linux_record.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

from queue import Queue

type_dict = {5: "mouse", 3: "type_keyboard"}
detail_dict = {1: "mouse_left", 2: "mouse_middle", 3: "mouse_right"}
type_dict = {5: "mouse", 3: "AC_type_keyboard"}
detail_dict = {1: "AC_mouse_left", 2: "AC_mouse_middle", 3: "AC_mouse_right"}


class X11LinuxRecorder(object):
Expand Down
6 changes: 3 additions & 3 deletions je_auto_control/osx/listener/osx_listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ def applicationDidFinishLaunching_(self, aNotification):

def mouse_left_handler(event) -> None:
loc = NSEvent.mouseLocation()
record_queue.put(("mouse_left", loc.x, loc.y))
record_queue.put(("AC_mouse_left", loc.x, loc.y))


def mouse_right_handler(event) -> None:
loc = NSEvent.mouseLocation()
record_queue.put(("mouse_right", loc.x, loc.y))
record_queue.put(("AC_mouse_right", loc.x, loc.y))


def keyboard_handler(event) -> None:
if int(event.keyCode()) == 98:
pass
else:
record_queue.put(("type_keyboard", int(hex(event.keyCode()), 16)))
record_queue.put(("AC_type_keyboard", int(hex(event.keyCode()), 16)))
print(event)


Expand Down
78 changes: 39 additions & 39 deletions je_auto_control/utils/callback/callback_function_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,62 +61,62 @@ class CallbackFunctionExecutor(object):
def __init__(self):
self.event_dict: dict = {
# mouse
"mouse_left": click_mouse,
"mouse_right": click_mouse,
"mouse_middle": click_mouse,
"click_mouse": click_mouse,
"get_mouse_table": get_mouse_table,
"get_mouse_position": get_mouse_position,
"press_mouse": press_mouse,
"release_mouse": release_mouse,
"mouse_scroll": mouse_scroll,
"set_mouse_position": set_mouse_position,
"get_special_table": get_special_table,
"AC_mouse_left": click_mouse,
"AC_mouse_right": click_mouse,
"AC_mouse_middle": click_mouse,
"AC_click_mouse": click_mouse,
"AC_get_mouse_table": get_mouse_table,
"AC_get_mouse_position": get_mouse_position,
"AC_press_mouse": press_mouse,
"AC_release_mouse": release_mouse,
"AC_mouse_scroll": mouse_scroll,
"AC_set_mouse_position": set_mouse_position,
"AC_get_special_table": get_special_table,
# keyboard
"get_keyboard_keys_table": get_keyboard_keys_table,
"type_keyboard": type_keyboard,
"press_keyboard_key": press_keyboard_key,
"release_keyboard_key": release_keyboard_key,
"check_key_is_press": check_key_is_press,
"write": write,
"hotkey": hotkey,
"AC_get_keyboard_keys_table": get_keyboard_keys_table,
"AC_type_keyboard": type_keyboard,
"AC_press_keyboard_key": press_keyboard_key,
"AC_release_keyboard_key": release_keyboard_key,
"AC_check_key_is_press": check_key_is_press,
"AC_write": write,
"AC_hotkey": hotkey,
# image
"locate_all_image": locate_all_image,
"locate_image_center": locate_image_center,
"locate_and_click": locate_and_click,
"AC_locate_all_image": locate_all_image,
"AC_locate_image_center": locate_image_center,
"AC_locate_and_click": locate_and_click,
# screen
"screen_size": screen_size,
"screenshot": screenshot,
"AC_screen_size": screen_size,
"AC_screenshot": screenshot,
# test record
"set_record_enable": test_record_instance.set_record_enable,
"AC_set_record_enable": test_record_instance.set_record_enable,
# only generate
"generate_html": generate_html,
"generate_json": generate_json,
"generate_xml": generate_xml,
"AC_generate_html": generate_html,
"AC_generate_json": generate_json,
"AC_generate_xml": generate_xml,
# generate report
"generate_html_report": generate_html_report,
"generate_json_report": generate_json_report,
"generate_xml_report": generate_xml_report,
"AC_generate_html_report": generate_html_report,
"AC_generate_json_report": generate_json_report,
"AC_generate_xml_report": generate_xml_report,
# record
"record": record,
"stop_record": stop_record,
"AC_record": record,
"AC_stop_record": stop_record,
# execute
"execute_action": execute_action,
"execute_files": execute_files,
"AC_execute_action": execute_action,
"AC_execute_files": execute_files,
"create_template_dir": create_project_dir,
"get_dir_files_as_list": get_dir_files_as_list,
"pil_screenshot": pil_screenshot,
"read_action_json": read_action_json,
"write_action_json": write_action_json,
"start_autocontrol_socket_server": start_autocontrol_socket_server,
"add_package_to_executor": package_manager.add_package_to_executor,
"add_package_to_callback_executor": package_manager.add_package_to_callback_executor,
"AC_add_package_to_executor": package_manager.add_package_to_executor,
"AC_add_package_to_callback_executor": package_manager.add_package_to_callback_executor,
# project
"create_project": create_project_dir,
"AC_create_project": create_project_dir,
# Shell
"shell_command": ShellManager().exec_shell,
"AC_shell_command": ShellManager().exec_shell,
# Another process
"execute_process": start_exe,
"AC_execute_process": start_exe,
}

def callback_function(
Expand Down
Loading