Skip to content

Fixed unset mainpage in Creator #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2020
Merged

Fixed unset mainpage in Creator #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09a0234
fixed getMainUrl signature in OverriddenZimCreator so it's not hidden
Jun 10, 2020
39d6ab2
Added test for main_page and index_language
Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libzim/lib.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
19 changes: 19 additions & 0 deletions tests/test_libzim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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