YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] pep8 on hooks.py

Browse source
This commit is contained in:
Laurent Peuch 2017-08-20 21:19:04 +02:00
parent 40ea2f9477
commit 83971afb9c
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/yunohost/hook.py
View file

@ -50,14 +50,16 @@ def hook_add(app, file):
path, filename = os.path.split(file) path, filename = os.path.split(file)
priority, action = _extract_filename_parts(filename) priority, action = _extract_filename_parts(filename)
try: os.listdir(CUSTOM_HOOK_FOLDER + action) try:
except OSError: os.makedirs(CUSTOM_HOOK_FOLDER + action) os.listdir(CUSTOM_HOOK_FOLDER + action)
except OSError:
os.makedirs(CUSTOM_HOOK_FOLDER + action)
finalpath = CUSTOM_HOOK_FOLDER + action +'/'+ priority +'-'+ app finalpath = CUSTOM_HOOK_FOLDER + action + '/' + priority + '-' + app
os.system('cp %s %s' % (file, finalpath)) os.system('cp %s %s' % (file, finalpath))
os.system('chown -hR admin: %s' % HOOK_FOLDER) os.system('chown -hR admin: %s' % HOOK_FOLDER)
return { 'hook': finalpath } return {'hook': finalpath}
def hook_remove(app): def hook_remove(app):
@ -72,8 +74,9 @@ def hook_remove(app):
for action in os.listdir(CUSTOM_HOOK_FOLDER): for action in os.listdir(CUSTOM_HOOK_FOLDER):
for script in os.listdir(CUSTOM_HOOK_FOLDER + action): for script in os.listdir(CUSTOM_HOOK_FOLDER + action):
if script.endswith(app): if script.endswith(app):
os.remove(CUSTOM_HOOK_FOLDER + action +'/'+ script) os.remove(CUSTOM_HOOK_FOLDER + action + '/' + script)
except OSError: pass except OSError:
pass
def hook_info(action, name): def hook_info(action, name):
@ -134,11 +137,11 @@ def hook_list(action, list_by='name', show_info=False):
def _append_hook(d, priority, name, path): def _append_hook(d, priority, name, path):
# Use the priority as key and a dict of hooks names # Use the priority as key and a dict of hooks names
# with their info as value # with their info as value
value = { 'path': path } value = {'path': path}
try: try:
d[priority][name] = value d[priority][name] = value
except KeyError: except KeyError:
d[priority] = { name: value } d[priority] = {name: value}
else: else:
def _append_hook(d, priority, name, path): def _append_hook(d, priority, name, path):
# Use the priority as key and the name as value # Use the priority as key and the name as value
@ -160,11 +163,12 @@ def hook_list(action, list_by='name', show_info=False):
if h['path'] != path: if h['path'] != path:
h['path'] = path h['path'] = path
return return
l.append({ 'priority': priority, 'path': path }) l.append({'priority': priority, 'path': path})
d[name] = l d[name] = l
else: else:
if list_by == 'name': if list_by == 'name':
result = set() result = set()
def _append_hook(d, priority, name, path): def _append_hook(d, priority, name, path):
# Add only the name # Add only the name
d.add(name) d.add(name)
@ -202,7 +206,7 @@ def hook_list(action, list_by='name', show_info=False):
logger.debug("custom hook folder not found for action '%s' in %s", logger.debug("custom hook folder not found for action '%s' in %s",
action, CUSTOM_HOOK_FOLDER) action, CUSTOM_HOOK_FOLDER)
return { 'hooks': result } return {'hooks': result}
def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None, def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
@ -224,7 +228,7 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
(name, priority, path, succeed) as arguments (name, priority, path, succeed) as arguments
""" """
result = { 'succeed': {}, 'failed': {} } result = {'succeed': {}, 'failed': {}}
hooks_dict = {} hooks_dict = {}
# Retrieve hooks # Retrieve hooks
@ -242,7 +246,7 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
for n in hooks: for n in hooks:
for key in hooks_names.keys(): for key in hooks_names.keys():
if key == n or key.startswith("%s_" % n) \ if key == n or key.startswith("%s_" % n) \
and key not in all_hooks: and key not in all_hooks:
all_hooks.append(key) all_hooks.append(key)
# Iterate over given hooks names list # Iterate over given hooks names list
@ -256,7 +260,7 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None,
for h in hl: for h in hl:
# Update hooks dict # Update hooks dict
d = hooks_dict.get(h['priority'], dict()) d = hooks_dict.get(h['priority'], dict())
d.update({ n: { 'path': h['path'] }}) d.update({n: {'path': h['path']}})
hooks_dict[h['priority']] = d hooks_dict[h['priority']] = d
if not hooks_dict: if not hooks_dict:
return result return result
@ -346,7 +350,7 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
# prepend environment variables # prepend environment variables
cmd = '{0} {1}'.format( cmd = '{0} {1}'.format(
' '.join(['{0}={1}'.format(k, shell_quote(v)) \ ' '.join(['{0}={1}'.format(k, shell_quote(v))
for k, v in env.items()]), cmd) for k, v in env.items()]), cmd)
command.append(cmd.format(script=cmd_script, args=cmd_args)) command.append(cmd.format(script=cmd_script, args=cmd_args))
@ -392,6 +396,7 @@ def _extract_filename_parts(filename):
_find_unsafe = re.compile(r'[^\w@%+=:,./-]', re.UNICODE).search _find_unsafe = re.compile(r'[^\w@%+=:,./-]', re.UNICODE).search
def shell_quote(s): def shell_quote(s):
"""Return a shell-escaped version of the string *s*.""" """Return a shell-escaped version of the string *s*."""
s = str(s) s = str(s)