From 06333171265d984d414d1601f2dec81ea891f969 Mon Sep 17 00:00:00 2001 From: oleole39 <59071673+oleole39@users.noreply.github.com> Date: Wed, 23 Apr 2025 04:02:35 +0200 Subject: [PATCH 1/2] readme_generator: check that logo exists --- readme_generator/README.md.j2 | 6 +++--- readme_generator/make_readme.py | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/readme_generator/README.md.j2 b/readme_generator/README.md.j2 index a650d422..7fbffec5 100644 --- a/readme_generator/README.md.j2 +++ b/readme_generator/README.md.j2 @@ -20,9 +20,9 @@ N.B.: This README was automatically generated by -

- Logo of {{manifest.name}} - {{ manifest.name }}, packaged for YunoHost +

+ {% set logo_url = 'https://raw.githubusercontent.com/YunoHost/apps/main/logos/' + manifest.id + '.png' %}{% if url_exists(logo_url) %}Logo of {{manifest.name}} + {% endif %}{{ manifest.name }}, packaged for YunoHost

{{ manifest.description['en'] }} diff --git a/readme_generator/make_readme.py b/readme_generator/make_readme.py index b11b6036..dda7326b 100755 --- a/readme_generator/make_readme.py +++ b/readme_generator/make_readme.py @@ -7,12 +7,24 @@ import toml from jinja2 import Environment, FileSystemLoader +import requests + # add apps/tools to sys.path sys.path.insert(0, str(Path(__file__).parent.parent)) README_GEN_DIR = Path(__file__).resolve().parent - +def url_exists(url): + try: + get = requests.get(url) + if get.status_code == 200: + return True + else: + return False + except requests.exceptions.RequestException as e: + raise Exception("Can't check URL'") + + def generate_READMEs(app_path: Path): if not app_path.exists(): raise Exception("App path provided doesn't exists ?!") @@ -24,7 +36,7 @@ def generate_READMEs(app_path: Path): ) template = env.get_template("README.md.j2") - out: str = template.render(manifest=manifest) + out: str = template.render(manifest=manifest, url_exists=url_exists) (app_path / "README.md").write_text(out) # Delete legacy READMEs From 484c39a531f437563cd1ea86917a20cdd2551f3a Mon Sep 17 00:00:00 2001 From: oleole39 <59071673+oleole39@users.noreply.github.com> Date: Wed, 23 Apr 2025 04:21:39 +0200 Subject: [PATCH 2/2] add error msg to exception --- readme_generator/make_readme.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme_generator/make_readme.py b/readme_generator/make_readme.py index dda7326b..4d07d250 100755 --- a/readme_generator/make_readme.py +++ b/readme_generator/make_readme.py @@ -21,8 +21,8 @@ def url_exists(url): return True else: return False - except requests.exceptions.RequestException as e: - raise Exception("Can't check URL'") + except requests.exceptions.RequestException as err: + raise Exception("Can't check URL:", err) def generate_READMEs(app_path: Path):