Skip to content

Commit 061ac8e

Browse files
JE-ChenJE-Chen
committed
Update keyword and dev version
1 parent b6672aa commit 061ac8e

5 files changed

Lines changed: 68 additions & 69 deletions

File tree

‎file_automation/utils/callback/callback_function_executor.py‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ class CallbackFunctionExecutor(object):
2424

2525
def __init__(self):
2626
self.event_dict: dict = {
27-
"copy_file": copy_file,
28-
"rename_file": rename_file,
29-
"remove_file": remove_file,
30-
"copy_all_file_to_dir": copy_all_file_to_dir,
31-
"copy_specify_extension_file": copy_specify_extension_file,
32-
"copy_dir": copy_dir,
33-
"create_dir": create_dir,
34-
"remove_dir_tree": remove_dir_tree,
35-
"zip_dir": zip_dir,
36-
"zip_file": zip_file,
37-
"zip_info": zip_info,
38-
"zip_file_info": zip_file_info,
39-
"set_zip_password": set_zip_password,
40-
"unzip_file": unzip_file,
41-
"read_zip_file": read_zip_file,
42-
"unzip_all": unzip_all,
27+
"FA_copy_file": copy_file,
28+
"FA_rename_file": rename_file,
29+
"FA_remove_file": remove_file,
30+
"FA_copy_all_file_to_dir": copy_all_file_to_dir,
31+
"FA_copy_specify_extension_file": copy_specify_extension_file,
32+
"FA_copy_dir": copy_dir,
33+
"FA_create_dir": create_dir,
34+
"FA_remove_dir_tree": remove_dir_tree,
35+
"FA_zip_dir": zip_dir,
36+
"FA_zip_file": zip_file,
37+
"FA_zip_info": zip_info,
38+
"FA_zip_file_info": zip_file_info,
39+
"FA_set_zip_password": set_zip_password,
40+
"FA_unzip_file": unzip_file,
41+
"FA_read_zip_file": read_zip_file,
42+
"FA_unzip_all": unzip_all,
4343
"driver_instance": driver_instance,
4444
"search_all_file": drive_search_all_file,
4545
"search_field": drive_search_field,
@@ -99,4 +99,3 @@ def callback_function(
9999

100100

101101
callback_executor = CallbackFunctionExecutor()
102-

‎file_automation/utils/executor/action_executor.py‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,54 +33,54 @@ class Executor(object):
3333
def __init__(self):
3434
self.event_dict: dict = {
3535
# File
36-
"create_file": create_file,
37-
"copy_file": copy_file,
38-
"rename_file": rename_file,
39-
"remove_file": remove_file,
36+
"FA_create_file": create_file,
37+
"FA_copy_file": copy_file,
38+
"FA_rename_file": rename_file,
39+
"FA_remove_file": remove_file,
4040
# Dir
41-
"copy_all_file_to_dir": copy_all_file_to_dir,
42-
"copy_specify_extension_file": copy_specify_extension_file,
43-
"copy_dir": copy_dir,
44-
"create_dir": create_dir,
45-
"remove_dir_tree": remove_dir_tree,
41+
"FA_copy_all_file_to_dir": copy_all_file_to_dir,
42+
"FA_copy_specify_extension_file": copy_specify_extension_file,
43+
"FA_copy_dir": copy_dir,
44+
"FA_create_dir": create_dir,
45+
"FA_remove_dir_tree": remove_dir_tree,
4646
# Zip
47-
"zip_dir": zip_dir,
48-
"zip_file": zip_file,
49-
"zip_info": zip_info,
50-
"zip_file_info": zip_file_info,
51-
"set_zip_password": set_zip_password,
52-
"unzip_file": unzip_file,
53-
"read_zip_file": read_zip_file,
54-
"unzip_all": unzip_all,
47+
"FA_zip_dir": zip_dir,
48+
"FA_zip_file": zip_file,
49+
"FA_zip_info": zip_info,
50+
"FA_zip_file_info": zip_file_info,
51+
"FA_set_zip_password": set_zip_password,
52+
"FA_unzip_file": unzip_file,
53+
"FA_read_zip_file": read_zip_file,
54+
"FA_unzip_all": unzip_all,
5555
# Drive
56-
"drive_later_init": driver_instance.later_init,
57-
"drive_search_all_file": drive_search_all_file,
58-
"drive_search_field": drive_search_field,
59-
"drive_search_file_mimetype": drive_search_file_mimetype,
60-
"drive_upload_dir_to_folder": drive_upload_dir_to_folder,
61-
"drive_upload_to_folder": drive_upload_to_folder,
62-
"drive_upload_dir_to_drive": drive_upload_dir_to_drive,
63-
"drive_upload_to_drive": drive_upload_to_drive,
64-
"drive_add_folder": drive_add_folder,
65-
"drive_share_file_to_anyone": drive_share_file_to_anyone,
66-
"drive_share_file_to_domain": drive_share_file_to_domain,
67-
"drive_share_file_to_user": drive_share_file_to_user,
68-
"drive_delete_file": drive_delete_file,
69-
"drive_download_file": drive_download_file,
70-
"drive_download_file_from_folder": drive_download_file_from_folder,
56+
"FA_drive_later_init": driver_instance.later_init,
57+
"FA_drive_search_all_file": drive_search_all_file,
58+
"FA_drive_search_field": drive_search_field,
59+
"FA_drive_search_file_mimetype": drive_search_file_mimetype,
60+
"FA_drive_upload_dir_to_folder": drive_upload_dir_to_folder,
61+
"FA_drive_upload_to_folder": drive_upload_to_folder,
62+
"FA_drive_upload_dir_to_drive": drive_upload_dir_to_drive,
63+
"FA_drive_upload_to_drive": drive_upload_to_drive,
64+
"FA_drive_add_folder": drive_add_folder,
65+
"FA_drive_share_file_to_anyone": drive_share_file_to_anyone,
66+
"FA_drive_share_file_to_domain": drive_share_file_to_domain,
67+
"FA_drive_share_file_to_user": drive_share_file_to_user,
68+
"FA_drive_delete_file": drive_delete_file,
69+
"FA_drive_download_file": drive_download_file,
70+
"FA_drive_download_file_from_folder": drive_download_file_from_folder,
7171
# Execute
72-
"execute_action": self.execute_action,
73-
"execute_files": self.execute_files,
74-
"add_package_to_executor": package_manager.add_package_to_executor,
72+
"FA_execute_action": self.execute_action,
73+
"FA_execute_files": self.execute_files,
74+
"FA_add_package_to_executor": package_manager.add_package_to_executor,
7575
# Scheduler
76-
"scheduler_event_trigger": self.scheduler_event_trigger,
77-
"remove_blocking_scheduler_job": scheduler_manager.remove_blocking_job,
78-
"remove_nonblocking_scheduler_job": scheduler_manager.remove_nonblocking_job,
79-
"start_blocking_scheduler": scheduler_manager.start_block_scheduler,
80-
"start_nonblocking_scheduler": scheduler_manager.start_nonblocking_scheduler,
81-
"start_all_scheduler": scheduler_manager.start_all_scheduler,
82-
"shutdown_blocking_scheduler": scheduler_manager.shutdown_blocking_scheduler,
83-
"shutdown_nonblocking_scheduler": scheduler_manager.shutdown_nonblocking_scheduler,
76+
"FA_scheduler_event_trigger": self.scheduler_event_trigger,
77+
"FA_remove_blocking_scheduler_job": scheduler_manager.remove_blocking_job,
78+
"FA_remove_nonblocking_scheduler_job": scheduler_manager.remove_nonblocking_job,
79+
"FA_start_blocking_scheduler": scheduler_manager.start_block_scheduler,
80+
"FA_start_nonblocking_scheduler": scheduler_manager.start_nonblocking_scheduler,
81+
"FA_start_all_scheduler": scheduler_manager.start_all_scheduler,
82+
"FA_shutdown_blocking_scheduler": scheduler_manager.shutdown_blocking_scheduler,
83+
"FA_shutdown_nonblocking_scheduler": scheduler_manager.shutdown_nonblocking_scheduler,
8484
}
8585
# get all builtin function and add to event dict
8686
for function in getmembers(builtins, isbuiltin):

‎file_automation/utils/project/template/template_keyword.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
template_keyword_1: list = [
2-
["create_dir", {"dir_path": "test_dir"}],
3-
["create_file", {"file_path": "test.txt", "content": "test"}]
2+
["FA_create_dir", {"dir_path": "test_dir"}],
3+
["FA_create_file", {"file_path": "test.txt", "content": "test"}]
44
]
55

66
template_keyword_2: list = [
7-
["remove_file", {"file_path": "text.txt"}],
8-
["remove_dir_tree", {"remove_dir_tree": "test_dir"}]
7+
["FA_remove_file", {"file_path": "text.txt"}],
8+
["FA_remove_dir_tree", {"FA_remove_dir_tree": "test_dir"}]
99
]
1010

1111
bad_template_1 = [
12-
["add_package_to_executor", ["os"]],
12+
["FA_add_package_to_executor", ["os"]],
1313
["os_system", ["python --version"]],
1414
["os_system", ["python -m pip --version"]],
1515
]

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ requires = ["setuptools>=61.0"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "automation_file"
9-
version = "0.0.13"
8+
name = "automation_file_dev"
9+
version = "0.0.16"
1010
authors = [
1111
{ name = "JE-Chen", email = "zenmailman@gmail.com" },
1212
]

dev.toml renamed to stable.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ requires = ["setuptools>=61.0"]
55
build-backend = "setuptools.build_meta"
66

77
[project]
8-
name = "automation_file_dev"
9-
version = "0.0.15"
8+
name = "automation_file"
9+
version = "0.0.13"
1010
authors = [
1111
{ name = "JE-Chen", email = "zenmailman@gmail.com" },
1212
]

0 commit comments

Comments
 (0)