Merge pull request #123 from openzim/illustration_size

Add support for getIllustrationSizes

Author: rgaudin

libzim/libwrapper.h

@@ -145,6 +145,7 @@ class Archive : public Wrapper<zim::Archive>
     FORWARD(wrapper::Entry, getEntryByTitle)
     FORWARD(wrapper::Entry, getMainEntry)
     FORWARD(wrapper::Item, getIllustrationItem)
+    FORWARD(std::set<unsigned int>, getIllustrationSizes)
     std::string getUuid() const
     { auto u = mp_base->getUuid();
       std::string uuids(u.data, u.size());

libzim/libzim.pyx

@@ -45,7 +45,9 @@ from uuid import UUID
 
 from cpython.buffer cimport PyBUF_WRITABLE
 from cpython.ref cimport PyObject
+
 from cython.operator import preincrement
+
 from libc.stdint cimport uint64_t
 from libcpp cimport bool
 from libcpp.map cimport map
@@ -894,7 +896,7 @@ cdef class Archive:
 
     def get_illustration_sizes(self) -> Set[pyint]:
         """Sizes for which an illustration is available (@1 scale only)"""
-        return {48}
+        return self.c_archive.getIllustrationSizes()
 
     def has_illustration(self, size: pyint = None) -> pybool:
         """Whether Archive has an illustration metadata for this size"""

libzim/zim.pxd

@@ -22,6 +22,7 @@ from libc.stdint cimport uint32_t, uint64_t
 from libcpp cimport bool
 from libcpp.map cimport map
 from libcpp.memory cimport shared_ptr
+from libcpp.set cimport set
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 
@@ -153,7 +154,7 @@ cdef extern from "libwrapper.h" namespace "wrapper":
         bool hasMainEntry() except +
         bool hasIllustration() except +
         bool hasIllustration(unsigned int size) except +
-        # set[unsigned int] getIllustrationSizes() except +
+        set[unsigned int] getIllustrationSizes() except +
         bool hasEntryByPath(string path) except +
         bool hasEntryByTitle(string title) except +
         bool isMultiPart() except +

tests/test_libzim_creator.py

@@ -350,6 +350,7 @@ def test_creator_illustration(fpath, favicon_data):
     assert zim.has_illustration(128) is False
     assert bytes(zim.get_illustration_item().content) == favicon_data
     assert bytes(zim.get_illustration_item(96).content) == favicon_data
+    assert zim.get_illustration_sizes() == {48, 96}
 
 
 def test_creator_additem(fpath, lipsum_item):

tests/test_libzim_reader.py

@@ -345,6 +345,7 @@ def test_reader_main_favicon_entries(
         assert zim.get_illustration_item()
         if new_ns:
             assert zim.get_illustration_item().path == "Illustration_48x48@1"
+            assert zim.get_illustration_sizes() == {48}
 
 
 @pytest.mark.parametrize(