From 09a02344de2294e146f5e5fdf94ff02f4600d047 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Wed, 10 Jun 2020 17:09:16 +0000 Subject: [PATCH 1/2] fixed getMainUrl signature in OverriddenZimCreator so it's not hidden --- libzim/lib.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzim/lib.cxx b/libzim/lib.cxx index 429c342a..58af0a11 100644 --- a/libzim/lib.cxx +++ b/libzim/lib.cxx @@ -209,7 +209,7 @@ class OverriddenZimCreator : public zim::writer::Creator : zim::writer::Creator(true), mainPage(mainPage) {} - virtual zim::writer::Url getMainUrl() + virtual zim::writer::Url getMainUrl() const { return zim::writer::Url('A', mainPage); } From 39d6ab254ff5b318855e1875f0a4d796820702b2 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Thu, 11 Jun 2020 08:29:22 +0000 Subject: [PATCH 2/2] Added test for main_page and index_language --- tests/test_libzim.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/test_libzim.py b/tests/test_libzim.py index eb47d107..6fc727e7 100644 --- a/tests/test_libzim.py +++ b/tests/test_libzim.py @@ -19,6 +19,7 @@ import pytest from libzim.writer import Article, Blob, Creator +from libzim.reader import File # test files https://wiki.kiwix.org/wiki/Content_in_all_languages @@ -140,3 +141,21 @@ def test_check_mandatory_metadata(tmpdir): title="Test Zim", ) assert zim_creator.mandatory_metadata_ok() + + +def test_creator_params(tmpdir): + path = str(tmpdir / "test.zim") + main_page = "welcome" + main_page_url = f"A/{main_page}" + index_language = "eng" + with Creator( + path, main_page=main_page_url, index_language=index_language, min_chunk_size=2048 + ) as zim_creator: + zim_creator.add_article( + SimpleArticle(title="Welcome", mime_type="text/html", content="", url=main_page_url) + ) + + zim = File(path) + assert zim.filename == path + assert zim.main_page_url == main_page_url + assert bytes(zim.get_article("/M/Language").content).decode("UTF-8") == index_language