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

[fix] Bad call to Moulinette.interface

Browse source
This commit is contained in:
ljf 2021-08-30 14:04:12 +02:00
parent 766711069f
commit 8d9f8c7123
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/yunohost/app.py
View file

@ -1867,12 +1867,12 @@ def app_config_set(operation_logger, app, key=None, value=None, args=None):
logger.debug("Asking unanswered question and prevalidating...") logger.debug("Asking unanswered question and prevalidating...")
args_dict = {} args_dict = {}
for panel in config_panel.get("panel", []): for panel in config_panel.get("panel", []):
if Moulinette.interface == 'cli' and len(filter_key.split('.')) < 3: if Moulinette.interface.type== 'cli' and len(filter_key.split('.')) < 3:
Moulinette.display(colorize("\n" + "=" * 40, 'purple')) Moulinette.display(colorize("\n" + "=" * 40, 'purple'))
Moulinette.display(colorize(f">>>> {panel['name']}", 'purple')) Moulinette.display(colorize(f">>>> {panel['name']}", 'purple'))
Moulinette.display(colorize("=" * 40, 'purple')) Moulinette.display(colorize("=" * 40, 'purple'))
for section in panel.get("sections", []): for section in panel.get("sections", []):
if Moulinette.interface == 'cli' and len(filter_key.split('.')) < 3: if Moulinette.interface.type== 'cli' and len(filter_key.split('.')) < 3:
Moulinette.display(colorize(f"\n# {section['name']}", 'purple')) Moulinette.display(colorize(f"\n# {section['name']}", 'purple'))
# Check and ask unanswered questions # Check and ask unanswered questions
@ -2855,10 +2855,9 @@ class YunoHostArgumentFormatParser(object):
def parse(self, question, user_answers): def parse(self, question, user_answers):
question = self.parse_question(question, user_answers) question = self.parse_question(question, user_answers)
<<<<<<< HEAD
while True: while True:
# Display question if no value filled or if it's a readonly message # Display question if no value filled or if it's a readonly message
if Moulinette.interface == 'cli': if Moulinette.interface.type== 'cli':
text_for_user_input_in_cli = self._format_text_for_user_input_in_cli( text_for_user_input_in_cli = self._format_text_for_user_input_in_cli(
question question
) )
@ -2894,7 +2893,7 @@ class YunoHostArgumentFormatParser(object):
try: try:
self._prevalidate(question) self._prevalidate(question)
except YunohostValidationError as e: except YunohostValidationError as e:
if Moulinette.interface == 'api': if Moulinette.interface.type== 'api':
raise raise
Moulinette.display(str(e), 'error') Moulinette.display(str(e), 'error')
question.value = None question.value = None
@ -3180,7 +3179,7 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
@classmethod @classmethod
def clean_upload_dirs(cls): def clean_upload_dirs(cls):
# Delete files uploaded from API # Delete files uploaded from API
if Moulinette.interface == 'api': if Moulinette.interface.type== 'api':
for upload_dir in cls.upload_dirs: for upload_dir in cls.upload_dirs:
if os.path.exists(upload_dir): if os.path.exists(upload_dir):
shutil.rmtree(upload_dir) shutil.rmtree(upload_dir)
@ -3193,7 +3192,7 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
question_parsed.accept = question.get('accept').replace(' ', '').split(',') question_parsed.accept = question.get('accept').replace(' ', '').split(',')
else: else:
question_parsed.accept = [] question_parsed.accept = []
if Moulinette.interface == 'api': if Moulinette.interface.type== 'api':
if user_answers.get(question_parsed.name): if user_answers.get(question_parsed.name):
question_parsed.value = { question_parsed.value = {
'content': question_parsed.value, 'content': question_parsed.value,
@ -3224,7 +3223,7 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
if not question.value: if not question.value:
return question.value return question.value
if Moulinette.interface == 'api': if Moulinette.interface.type== 'api':
upload_dir = tempfile.mkdtemp(prefix='tmp_configpanel_') upload_dir = tempfile.mkdtemp(prefix='tmp_configpanel_')
FileArgumentParser.upload_dirs += [upload_dir] FileArgumentParser.upload_dirs += [upload_dir]