smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #961 from kiwix/issue950

This commit is contained in:
Matthieu Gautier 2023-06-28 15:21:23 +02:00 committed by GitHub
parent 550fc2fcf9 f41007989b
commit 1f5a160d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/book.cpp
View File

@ -117,11 +117,12 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
m_articleCount = strtoull(ATTR("articleCount"), 0, 0); m_articleCount = strtoull(ATTR("articleCount"), 0, 0);
m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0); m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0);
m_size = strtoull(ATTR("size"), 0, 0) << 10; m_size = strtoull(ATTR("size"), 0, 0) << 10;
std::string favicon_mimetype = ATTR("faviconMimeType"); const std::string faviconMimeType = ATTR("faviconMimeType");
if (! favicon_mimetype.empty()) { const std::string faviconBase64EncodedData = ATTR("favicon");
if ( !faviconMimeType.empty() && !faviconBase64EncodedData.empty() ) {
const auto favicon = std::make_shared<Illustration>(); const auto favicon = std::make_shared<Illustration>();
favicon->data = base64_decode(ATTR("favicon")); favicon->data = base64_decode(faviconBase64EncodedData);
favicon->mimeType = favicon_mimetype; favicon->mimeType = faviconMimeType;
favicon->url = ATTR("faviconUrl"); favicon->url = ATTR("faviconUrl");
m_illustrations.assign(1, favicon); m_illustrations.assign(1, favicon);
} }

2
test/data/library.xml
View File

@ -32,6 +32,7 @@
articleCount="284" articleCount="284"
mediaCount="2" mediaCount="2"
size="123" size="123"
faviconMimeType="image/png;favicon_attribute_is_absent"
></book> ></book>
<book <book
id="charlesray" id="charlesray"
@ -48,5 +49,6 @@
articleCount="284" articleCount="284"
mediaCount="2" mediaCount="2"
size="556" size="556"
favicon="faviconMimeType_attribute_is_absent"
></book> ></book>
</library> </library>