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: pop 'portal_logo' when resaving settings

Browse source
This commit is contained in:
axolotle 2023-11-25 21:38:33 +01:00
parent e5a593a4bb
commit c8d0990e7b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/domain.py
View file

@ -774,11 +774,14 @@ class DomainConfigPanel(ConfigPanel):
# FIXME remove those from the config panel saved values? # FIXME remove those from the config panel saved values?
portal_values = form.dict(include=set(portal_options)) portal_values = form.dict(include=set(portal_options))
# Remove logo from values else filename will replace b64 content
portal_values.pop("portal_logo")
if "portal_logo" in next_settings: if "portal_logo" in next_settings:
if previous_settings.get("portal_logo"): if previous_settings.get("portal_logo"):
try: try:
os.remove(previous_settings["portal_logo"]) os.remove(previous_settings["portal_logo"])
portal_values["portal_logo"] = ''
except: except:
logger.warning( logger.warning(
f"Coulnd't remove previous logo file, maybe the file was already deleted, path: {previous_settings['portal_logo']}" f"Coulnd't remove previous logo file, maybe the file was already deleted, path: {previous_settings['portal_logo']}"
@ -790,7 +793,7 @@ class DomainConfigPanel(ConfigPanel):
from base64 import b64encode from base64 import b64encode
from magic import Magic from magic import Magic
file_content = Path(portal_values["portal_logo"]).read_bytes() file_content = Path(next_settings["portal_logo"]).read_bytes()
mimetype = Magic(mime=True).from_buffer(file_content) mimetype = Magic(mime=True).from_buffer(file_content)
portal_values["portal_logo"] = ( portal_values["portal_logo"] = (
mimetype + ":" + b64encode(file_content).decode("utf-8") mimetype + ":" + b64encode(file_content).decode("utf-8")