Skip to content

Commit 7e9cce1

Browse files
committed
Update dev version
Update dev version * Add package manager
1 parent 12b1ed2 commit 7e9cce1

File tree

9 files changed

+74
-31
lines changed

9 files changed

+74
-31
lines changed

.idea/Python_JEAutoControl.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

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

je_auto_control/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
7272
# callback
7373
from je_auto_control.utils.callback.callback_function_executor import callback_executor
74+
# package manager
75+
from je_auto_control.utils.package_manager.package_manager_class import package_manager
7476

7577
__all__ = [
7678
"click_mouse", "mouse_table", "position", "press_mouse", "release_mouse",
@@ -95,5 +97,5 @@
9597
"generate_json", "generate_json_report",
9698
"generate_xml", "generate_xml_report",
9799
"get_dir_files_as_list", "create_template_dir", "start_autocontrol_socket_server",
98-
"callback_executor"
100+
"callback_executor", "package_manager"
99101
]

je_auto_control/utils/executor/action_executor.py

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

6+
from je_auto_control.utils.package_manager.package_manager_class import package_manager
67
from je_auto_control.utils.exception.exception_tags import action_is_null_error, add_command_exception_tag, \
78
executor_list_error
89
from je_auto_control.utils.exception.exception_tags import cant_execute_action_error
@@ -74,6 +75,7 @@ def __init__(self):
7475
# execute
7576
"execute_action": self.execute_action,
7677
"execute_files": self.execute_files,
78+
"add_package_to_executor": package_manager.add_package_to_executor,
7779
}
7880
# get all time module builtin function and add to event dict
7981
for function in getmembers(time, isbuiltin):

je_auto_control/utils/package_manager/__init__.py

Whitespace-only changes.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
from importlib import import_module
2+
from importlib.util import find_spec
3+
from inspect import getmembers, isfunction
4+
from sys import stderr
5+
6+
from je_auto_control.utils.executor.action_executor import executor
7+
8+
9+
class PackageManager(object):
10+
11+
def __init__(self):
12+
self.installed_package_dict = {
13+
}
14+
15+
def check_package(self, package: str):
16+
if self.installed_package_dict.get(package, None) is None:
17+
found_spec = find_spec(package)
18+
if found_spec is not None:
19+
try:
20+
installed_package = import_module(found_spec.name)
21+
self.installed_package_dict.update({found_spec.name: installed_package})
22+
except ModuleNotFoundError as error:
23+
print(repr(error), file=stderr)
24+
return self.installed_package_dict.get(package, None)
25+
26+
def add_package_to_executor(self, package):
27+
installed_package = self.check_package(package)
28+
if installed_package is not None:
29+
for function in getmembers(installed_package, isfunction):
30+
executor.event_dict.update({str(function): function})
31+
else:
32+
print(repr(ModuleNotFoundError(f"Can't find {package}")), file=stderr)
33+
34+
35+
package_manager = PackageManager()

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build stable version
2-
# This is stable version
1+
# Rename to build dev version
2+
# This is dev version
33
[build-system]
4-
requires = ["setuptools>=61.0"]
4+
requires = ["setuptools"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control"
9-
version = "0.0.125"
8+
name = "je_auto_control_dev"
9+
version = "0.0.60"
1010
authors = [
1111
{ name = "JE-Chen", email = "zenmailman@gmail.com" },
1212
]

dev.toml renamed to stable.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Rename to build dev version
2-
# This is dev version
1+
# Rename to build stable version
2+
# This is stable version
33
[build-system]
4-
requires = ["setuptools"]
4+
requires = ["setuptools>=61.0"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "je_auto_control_dev"
9-
version = "0.0.59"
8+
name = "je_auto_control"
9+
version = "0.0.125"
1010
authors = [
1111
{ name = "JE-Chen", email = "zenmailman@gmail.com" },
1212
]

0 commit comments

Comments
 (0)