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

Merge pull request #288 from kiwix/get-bookmarks-api 

Add a parameter to getBookmarks fct to get valid bookmarks only
This commit is contained in:
Kelson 2019-10-31 14:38:50 +01:00 committed by GitHub
parent f1d55f8e86 bd6797143c
commit 2500cc8e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/library.h
View File

@ -208,7 +208,7 @@ class Library
* *
* @return A list of bookmarks * @return A list of bookmarks
*/ */
const std::vector<kiwix::Bookmark>& getBookmarks() { return m_bookmarks; } const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = true);
/** /**
* Get all book ids of the books in the library. * Get all book ids of the books in the library.

15
src/library.cpp
View File

@ -184,6 +184,21 @@ std::vector<std::string> Library::getBooksPublishers()
return booksPublishers; return booksPublishers;
} }
const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks)
{
if (!onlyValidBookmarks) {
return m_bookmarks;
}
std::vector<kiwix::Bookmark> validBookmarks;
auto booksId = getBooksIds();
for(auto& bookmark:m_bookmarks) {
if (std::find(booksId.begin(), booksId.end(), bookmark.getBookId()) != booksId.end()) {
validBookmarks.push_back(bookmark);
}
}
return validBookmarks;
}
std::vector<std::string> Library::getBooksIds() std::vector<std::string> Library::getBooksIds()
{ {
std::vector<std::string> bookIds; std::vector<std::string> bookIds;

26
test/library.cpp
View File

@ -180,6 +180,7 @@ const char * sampleOpdsStream = R"(
#include "../include/library.h" #include "../include/library.h"
#include "../include/manager.h" #include "../include/manager.h"
#include "../include/bookmark.h"
namespace namespace
{ {
@ -191,9 +192,34 @@ class LibraryTest : public ::testing::Test {
manager.readOpds(sampleOpdsStream, "foo.urlHost"); manager.readOpds(sampleOpdsStream, "foo.urlHost");
} }
kiwix::Bookmark createBookmark(const std::string &id) {
kiwix::Bookmark bookmark;
bookmark.setBookId(id);
return bookmark;
};
kiwix::Library lib; kiwix::Library lib;
}; };
TEST_F(LibraryTest, getBookMarksTest)
{
auto bookId1 = lib.getBooksIds()[0];
auto bookId2 = lib.getBooksIds()[1];
lib.addBookmark(createBookmark(bookId1));
lib.addBookmark(createBookmark("invalid-bookmark-id"));
lib.addBookmark(createBookmark(bookId2));
auto onlyValidBookmarks = lib.getBookmarks();
auto allBookmarks = lib.getBookmarks(false);
EXPECT_EQ(onlyValidBookmarks[0].getBookId(), bookId1);
EXPECT_EQ(onlyValidBookmarks[1].getBookId(), bookId2);
EXPECT_EQ(allBookmarks[0].getBookId(), bookId1);
EXPECT_EQ(allBookmarks[1].getBookId(), "invalid-bookmark-id");
EXPECT_EQ(allBookmarks[2].getBookId(), bookId2);
}
TEST_F(LibraryTest, sanityCheck) TEST_F(LibraryTest, sanityCheck)
{ {
EXPECT_EQ(lib.getBookCount(true, true), 10U); EXPECT_EQ(lib.getBookCount(true, true), 10U);