From a218e6034f38cd9fc2af6c4e4c5aec9110104a02 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:03:30 +0300 Subject: [PATCH] re-enable upgrade strategy on tdarr (#1600) * re-enable upgrade strategy on tdarr * flake8 --- .../tdarr/{upgrade_strategy_disable => upgrade_strategy} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename library/ix-dev/community/tdarr/{upgrade_strategy_disable => upgrade_strategy} (71%) diff --git a/library/ix-dev/community/tdarr/upgrade_strategy_disable b/library/ix-dev/community/tdarr/upgrade_strategy similarity index 71% rename from library/ix-dev/community/tdarr/upgrade_strategy_disable rename to library/ix-dev/community/tdarr/upgrade_strategy index 3e49862388..b56ab2eefc 100755 --- a/library/ix-dev/community/tdarr/upgrade_strategy_disable +++ b/library/ix-dev/community/tdarr/upgrade_strategy @@ -6,12 +6,14 @@ import sys from catalog_update.upgrade_strategy import semantic_versioning -RE_STABLE_VERSION = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+') +# Drop _ffmpeg5 after Cobia is released for a while +RE_STABLE_VERSION = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+_ffmpeg5') +STRIP_TEXT = '_ffmpeg5' def newer_mapping(image_tags): key = list(image_tags.keys())[0] - tags = {t: t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} + tags = {t.strip(STRIP_TEXT): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} version = semantic_versioning(list(tags)) if not version: return {}