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

Remove unecessary BookDB helper class. 

It was needed to not expose Xapian in public header.
Now we can remove it and directly use a Xapian db.
This commit is contained in:
Matthieu Gautier 2022-04-26 17:15:39 +02:00
parent 090c2fd31a
commit aa1f73472d
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/library.cpp
View File

@ -73,8 +73,7 @@ struct Library::Impl
std::map<std::string, std::shared_ptr<Reader>> m_readers; std::map<std::string, std::shared_ptr<Reader>> m_readers;
std::map<std::string, std::shared_ptr<zim::Archive>> m_archives; std::map<std::string, std::shared_ptr<zim::Archive>> m_archives;
std::vector<kiwix::Bookmark> m_bookmarks; std::vector<kiwix::Bookmark> m_bookmarks;
class BookDB; Xapian::WritableDatabase m_bookDB;
std::unique_ptr<BookDB> m_bookDB;
Impl(); Impl();
~Impl(); ~Impl();
@ -83,15 +82,8 @@ struct Library::Impl
Impl& operator=(Impl&& ); Impl& operator=(Impl&& );
}; };
class Library::Impl::BookDB : public Xapian::WritableDatabase
{
public:
BookDB() : Xapian::WritableDatabase("", Xapian::DB_BACKEND_INMEMORY) {}
};
Library::Impl::Impl() Library::Impl::Impl()
: m_bookDB(new BookDB) : m_bookDB("", Xapian::DB_BACKEND_INMEMORY)
{ {
} }
@ -176,7 +168,7 @@ void Library::dropReader(const std::string& id)
bool Library::removeBookById(const std::string& id) bool Library::removeBookById(const std::string& id)
{ {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
mp_impl->m_bookDB->delete_document("Q" + id); mp_impl->m_bookDB.delete_document("Q" + id);
dropReader(id); dropReader(id);
return mp_impl->m_books.erase(id) == 1; return mp_impl->m_books.erase(id) == 1;
} }
@ -431,7 +423,7 @@ void Library::updateBookDB(const Book& book)
doc.set_data(book.getId()); doc.set_data(book.getId());
mp_impl->m_bookDB->replace_document(idterm, doc); mp_impl->m_bookDB.replace_document(idterm, doc);
} }
namespace namespace
@ -564,7 +556,7 @@ Library::BookIdCollection Library::filterViaBookDB(const Filter& filter) const
BookIdCollection bookIds; BookIdCollection bookIds;
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
Xapian::Enquire enquire(*mp_impl->m_bookDB); Xapian::Enquire enquire(mp_impl->m_bookDB);
enquire.set_query(query); enquire.set_query(query);
const auto results = enquire.get_mset(0, mp_impl->m_books.size()); const auto results = enquire.get_mset(0, mp_impl->m_books.size());
for ( auto it = results.begin(); it != results.end(); ++it ) { for ( auto it = results.begin(); it != results.end(); ++it ) {