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

Merge pull request #446 from kiwix/libzim_random 

Use the new libzim's getRandomEntry instead of implementing it ourselves.
This commit is contained in:
Matthieu Gautier 2021-03-03 16:04:00 +01:00 committed by GitHub
parent d3f2e08b35 67caae6c32
commit 89d7e68a39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/reader.cpp
View File

@ -169,23 +169,11 @@ string Reader::getId() const
Entry Reader::getRandomPage() const Entry Reader::getRandomPage() const
{ {
auto mainPagePath = zimArchive->getMainEntry().getPath(); try {
int watchdog = 42; return zimArchive->getRandomEntry();
} catch(...) {
while (--watchdog){
auto idx = (zim::size_type)((double)rand() / ((double)RAND_MAX + 1)
* zimArchive->getEntryCount());
auto entry = zimArchive->getEntryByPath(idx);
if (entry.getPath()==mainPagePath) {
continue;
}
auto item = entry.getItem(true);
if (item.getMimetype() == "text/html") {
return entry;
}
}
throw NoEntry(); throw NoEntry();
}
} }
Entry Reader::getMainPage() const Entry Reader::getMainPage() const