Skip to content

Commit aadfe7a

Browse files
committed
add fixed executor
1 parent 7e9cce1 commit aadfe7a

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

.idea/workspace.xml

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

je_auto_control/utils/executor/action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import types
44
from inspect import getmembers, isbuiltin
55

6-
from je_auto_control.utils.package_manager.package_manager_class import package_manager
76
from je_auto_control.utils.exception.exception_tags import action_is_null_error, add_command_exception_tag, \
87
executor_list_error
98
from je_auto_control.utils.exception.exception_tags import cant_execute_action_error
@@ -16,6 +15,7 @@
1615
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml
1716
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
1817
from je_auto_control.utils.json.json_file import read_action_json
18+
from je_auto_control.utils.package_manager.package_manager_class import package_manager
1919
from je_auto_control.utils.test_record.record_test_class import record_action_to_list, test_record_instance
2020
from je_auto_control.wrapper.auto_control_image import locate_all_image, locate_and_click, locate_image_center
2121
from je_auto_control.wrapper.auto_control_keyboard import check_key_is_press
@@ -137,6 +137,7 @@ def execute_files(self, execute_files_list: list) -> list:
137137

138138

139139
executor = Executor()
140+
package_manager.executor = executor
140141

141142

142143
def add_command_to_executor(command_dict: dict):

je_auto_control/utils/package_manager/package_manager_class.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
from inspect import getmembers, isfunction
44
from sys import stderr
55

6-
from je_auto_control.utils.executor.action_executor import executor
7-
8-
96
class PackageManager(object):
107

118
def __init__(self):
129
self.installed_package_dict = {
1310
}
11+
self.executor = None
1412

1513
def check_package(self, package: str):
1614
if self.installed_package_dict.get(package, None) is None:
@@ -25,11 +23,13 @@ def check_package(self, package: str):
2523

2624
def add_package_to_executor(self, package):
2725
installed_package = self.check_package(package)
28-
if installed_package is not None:
26+
if installed_package is not None and self.executor is not None:
2927
for function in getmembers(installed_package, isfunction):
30-
executor.event_dict.update({str(function): function})
28+
self.executor.event_dict.update({str(function): function})
29+
elif installed_package is None:
30+
print(repr(ModuleNotFoundError(f"Can't find package {package}")), file=stderr)
3131
else:
32-
print(repr(ModuleNotFoundError(f"Can't find {package}")), file=stderr)
32+
print(f"Executor error {self.executor}", file=stderr)
3333

3434

3535
package_manager = PackageManager()

0 commit comments

Comments
 (0)