From 95b32b168d088088faeb9f8725b2369c1d22a6e0 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Fri, 1 Jan 2021 17:05:32 +0100
Subject: [PATCH 1/2] More robust getMediaCount()

---
 src/reader.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index db756f7b9..67838de89 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -120,20 +120,12 @@ unsigned int Reader::getMediaCount() const
       = this->parseCounterMetadata();
   unsigned int counter = 0;
 
-  auto it = counterMap.find("image/jpeg");
-  if (it != counterMap.end()) {
-    counter += it->second;
+  for (auto it = counterMap.begin(); it != counterMap.end(); ++it) {
+    if (it->first.rfind("image/", 0) == 0) {
+      counter += it->second;
+    }
   }
 
-  it = counterMap.find("image/gif");
-  if (it != counterMap.end()) {
-    counter += it->second;
-  }
-
-  it = counterMap.find("image/png");
-  if (it != counterMap.end()) {
-    counter += it->second;
-  }
   return counter;
 }
 

From 44c4aa931a0c3916f81d298bed94973b05bf808c Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sun, 3 Jan 2021 15:17:03 +0100
Subject: [PATCH 2/2] Better use kiwix::startsWith()

---
 src/reader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 67838de89..10dfc8b0a 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -120,9 +120,9 @@ unsigned int Reader::getMediaCount() const
       = this->parseCounterMetadata();
   unsigned int counter = 0;
 
-  for (auto it = counterMap.begin(); it != counterMap.end(); ++it) {
-    if (it->first.rfind("image/", 0) == 0) {
-      counter += it->second;
+  for (auto &pair:counterMap) {
+    if (startsWith(pair.first, "image/")) {
+      counter += pair.second;
     }
   }