public/gpupdate
1
0
Fork 1
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-21 18:50:38 +03:00
Code Releases Wiki Activity

Redesigned work logic

Browse Source
This commit is contained in:
Valery Sinelnikov 2022-06-03 16:23:13 +04:00
parent a01d5253dc
commit d76c0a9a00
2 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gpoa/gpt/scriptsini.py
View File

@ -33,6 +33,7 @@ def read_scripts(scripts_file):
scripts_file_dir = os.path.dirname(scripts_file)
actions = config.sections()
for act in actions:
act_upper = act.upper()
if act_upper == 'LOGON':
@ -58,11 +59,20 @@ def read_scripts(scripts_file):
if key_split[0].isdigit():
key_index = int(key_split[0])
section_scripts[key_index].set_args(config[act][key])
if section_scripts:
for i in sorted(section_scripts.keys()):
keys_reverse = sorted(section_scripts.keys(), reverse=True)
section_scripts[i].number = section_scripts[i].number - i + keys_reverse[i]
scripts.add_script(act_upper, section_scripts[i])
if logon_scripts:
for i in sorted(logon_scripts.keys()):
scripts.add_script(act_upper, logon_scripts[i])
if logoff_scripts:
for i in sorted(logoff_scripts.keys()):
scripts.add_script(act_upper, logoff_scripts[i])
if startup_scripts:
for i in sorted(startup_scripts.keys()):
scripts.add_script(act_upper, startup_scripts[i])
if shutdown_scripts:
for i in sorted(shutdown_scripts.keys()):
scripts.add_script(act_upper, shutdown_scripts[i])
return scripts

78
gpoa/scripts_runner
View File

@ -2,7 +2,7 @@
#
# GPOA - GPO Applier for Linux
#
# Copyright (C) 2019-2020 BaseALT Ltd.
# Copyright (C) 2019-2022 BaseALT Ltd.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -30,14 +30,12 @@ class Scripts_runner:
self.dir_scripts_machine = '/var/cache/gpupdate_scripts_cache/machine/'
self.dir_scripts_users = '/var/cache/gpupdate_scripts_cache/users/'
self.user_name = user_name
self.sort_path_scripts = dict()
self.list_with_all_commands = list()
self.stack_dir = list()
stack_dir = None
if work_mode and work_mode.upper() == 'MACHINE':
self.machine_runner_fill()
stack_dir = self.machine_runner_fill()
elif work_mode and work_mode.upper() == 'USER':
self.user_runner_fill()
stack_dir = self.user_runner_fill()
else:
print('Invalid arguments entered')
return
@ -47,70 +45,60 @@ class Scripts_runner:
print('Action needed')
return
self.find_action()
self.sort_path_scripts = sorted(self.sort_path_scripts.items(), reverse = True)
for key in self.sort_path_scripts:
self.list_with_all_commands.append(self.search_scripts_in_dir(key[1]))
for it in range(len(self.list_with_all_commands)):
for it_cmd in self.list_with_all_commands.pop(0):
print(self.run_cmd_subprocess(it_cmd))
self.find_action(stack_dir)
for it_cmd in self.list_with_all_commands:
print(self.run_cmd_subprocess(it_cmd))
def user_runner_fill(self):
if self.dir_scripts_users and self.user_name:
self.get_stack_dir(self.dir_scripts_users + self.user_name, self.stack_dir)
return self.get_stack_dir(self.dir_scripts_users + self.user_name)
def machine_runner_fill(self):
if self.dir_scripts_machine:
self.get_stack_dir(self.dir_scripts_machine, self.stack_dir)
return self.get_stack_dir(self.dir_scripts_machine)
def get_stack_dir(self, path_dir, stack = None):
if stack == True:
stack = list()
def get_stack_dir(self, path_dir):
stack_dir = list()
try:
dir_script = Path(path_dir)
for it_dir in dir_script.iterdir():
stack.append(str(it_dir))
return stack
stack_dir.append(str(it_dir))
return stack_dir
except Exception as exc:
print(exc)
return None
def find_action(self):
self.stack_dir.sort()
while self.stack_dir:
path_turn = self.stack_dir.pop()
key_dict = str(path_turn).split('/')[-1]
list_tmp = self.get_stack_dir(path_turn, True)
for action in list_tmp:
if action.find(self.action) != -1:
self.sort_path_scripts[key_dict] = action
def find_action(self, stack_dir):
if not stack_dir:
return
list_tmp = list()
while stack_dir:
path_turn = stack_dir.pop()
act = str(path_turn).split('/')[-1]
if act.find(self.action) != -1:
list_tmp = self.get_stack_dir(path_turn)
if list_tmp:
self.launch_list(list_tmp)
def search_scripts_in_dir(self, path_to_action):
one_gpt_action_scripts = self.get_stack_dir(path_to_action, True)
return self.launch_list(one_gpt_action_scripts)
def launch_list(self, list_gpt):
list_gpt = sorted(list_gpt)
script_cmd = list()
for file_in_task_dir in list_gpt:
def launch_list(self, list_tmp):
list_tmp = sorted(list_tmp)
for file_in_task_dir in list_tmp:
if file_in_task_dir[-4:].upper() == '.ARG':
try:
arg = self.read_args(file_in_task_dir)
script_cmd[-1] += arg
for it_arg in arg.split():
self.list_with_all_commands[-1].append(it_arg)
except Exception as exc:
print('Argument read for {}: {}'.format(script_cmd.pop(), exc))
print('Argument read for {}: {}'.format(self.list_with_all_commands.pop(), exc))
else:
cmd = list()
cmd.append(file_in_task_dir)
script_cmd.append(cmd)
self.list_with_all_commands.append(cmd)
return script_cmd
def read_args(self, path):
with open(path + '/arg') as f:
args = f.readlines()
return args
return args[0]
def run_cmd_subprocess(self, cmd):
try:
@ -131,4 +119,4 @@ if __name__ == '__main__':
try:
Scripts_runner(args.mode, args.user, args.action)
except Exception as exc:
print(exc)
print(exc)