From 250f46c7f989748332813846631252df7fbb0642 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Mon, 13 Dec 2021 15:47:04 +0400 Subject: [PATCH] fixup! Searcher::add_reader() rejects duplicate readers --- src/searcher.cpp | 2 +- test/searcher.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/searcher.cpp b/src/searcher.cpp index 51f16a7b3..7e7403027 100644 --- a/src/searcher.cpp +++ b/src/searcher.cpp @@ -96,7 +96,7 @@ bool Searcher::add_reader(Reader* reader) } for ( const Reader* const existing_reader : readers ) { - if ( existing_reader->getZimFilePath() == reader->getZimFilePath() ) + if ( existing_reader->getZimArchive()->getUuid() == reader->getZimArchive()->getUuid() ) return false; } diff --git a/test/searcher.cpp b/test/searcher.cpp index 735f4c373..5adb0adeb 100644 --- a/test/searcher.cpp +++ b/test/searcher.cpp @@ -14,9 +14,7 @@ TEST(Searcher, add_reader) { ASSERT_TRUE (searcher.add_reader(&reader1)); ASSERT_FALSE(searcher.add_reader(&reader1)); ASSERT_FALSE(searcher.add_reader(&reader2)); - - // equivalence of resolved paths is not checked by Searcher::add_reader - ASSERT_TRUE(searcher.add_reader(&reader3)); + ASSERT_FALSE(searcher.add_reader(&reader3)); } TEST(Searcher, search) {