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

Merge pull request #1751 from Salamandar/variables_in_manifest

Browse source 
Variables in manifest
This commit is contained in:
Alexandre Aubin 2024-04-10 21:02:44 +02:00 • committed by GitHub
commit ba0ad78df5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/utils/resources.py
View file

@ -22,7 +22,7 @@ import shutil
import random import random
import tempfile import tempfile
import subprocess import subprocess
from typing import Dict, Any, List, Union from typing import Dict, Any, List, Union, Callable
from moulinette import m18n from moulinette import m18n
from moulinette.utils.text import random_ascii from moulinette.utils.text import random_ascii
@ -32,7 +32,7 @@ from moulinette.utils.filesystem import mkdir, chown, chmod, write_to_file
from moulinette.utils.filesystem import ( from moulinette.utils.filesystem import (
rm, rm,
) )
from yunohost.utils.system import system_arch from yunohost.utils.system import system_arch, debian_version
from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.error import YunohostError, YunohostValidationError
logger = getActionLogger("yunohost.app_resources") logger = getActionLogger("yunohost.app_resources")
@ -146,15 +146,32 @@ class AppResource:
def __init__(self, properties: Dict[str, Any], app: str, manager=None): def __init__(self, properties: Dict[str, Any], app: str, manager=None):
self.app = app self.app = app
self.manager = manager self.manager = manager
properties = self.default_properties | properties
for key, value in self.default_properties.items(): replacements: dict[str, str] = {
if isinstance(value, str): "__APP__": self.app,
value = value.replace("__APP__", self.app) "__YNH_ARCH__": system_arch(),
setattr(self, key, value) "__YNH_DEBIAN_VERSION__": debian_version(),
}
def recursive_apply(function: Callable, data: Any) -> Any:
if isinstance(data, dict): # FIXME: hashable?
return {key: recursive_apply(value, function) for key, value in data.items()}
if isinstance(data, list): # FIXME: iterable?
return [recursive_apply(value, function) for value in data]
return function(data)
def replace_tokens_in_strings(data: Any):
if not isinstance(data, str):
return
for token, replacement in replacements.items():
data = data.replace(token, replacement)
recursive_apply(replace_tokens_in_strings, properties)
for key, value in properties.items(): for key, value in properties.items():
if isinstance(value, str):
value = value.replace("__APP__", self.app)
setattr(self, key, value) setattr(self, key, value)
def get_setting(self, key): def get_setting(self, key):