From 7e077ba82f9a4728ccfa782df525742053ed5539 Mon Sep 17 00:00:00 2001 From: benoit74 Date: Mon, 15 Jul 2024 09:19:31 +0000 Subject: [PATCH 1/2] Bump zim-tools to 3.4.2 --- receiver/Dockerfile | 2 +- workers/app/common/constants.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/receiver/Dockerfile b/receiver/Dockerfile index 68396868..bcbf9f64 100644 --- a/receiver/Dockerfile +++ b/receiver/Dockerfile @@ -48,7 +48,7 @@ VOLUME /mnt/quarantine VOLUME /mnt/zim VOLUME /mnt/check_logs -ENV ZIM_TOOLS_URL https://download.openzim.org/release/zim-tools/zim-tools_linux-x86_64-3.4.1.tar.gz +ENV ZIM_TOOLS_URL https://download.openzim.org/release/zim-tools/zim-tools_linux-x86_64-3.4.2.tar.gz ENV ZIM_SRC_DIR /jail/zim ENV ZIM_DST_DIR /mnt/zim ENV ZIM_QUAR_DIR /mnt/quarantine diff --git a/workers/app/common/constants.py b/workers/app/common/constants.py index 67e0dc86..3b1bba44 100644 --- a/workers/app/common/constants.py +++ b/workers/app/common/constants.py @@ -23,7 +23,7 @@ ) DNSCACHE_IMAGE = os.getenv("DNSCACHE_IMAGE") or "ghcr.io/openzim/dnscache:latest" UPLOADER_IMAGE = os.getenv("UPLOADER_IMAGE") or "ghcr.io/openzim/uploader:latest" -CHECKER_IMAGE = os.getenv("CHECKER_IMAGE") or "ghcr.io/openzim/zim-tools:3.4.1" +CHECKER_IMAGE = os.getenv("CHECKER_IMAGE") or "ghcr.io/openzim/zim-tools:3.4.2" MONITOR_IMAGE = os.getenv("MONITOR_IMAGE") or "ghcr.io/openzim/zimfarm-monitor:latest" # paths From 75d0f4a52c2422ff1e28836c98e3dfad5f744aeb Mon Sep 17 00:00:00 2001 From: benoit74 Date: Mon, 15 Jul 2024 09:13:48 +0000 Subject: [PATCH 2/2] Enhance ted create_ted_topics maint script --- .../backend/maint-scripts/create_ted_topics_recipes.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dispatcher/backend/maint-scripts/create_ted_topics_recipes.py b/dispatcher/backend/maint-scripts/create_ted_topics_recipes.py index 9e7a9653..ac8e4a52 100644 --- a/dispatcher/backend/maint-scripts/create_ted_topics_recipes.py +++ b/dispatcher/backend/maint-scripts/create_ted_topics_recipes.py @@ -49,7 +49,7 @@ def get_ted_topics(): def create_recipe(ted_topic_name: str, access_token): - clean_ted_topic_name = ted_topic_name.replace(" ", "-") + clean_ted_topic_name = ted_topic_name.replace(" ", "-").replace("'", "") schedule_name = f"ted_topic_{clean_ted_topic_name}" response = requests.get( get_url(f"/schedules/{schedule_name}"), @@ -125,7 +125,8 @@ def main(zf_username, zf_password): access_token, refresh_token = get_token(zf_username, zf_password) ted_topics = get_ted_topics() - logger.debug(ted_topics) + logger.debug(",".join((ted_topics))) + logger.debug(",".join(sorted(ted_topics))) for topic in ted_topics: if topic != "street art": continue