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

Remove m_readers in `Library::impl` 

It is a deprecated interface and it is a simple wrapper on Archive.
This commit is contained in:
Matthieu Gautier 2022-04-26 17:44:07 +02:00
parent 7c688a4acc
commit 28fb76bbc2
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/library.h
View File

@ -338,7 +338,7 @@ private: // functions
std::vector<std::string> getBookPropValueSet(BookStrPropMemFn p) const; std::vector<std::string> getBookPropValueSet(BookStrPropMemFn p) const;
BookIdCollection filterViaBookDB(const Filter& filter) const; BookIdCollection filterViaBookDB(const Filter& filter) const;
void updateBookDB(const Book& book); void updateBookDB(const Book& book);
void dropReader(const std::string& bookId); void dropCache(const std::string& bookId);
private: //data private: //data
std::unique_ptr<Impl> mp_impl; std::unique_ptr<Impl> mp_impl;

25
src/library.cpp
View File

@ -70,7 +70,6 @@ struct Library::Impl
Library::Revision m_revision; Library::Revision m_revision;
std::map<std::string, Entry> m_books; std::map<std::string, Entry> m_books;
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;
Xapian::WritableDatabase m_bookDB; Xapian::WritableDatabase m_bookDB;
@ -139,7 +138,7 @@ bool Library::addBook(const Book& book)
try { try {
auto& oldbook = mp_impl->m_books.at(book.getId()); auto& oldbook = mp_impl->m_books.at(book.getId());
if ( ! booksReferToTheSameArchive(oldbook, book) ) { if ( ! booksReferToTheSameArchive(oldbook, book) ) {
dropReader(book.getId()); dropCache(book.getId());
} }
oldbook.update(book); // XXX: This may have no effect if oldbook is readonly oldbook.update(book); // XXX: This may have no effect if oldbook is readonly
// XXX: Then m_bookDB will become out-of-sync with // XXX: Then m_bookDB will become out-of-sync with
@ -173,9 +172,8 @@ bool Library::removeBookmark(const std::string& zimId, const std::string& url)
} }
void Library::dropReader(const std::string& id) void Library::dropCache(const std::string& id)
{ {
mp_impl->m_readers.erase(id);
mp_impl->m_archives.erase(id); mp_impl->m_archives.erase(id);
} }
@ -183,7 +181,7 @@ 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); dropCache(id);
return mp_impl->m_books.erase(id) == 1; return mp_impl->m_books.erase(id) == 1;
} }
@ -242,19 +240,12 @@ const Book& Library::getBookByPath(const std::string& path) const
std::shared_ptr<Reader> Library::getReaderById(const std::string& id) std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
{ {
try { auto archive = getArchiveById(id);
std::lock_guard<std::mutex> lock(m_mutex); if(archive) {
return mp_impl->m_readers.at(id); return std::make_shared<Reader>(archive);
} catch (std::out_of_range& e) {} } else {
const auto archive = getArchiveById(id);
if ( !archive )
return nullptr; return nullptr;
}
const shared_ptr<Reader> reader(new Reader(archive, true));
std::lock_guard<std::mutex> lock(m_mutex);
mp_impl->m_readers[id] = reader;
return reader;
} }
std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id) std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id)