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] Several files with same name

Browse source
This commit is contained in:
ljf 2020-06-08 19:18:22 +02:00 • committed by ljf
parent d8cdc20e0e
commit fb0d23533e
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/yunohost/app.py
View file

@ -1889,15 +1889,21 @@ def app_config_apply(operation_logger, app, args):
if generated_name in args: if generated_name in args:
# Upload files from API # Upload files from API
# A file arg contains a string with "FILENAME:BASE64_CONTENT" # A file arg contains a string with "FILENAME:BASE64_CONTENT"
if option["type"] == "file" and msettings.get('interface') == 'api': if 'type' in option and option["type"] == "file" \
and msettings.get('interface') == 'api':
if upload_dir is None: if upload_dir is None:
upload_dir = tempfile.mkdtemp(prefix='tmp_configpanel_') upload_dir = tempfile.mkdtemp(prefix='tmp_configpanel_')
filename, args[generated_name] = args[generated_name].split(':') filename = args[generated_name + '[name]']
content = args[generated_name]
logger.debug("Save uploaded file %s from API into %s", filename, upload_dir) logger.debug("Save uploaded file %s from API into %s", filename, upload_dir)
file_path = os.join(upload_dir, filename) file_path = os.path.join(upload_dir, filename)
i = 2
while os.path.exists(file_path):
file_path = os.path.join(upload_dir, filename + (".%d" % i))
i += 1
try: try:
with open(file_path, 'wb') as f: with open(file_path, 'wb') as f:
f.write(args[generated_name]) f.write(content.decode("base64"))
except IOError as e: except IOError as e:
raise YunohostError("cannot_write_file", file=file_path, error=str(e)) raise YunohostError("cannot_write_file", file=file_path, error=str(e))
except Exception as e: except Exception as e:
@ -1914,7 +1920,7 @@ def app_config_apply(operation_logger, app, args):
# for debug purpose # for debug purpose
for key in args: for key in args:
if key not in env: if key not in env:
logger.warning( logger.debug(
"Ignore key '%s' from arguments because it is not in the config", key "Ignore key '%s' from arguments because it is not in the config", key
) )