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

Fix win message issue

Browse source
This commit is contained in:
Kload 2013-09-23 16:35:17 +00:00
parent 5c7f66eb3c
commit 2ad1a32419
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
yunohost
View file

@ -38,7 +38,7 @@ if not __debug__:
gettext.install('YunoHost') gettext.install('YunoHost')
try: try:
from yunohost import YunoHostError, YunoHostLDAP, str_to_func, colorize, pretty_print_dict, display_error, validate, win, parse_dict from yunohost import YunoHostError, YunoHostLDAP, str_to_func, colorize, pretty_print_dict, display_error, validate, win, reset_win_messages, parse_dict
except ImportError: except ImportError:
sys.stderr.write('Error: Yunohost CLI Require YunoHost lib\n') sys.stderr.write('Error: Yunohost CLI Require YunoHost lib\n')
sys.exit(1) sys.exit(1)
@ -55,6 +55,8 @@ def main():
int -- 0 or error code int -- 0 or error code
""" """
reset_win_messages()
if len(sys.argv) < 2: if len(sys.argv) < 2:
sys.argv.append('-h') sys.argv.append('-h')
@ -107,9 +109,7 @@ def main():
if result is None: if result is None:
result = {} result = {}
if len(win) > 0: if len(win) > 0:
result['success'] = [] result['success'] = win
for msg in win:
result['success'].append(msg)
print(json.dumps(result)) print(json.dumps(result))
elif result is not None: elif result is not None:
pretty_print_dict(result) pretty_print_dict(result)

10
yunohost.py
View file

@ -124,6 +124,16 @@ def win_msg(astr):
def reset_win_messages():
"""
Empty the win array
"""
global win
win = []
def str_to_func(astr): def str_to_func(astr):
""" """
Call a function from a string name Call a function from a string name

7
yunohost.tac
View file

@ -14,7 +14,7 @@ from twisted.web.server import Site, http
from twisted.internet import reactor from twisted.internet import reactor
from twisted.application import internet,service from twisted.application import internet,service
from txrestapi.resource import APIResource from txrestapi.resource import APIResource
from yunohost import YunoHostError, YunoHostLDAP, str_to_func, colorize, pretty_print_dict, display_error, validate, win, parse_dict from yunohost import YunoHostError, YunoHostLDAP, str_to_func, colorize, pretty_print_dict, display_error, validate, win, parse_dict, reset_win_messages
if not __debug__: if not __debug__:
import traceback import traceback
@ -27,7 +27,6 @@ action_dict = {}
api = APIResource() api = APIResource()
def http_exec(request, **kwargs): def http_exec(request, **kwargs):
global win
request.setHeader('Access-Control-Allow-Origin', '*') # Allow cross-domain requests request.setHeader('Access-Control-Allow-Origin', '*') # Allow cross-domain requests
request.setHeader('Content-Type', 'application/json') # Return JSON anyway request.setHeader('Content-Type', 'application/json') # Return JSON anyway
@ -115,9 +114,9 @@ def http_exec(request, **kwargs):
result = func(**validated_args) result = func(**validated_args)
if result is None: if result is None:
result = {} result = {}
if win: if len(win) > 0:
result['win'] = win result['win'] = win
win = [] reset_win_messages()
# Build response # Build response
if request.method == 'POST': if request.method == 'POST':