Added all_entry_count and article_count

libzim now has three different count methods for entries:
- `all_entry_count`: number of entries in the archive
- `entry_count`: number of user entries in the archive
- `article_count`: number of articles in the archive

Author: renaud gaudin

libzim/wrapper.pxd

@@ -147,6 +147,8 @@ cdef extern from "lib.h":
         ZimItem* getIllustrationItem() except +
         ZimItem* getIllustrationItem(int size) except +
         size_type getEntryCount() except +
+        size_type getAllEntryCount() except +
+        size_type getArticleCount() except +
 
         string getChecksum() except +
         string getFilename() except +

libzim/wrapper.pyx

@@ -598,6 +598,14 @@ cdef class PyArchive:
     def entry_count(self) -> int:
         return self.c_archive.getEntryCount()
 
+    @property
+    def all_entry_count(self) -> int:
+        return self.c_archive.getAllEntryCount()
+
+    @property
+    def article_count(self) -> int:
+        return self.c_archive.getArticleCount()
+
     def get_illustration_sizes(self):
         # FIXME: using static shortcut instead of libzim's
         # cdef set[unsigned int] sizes = self.c_archive.getIllustrationSizes()

tests/test_libzim_reader.py

@@ -31,6 +31,8 @@
         "checksum": None,
         "is_valid": True,
         "entry_count": 0,
+        "all_entry_count": 4,
+        "article_count": 0,
         "suggestion_string": "",
         "suggestion_count": 0,
         "suggestion_result": [],
@@ -74,6 +76,8 @@
         "checksum": None,
         "is_valid": True,
         "entry_count": 371,
+        "all_entry_count": 371,
+        "article_count": 284,
         "suggestion_string": "lucky",
         "suggestion_count": 1,
         "suggestion_result": ["A/That_Lucky_Old_Sun"],
@@ -115,6 +119,8 @@
         "checksum": "abcd818c87079cb29282282b47ee46ec",
         "is_valid": True,
         "entry_count": 60,
+        "all_entry_count": 75,
+        "article_count": 0,
         "suggestion_string": "favicon",
         "suggestion_count": 1,
         "suggestion_result": ["favicon.png"],
@@ -160,6 +166,8 @@
         "checksum": None,
         "is_valid": True,
         "entry_count": 19,
+        "all_entry_count": 19,
+        "article_count": 1,
         "suggestion_string": "empty",
         "suggestion_count": 1,
         "suggestion_result": ["A/empty.html"],
@@ -359,6 +367,8 @@ def test_reader_checksum(all_zims, filename, has_checksum, is_valid):
         [
             "filename",
             "entry_count",
+            "all_entry_count",
+            "article_count",
             "suggestion_string",
             "suggestion_count",
             "suggestion_result",
@@ -372,6 +382,8 @@ def test_reader_suggest_search(
     all_zims,
     filename,
     entry_count,
+    all_entry_count,
+    article_count,
     suggestion_string,
     suggestion_count,
     suggestion_result,
@@ -383,6 +395,10 @@ def test_reader_suggest_search(
 
     # suggestion and search results
     assert zim.entry_count == entry_count
+    assert zim.all_entry_count == all_entry_count
+    assert zim.article_count == article_count
+
+
 # TODO: restore [search-api]
 #     assert (
 #         zim.get_estimated_suggestions_results_count(suggestion_string)