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

Move mimetypeCounter parsing in its own function.

This commit is contained in:
Matthieu Gautier 2020-10-28 14:08:06 +01:00
parent d546ae38c4
commit 4407dd12bd
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/tools/otherTools.h
View File

@ -22,6 +22,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <map>
#include <zim/zim.h>
namespace pugi { namespace pugi {
class xml_node; class xml_node;
@ -41,6 +43,8 @@ namespace kiwix
const std::string& tagName); const std::string& tagName);
bool convertStrToBool(const std::string& value); bool convertStrToBool(const std::string& value);
using MimeCounterType = std::map<const std::string, zim::article_index_type>;
MimeCounterType parseMimetypeCounter(const std::string& counterData);
} }
#endif #endif

21
src/reader.cpp
View File

@ -103,29 +103,16 @@ zim::File* Reader::getZimFileHandler() const
{ {
return this->zimFileHandler; return this->zimFileHandler;
} }
std::map<const std::string, unsigned int> Reader::parseCounterMetadata() const
{
std::map<const std::string, unsigned int> counters;
string mimeType, item, counterString;
unsigned int counter;
MimeCounterType Reader::parseCounterMetadata() const
{
zim::Article article = this->zimFileHandler->getArticle('M', "Counter"); zim::Article article = this->zimFileHandler->getArticle('M', "Counter");
if (article.good()) { if (article.good()) {
stringstream ssContent(article.getData()); return parseMimetypeCounter(article.getData());
while (getline(ssContent, item, ';')) {
stringstream ssItem(item);
getline(ssItem, mimeType, '=');
getline(ssItem, counterString, '=');
if (!counterString.empty() && !mimeType.empty()) {
sscanf(counterString.c_str(), "%u", &counter);
counters.insert(pair<string, int>(mimeType, counter));
}
}
} }
return counters; return MimeCounterType();
} }
/* Get the count of articles which can be indexed/displayed */ /* Get the count of articles which can be indexed/displayed */

21
src/tools/otherTools.cpp
View File

@ -280,3 +280,24 @@ bool kiwix::convertStrToBool(const std::string& value)
throw std::domain_error(ss.str()); throw std::domain_error(ss.str());
} }
kiwix::MimeCounterType kiwix::parseMimetypeCounter(const std::string& counterData)
{
kiwix::MimeCounterType counters;
std::string mimeType, item, counterString;
unsigned int counter;
std::stringstream ssContent(counterData);
while (getline(ssContent, item, ';')) {
std::stringstream ssItem(item);
getline(ssItem, mimeType, '=');
getline(ssItem, counterString, '=');
if (!counterString.empty() && !mimeType.empty()) {
sscanf(counterString.c_str(), "%u", &counter);
counters.insert(std::pair<std::string, int>(mimeType, counter));
}
}
return counters;
}