Added Archive.media_count

Author: rgaudin

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- `Archive.media_count`
+
 ### Changed
 
 - Using libzim 8.1.0

libzim/libwrapper.h

@@ -158,6 +158,7 @@ class Archive : public Wrapper<zim::Archive>
     FORWARD(zim::size_type, getEntryCount)
     FORWARD(zim::size_type, getAllEntryCount)
     FORWARD(zim::size_type, getArticleCount)
+    FORWARD(zim::size_type, getMediaCount)
     FORWARD(std::string, getChecksum)
     FORWARD(std::string, getFilename)
     FORWARD(bool, hasMainEntry)

libzim/libzim.pyx

@@ -987,6 +987,13 @@ cdef class Archive:
             listing, resulting in this returning all entries."""
         return self.c_archive.getArticleCount()
 
+    @property
+    def media_count(self) -> pyint:
+        """Number of media in the Archive
+
+            This definition of "media" is based on the mimetype."""
+        return self.c_archive.getMediaCount()
+
     def get_illustration_sizes(self) -> Set[pyint]:
         """Sizes for which an illustration is available (@1 scale only)"""
         return self.c_archive.getIllustrationSizes()

libzim/zim.pxd

@@ -156,6 +156,7 @@ cdef extern from "libwrapper.h" namespace "wrapper":
         size_type getEntryCount() except +
         size_type getAllEntryCount() except +
         size_type getArticleCount() except +
+        size_type getMediaCount() except +
 
         string getChecksum() except +
         string getFilename() except +

tests/test_libzim_reader.py

@@ -34,6 +34,7 @@
         "entry_count": 0,
         "all_entry_count": 2,
         "article_count": 0,
+        "media_count": 0,
         "suggestion_string": None,
         "suggestion_count": 0,
         "suggestion_result": [],
@@ -79,6 +80,7 @@
         "entry_count": 371,
         "all_entry_count": 371,
         "article_count": 129,
+        "media_count": 45,
         "suggestion_string": "lucky",
         "suggestion_count": 1,
         "suggestion_result": ["A/That_Lucky_Old_Sun"],
@@ -122,6 +124,7 @@
         "entry_count": 60,
         "all_entry_count": 75,
         "article_count": 0,
+        "media_count": 22,
         "suggestion_string": "Free",
         "suggestion_count": 1,
         "suggestion_result": [
@@ -176,6 +179,7 @@
         "entry_count": 19,
         "all_entry_count": 19,
         "article_count": 1,
+        "media_count": 1,
         "suggestion_string": "empty",
         "suggestion_count": 1,
         "suggestion_result": ["A/empty.html"],
@@ -220,6 +224,7 @@
         "entry_count": 2,
         "all_entry_count": 16,
         "article_count": 1,
+        "media_count": 1,
         "suggestion_string": None,
         "suggestion_count": None,
         "suggestion_result": None,
@@ -438,6 +443,7 @@ def test_reader_checksum(all_zims, filename, has_checksum, is_valid):
             "entry_count",
             "all_entry_count",
             "article_count",
+            "media_count",
             "suggestion_string",
             "suggestion_count",
             "suggestion_result",
@@ -453,6 +459,7 @@ def test_reader_suggest_search(
     entry_count,
     all_entry_count,
     article_count,
+    media_count,
     suggestion_string,
     suggestion_count,
     suggestion_result,
@@ -466,6 +473,7 @@ def test_reader_suggest_search(
     assert zim.entry_count == entry_count
     assert zim.all_entry_count == all_entry_count
     assert zim.article_count == article_count
+    assert zim.media_count == media_count
 
     if search_string is not None:
         query = Query().set_query(search_string)