hosting/ynh-apps_tools
1
0
Fork 0
Code Activity

update_app_levels: use tomlkit to keep the comments in apps.toml

Browse source
This commit is contained in:
Félix Piédallu 2024-03-16 13:31:53 +01:00
parent 1f4d3ff86d
commit f4cc0f7060
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
update_app_levels/update_app_levels.py
View file

@ -8,13 +8,13 @@ import logging
import tempfile import tempfile
import textwrap import textwrap
import time import time
from collections import OrderedDict from typing import Any, Optional, TypeVar
from typing import Any, Optional
from pathlib import Path from pathlib import Path
import jinja2 import jinja2
import requests import requests
import toml import tomlkit
import tomlkit.items
from git import Repo from git import Repo
APPS_REPO = "YunoHost/apps" APPS_REPO = "YunoHost/apps"
@ -40,14 +40,28 @@ def ci_result_is_outdated(result) -> bool:
return (int(time.time()) - result.get("timestamp", 0)) > 3600 * 24 * 60 return (int(time.time()) - result.get("timestamp", 0)) > 3600 * 24 * 60
TomlkitSortable = TypeVar("TomlkitSortable", tomlkit.items.Table, tomlkit.TOMLDocument)
def _sort_tomlkit_table(table: TomlkitSortable) -> TomlkitSortable:
# We want to reuse the table with its metadatas / comments
# first use a generic set...
data_sorted = dict(sorted(table.items()))
# Clear the table
table.clear()
# Repopulate the table
for key, value in data_sorted.items():
table[key] = value
return table
def update_catalog(catalog, ci_results) -> dict: def update_catalog(catalog, ci_results) -> dict:
""" """
Actually change the catalog data Actually change the catalog data
""" """
# Re-sort the catalog keys / subkeys # Re-sort the catalog keys / subkeys
for app, infos in catalog.items(): for app, infos in catalog.items():
catalog[app] = OrderedDict(sorted(infos.items())) catalog[app] = _sort_tomlkit_table(infos)
catalog = OrderedDict(sorted(catalog.items())) catalog = _sort_tomlkit_table(catalog)
def app_level(app): def app_level(app):
if app not in ci_results: if app not in ci_results:
@ -203,7 +217,7 @@ def main():
apps_toml_path = Path(apps_repo.working_tree_dir) / "apps.toml" apps_toml_path = Path(apps_repo.working_tree_dir) / "apps.toml"
# Load the app catalog and filter out the non-working ones # Load the app catalog and filter out the non-working ones
catalog = toml.load(apps_toml_path.open("r", encoding="utf-8")) catalog = tomlkit.load(apps_toml_path.open("r", encoding="utf-8"))
new_branch = apps_repo.create_head("update_app_levels", apps_repo.refs.master) new_branch = apps_repo.create_head("update_app_levels", apps_repo.refs.master)
apps_repo.head.reference = new_branch apps_repo.head.reference = new_branch
@ -217,7 +231,7 @@ def main():
catalog = update_catalog(catalog, ci_results) catalog = update_catalog(catalog, ci_results)
# Save the new catalog # Save the new catalog
updated_catalog = toml.dumps(catalog) updated_catalog = tomlkit.dumps(catalog)
updated_catalog = updated_catalog.replace(",]", " ]") updated_catalog = updated_catalog.replace(",]", " ]")
apps_toml_path.open("w", encoding="utf-8").write(updated_catalog) apps_toml_path.open("w", encoding="utf-8").write(updated_catalog)