Skip to content

Commit 98803e6

Browse files
committed
Update dev version
Update dev version * Remove APScheduler
1 parent 8ba745d commit 98803e6

File tree

10 files changed

+72
-304
lines changed

10 files changed

+72
-304
lines changed

.idea/workspace.xml

Lines changed: 54 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ build
44
twine
55
sphinx
66
sphinx-rtd-theme
7-
Pyside6==6.8.1
7+
Pyside6==6.8.2.1
88
qt-material
99
mss

je_auto_control/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060
package_manager
6161
from je_auto_control.utils.project.create_project_structure import \
6262
create_project_dir
63-
# Scheduler
64-
from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
6563
# Shell command
6664
from je_auto_control.utils.shell_process.shell_exec import ShellManager
6765
from je_auto_control.utils.shell_process.shell_exec import default_shell_manager
@@ -104,6 +102,8 @@
104102
# import screen
105103
from je_auto_control.wrapper.auto_control_screen import screen_size
106104
from je_auto_control.wrapper.auto_control_screen import screenshot
105+
# Recording
106+
from je_auto_control.utils.cv2_utils.video_recording import RecordingThread
107107

108108
__all__ = [
109109
"click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
@@ -120,5 +120,5 @@
120120
"generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
121121
"generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
122122
"callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
123-
"SchedulerManager"
123+
"RecordingThread"
124124
]

je_auto_control/utils/downloading/__init__.py

Whitespace-only changes.

je_auto_control/utils/downloading/file_download.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

je_auto_control/utils/executor/action_executor.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
1919
from je_auto_control.utils.package_manager.package_manager_class import package_manager
2020
from je_auto_control.utils.project.create_project_structure import create_project_dir
21-
from je_auto_control.utils.scheduler.extend_apscheduler import scheduler_manager
2221
from je_auto_control.utils.shell_process.shell_exec import ShellManager
2322
from je_auto_control.utils.start_exe.start_another_process import start_exe
2423
from je_auto_control.utils.test_record.record_test_class import record_action_to_list, test_record_instance
@@ -90,15 +89,6 @@ def __init__(self):
9089
"AC_shell_command": ShellManager().exec_shell,
9190
# Another process
9291
"AC_execute_process": start_exe,
93-
# Scheduler
94-
"AC_scheduler_event_trigger": self.scheduler_event_trigger,
95-
"AC_remove_blocking_scheduler_job": scheduler_manager.remove_blocking_job,
96-
"AC_remove_nonblocking_scheduler_job": scheduler_manager.remove_nonblocking_job,
97-
"AC_start_blocking_scheduler": scheduler_manager.start_block_scheduler,
98-
"AC_start_nonblocking_scheduler": scheduler_manager.start_nonblocking_scheduler,
99-
"AC_start_all_scheduler": scheduler_manager.start_all_scheduler,
100-
"AC_shutdown_blocking_scheduler": scheduler_manager.shutdown_blocking_scheduler,
101-
"AC_shutdown_nonblocking_scheduler": scheduler_manager.shutdown_nonblocking_scheduler,
10292
}
10393
# get all builtin function and add to event dict
10494
for function in getmembers(builtins, isbuiltin):
@@ -164,15 +154,6 @@ def execute_files(self, execute_files_list: list) -> List[Dict[str, str]]:
164154
execute_detail_list.append(self.execute_action(read_action_json(file)))
165155
return execute_detail_list
166156

167-
def scheduler_event_trigger(
168-
self, function: str, scheduler_id: str = None, args: Union[list, tuple] = None,
169-
kwargs: dict = None, scheduler_type: str = "nonblocking", wait_type: str = "secondly",
170-
wait_value: int = 1, **trigger_args: Any) -> None:
171-
if scheduler_type == "nonblocking":
172-
scheduler_event = scheduler_manager.nonblocking_scheduler_event_dict.get(wait_type)
173-
else:
174-
scheduler_event = scheduler_manager.blocking_scheduler_event_dict.get(wait_type)
175-
scheduler_event(self.event_dict.get(function), scheduler_id, args, kwargs, wait_value, **trigger_args)
176157

177158

178159
executor = Executor()

je_auto_control/utils/scheduler/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)