From 1b0d1dbd993ff056346a9141ddd88d56863c2f7c Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sat, 17 Nov 2018 11:13:06 -0500 Subject: [PATCH] handle some old non-canonical file names, like gutenberg --- roles/kiwix/templates/iiab-make-kiwix-lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kiwix/templates/iiab-make-kiwix-lib.py b/roles/kiwix/templates/iiab-make-kiwix-lib.py index 2abe278b8..3394f510a 100644 --- a/roles/kiwix/templates/iiab-make-kiwix-lib.py +++ b/roles/kiwix/templates/iiab-make-kiwix-lib.py @@ -126,8 +126,8 @@ def get_zim_list(path): wiki_name = old_zim_map[filename] else: ulpos = filename.rfind("_") - # but gutenberg don't - future maybe put in old_zim_map (en and fr, but instance dates may change) - if "gutenberg_" in filename: + # but old gutenberg and some other names are not canonical + if filename.rfind("-") < 0: # non-canonical name ulpos = filename[:ulpos].rfind("_") wiki_name = filename[:ulpos] zim_versions[wiki_name] = filename # if there are multiples, last should win