From ba302bed333bac125427d87814622876d17553c6 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 8 Dec 2020 18:53:02 +0100 Subject: [PATCH] Use new libzim method `getFaviconEntry` to get the favicon. --- src/reader.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/reader.cpp b/src/reader.cpp index c9fb91be9..5dfaaf15f 100644 --- a/src/reader.cpp +++ b/src/reader.cpp @@ -179,17 +179,13 @@ Entry Reader::getMainPage() const bool Reader::getFavicon(string& content, string& mimeType) const { - static const char* const paths[] = {"-/favicon", "-/favicon.png", "I/favicon.png", "I/favicon"}; - - for (auto &path: paths) { - try { - auto entry = zimArchive->getEntryByPath(path); - auto item = entry.getItem(true); - content = item.getData(); - mimeType = item.getMimetype(); - return true; - } catch(zim::EntryNotFound& e) {}; - } + try { + auto entry = zimArchive->getFaviconEntry(); + auto item = entry.getItem(true); + content = item.getData(); + mimeType = item.getMimetype(); + return true; + } catch(zim::EntryNotFound& e) {}; return false; }