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

fixup! Searcher::add_reader() rejects duplicate readers

This commit is contained in:
Veloman Yunkan 2021-12-13 15:47:04 +04:00 committed by Matthieu Gautier
parent 0be00b791f
commit 250f46c7f9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/searcher.cpp
View File

@ -96,7 +96,7 @@ bool Searcher::add_reader(Reader* reader)
} }
for ( const Reader* const existing_reader : readers ) { for ( const Reader* const existing_reader : readers ) {
if ( existing_reader->getZimFilePath() == reader->getZimFilePath() ) if ( existing_reader->getZimArchive()->getUuid() == reader->getZimArchive()->getUuid() )
return false; return false;
} }

4
test/searcher.cpp
View File

@ -14,9 +14,7 @@ TEST(Searcher, add_reader) {
ASSERT_TRUE (searcher.add_reader(&reader1)); ASSERT_TRUE (searcher.add_reader(&reader1));
ASSERT_FALSE(searcher.add_reader(&reader1)); ASSERT_FALSE(searcher.add_reader(&reader1));
ASSERT_FALSE(searcher.add_reader(&reader2)); ASSERT_FALSE(searcher.add_reader(&reader2));
ASSERT_FALSE(searcher.add_reader(&reader3));
// equivalence of resolved paths is not checked by Searcher::add_reader
ASSERT_TRUE(searcher.add_reader(&reader3));
} }
TEST(Searcher, search) { TEST(Searcher, search) {