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

Make the member of the book protected. 

It is up to the book to manage its attribute.

Also remove the `absolutePath` (and `indexAbsolutePath`). The `Book::path` is always stored
absolute.
The fact that the path can be stored absolute or relative in the
`library.xml` is not relevant for the book.
This commit is contained in:
Matthieu Gautier 2018-09-03 15:35:22 +02:00
parent 57ac6f0305
commit bba3c252e4
4 changed files with 248 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
include/library.h
View File

@ -58,29 +58,72 @@ class Book
static bool sortByLanguage(const Book& a, const Book& b); static bool sortByLanguage(const Book& a, const Book& b);
string getHumanReadableIdFromPath(); string getHumanReadableIdFromPath();
string id; bool readOnly() const { return m_readOnly; }
string path; const string& id() const { return m_id; }
string pathAbsolute; const string& path() const { return m_path; }
string last; const string& last() const { return m_last; }
string indexPath; const string& indexPath() const { return m_indexPath; }
string indexPathAbsolute; const supportedIndexType& indexType() const { return m_indexType; }
supportedIndexType indexType; const string& title() const { return m_title; }
string title; const string& description() const { return m_description; }
string description; const string& language() const { return m_language; }
string language; const string& creator() const { return m_creator; }
string creator; const string& publisher() const { return m_publisher; }
string publisher; const string& date() const { return m_date; }
string date; const string& url() const { return m_url; }
string url; const string& name() const { return m_name; }
string name; const string& tags() const { return m_tags; }
string tags; const string& origId() const { return m_origId; }
string origId; const uint64_t& articleCount() const { return m_articleCount; }
string articleCount; const uint64_t& mediaCount() const { return m_mediaCount; }
string mediaCount; const uint64_t& size() const { return m_size; }
bool readOnly; const string& favicon() const { return m_favicon; }
string size; const string& faviconMimeType() const { return m_faviconMimeType; }
string favicon;
string faviconMimeType; void setReadOnly(bool readOnly) { m_readOnly = readOnly; }
void setId(const std::string& id) { m_id = id; }
void setPath(const std::string& path);
void setLast(const std::string& last) { m_last = last; }
void setIndexPath(const std::string& indexPath);
void setIndexType(supportedIndexType indexType) { m_indexType = indexType;}
void setTitle(const std::string& title) { m_title = title; }
void setDescription(const std::string& description) { m_description = description; }
void setLanguage(const std::string& language) { m_language = language; }
void setCreator(const std::string& creator) { m_creator = creator; }
void setPublisher(const std::string& publisher) { m_publisher = publisher; }
void setDate(const std::string& date) { m_date = date; }
void setUrl(const std::string& url) { m_url = url; }
void setName(const std::string& name) { m_name = name; }
void setTags(const std::string& tags) { m_tags = tags; }
void setOrigId(const std::string& origId) { m_origId = origId; }
void setArticleCount(uint64_t articleCount) { m_articleCount = articleCount; }
void setMediaCount(uint64_t mediaCount) { m_mediaCount = mediaCount; }
void setSize(uint64_t size) { m_size = size; }
void setFavicon(const std::string& favicon) { m_favicon = favicon; }
void setFaviconMimeType(const std::string& faviconMimeType) { m_faviconMimeType = faviconMimeType; }
protected:
string m_id;
string m_path;
string m_last;
string m_indexPath;
supportedIndexType m_indexType;
string m_title;
string m_description;
string m_language;
string m_creator;
string m_publisher;
string m_date;
string m_url;
string m_name;
string m_tags;
string m_origId;
uint64_t m_articleCount;
uint64_t m_mediaCount;
bool m_readOnly;
uint64_t m_size;
string m_favicon;
string m_faviconMimeType;
}; };
/** /**

198
src/library.cpp
View File

@ -24,7 +24,7 @@
namespace kiwix namespace kiwix
{ {
/* Constructor */ /* Constructor */
Book::Book() : readOnly(false) Book::Book() : m_readOnly(false)
{ {
} }
/* Destructor */ /* Destructor */
@ -36,84 +36,74 @@ bool Book::sortByLastOpen(const kiwix::Book& a, const kiwix::Book& b)
{ {
return atoi(a.last.c_str()) > atoi(b.last.c_str()); return atoi(a.last.c_str()) > atoi(b.last.c_str());
} }
bool Book::sortByTitle(const kiwix::Book& a, const kiwix::Book& b) bool Book::sortByTitle(const kiwix::Book& a, const kiwix::Book& b)
{ {
return strcmp(a.title.c_str(), b.title.c_str()) < 0; return a.m_title < b.m_title;
} }
bool Book::sortByDate(const kiwix::Book& a, const kiwix::Book& b) bool Book::sortByDate(const kiwix::Book& a, const kiwix::Book& b)
{ {
return strcmp(a.date.c_str(), b.date.c_str()) > 0; return a.m_date < b.m_date;
} }
bool Book::sortBySize(const kiwix::Book& a, const kiwix::Book& b) bool Book::sortBySize(const kiwix::Book& a, const kiwix::Book& b)
{ {
return atoi(a.size.c_str()) < atoi(b.size.c_str()); return a.m_size < b.m_size;
} }
bool Book::sortByPublisher(const kiwix::Book& a, const kiwix::Book& b) bool Book::sortByPublisher(const kiwix::Book& a, const kiwix::Book& b)
{ {
return strcmp(a.publisher.c_str(), b.publisher.c_str()) < 0; return a.m_publisher < b.m_publisher;
} }
bool Book::sortByCreator(const kiwix::Book& a, const kiwix::Book& b) bool Book::sortByCreator(const kiwix::Book& a, const kiwix::Book& b)
{ {
return strcmp(a.creator.c_str(), b.creator.c_str()) < 0; return a.m_creator < b.m_creator;
} }
bool Book::sortByLanguage(const kiwix::Book& a, const kiwix::Book& b) bool Book::sortByLanguage(const kiwix::Book& a, const kiwix::Book& b)
{ {
return strcmp(a.language.c_str(), b.language.c_str()) < 0; return a.m_language < b.m_language;
} }
bool Book::update(const kiwix::Book& other) bool Book::update(const kiwix::Book& other)
{ {
if (readOnly) if (m_readOnly)
return false; return false;
readOnly = other.readOnly; m_readOnly = other.m_readOnly;
if (path.empty()) { if (m_path.empty()) {
path = other.path; m_path = other.m_path;
} }
if (pathAbsolute.empty()) { if (m_url.empty()) {
pathAbsolute = other.pathAbsolute; m_url = other.m_url;
} }
if (url.empty()) { if (m_tags.empty()) {
url = other.url; m_tags = other.m_tags;
} }
if (tags.empty()) { if (m_name.empty()) {
tags = other.tags; m_name = other.m_name;
} }
if (name.empty()) { if (m_indexPath.empty()) {
name = other.name; m_indexPath = other.m_indexPath;
m_indexType = other.m_indexType;
} }
if (indexPath.empty()) { if (m_faviconMimeType.empty()) {
indexPath = other.indexPath; m_favicon = other.m_favicon;
indexType = other.indexType; m_faviconMimeType = other.m_faviconMimeType;
}
if (indexPathAbsolute.empty()) {
indexPathAbsolute = other.indexPathAbsolute;
indexType = other.indexType;
}
if (faviconMimeType.empty()) {
favicon = other.favicon;
faviconMimeType = other.faviconMimeType;
} }
return true; return true;
} }
std::string Book::getHumanReadableIdFromPath() std::string Book::getHumanReadableIdFromPath()
{ {
std::string id = pathAbsolute; std::string id = m_path;
if (!id.empty()) { if (!id.empty()) {
kiwix::removeAccents(id); kiwix::removeAccents(id);
@ -130,6 +120,20 @@ std::string Book::getHumanReadableIdFromPath()
return id; return id;
} }
void Book::setPath(const std::string& path)
{
m_path = isRelativePath(path)
? computeAbsolutePath(getCurrentDirectory(), path)
: path;
}
void Book::setIndexPath(const std::string& indexPath)
{
m_indexPath = isRelativePath(indexPath)
? computeAbsolutePath(getCurrentDirectory(), indexPath)
: indexPath;
}
/* Constructor */ /* Constructor */
Library::Library() : version(KIWIX_LIBRARY_VERSION) Library::Library() : version(KIWIX_LIBRARY_VERSION)
{ {
@ -145,11 +149,11 @@ bool Library::addBook(const Book& book)
/* Try to find it */ /* Try to find it */
std::vector<kiwix::Book>::iterator itr; std::vector<kiwix::Book>::iterator itr;
try { try {
auto& oldbook = books.at(book.id); auto& oldbook = books.at(book.id());
oldbook.update(book); oldbook.update(book);
return false; return false;
} catch (std::out_of_range&) { } catch (std::out_of_range&) {
books[book.id] = book; books[book.id()] = book;
return true; return true;
} }
} }
@ -171,8 +175,8 @@ unsigned int Library::getBookCount(const bool localBooks,
unsigned int result = 0; unsigned int result = 0;
for (auto& pair: books) { for (auto& pair: books) {
auto& book = pair.second; auto& book = pair.second;
if ((!book.path.empty() && localBooks) if ((!book.path().empty() && localBooks)
|| (book.path.empty() && remoteBooks)) { || (book.path().empty() && remoteBooks)) {
result++; result++;
} }
} }
@ -188,8 +192,8 @@ Library Library::filter(const std::string& search) {
for(auto& pair:books) { for(auto& pair:books) {
auto& book = pair.second; auto& book = pair.second;
if (matchRegex(book.title, "\\Q" + search + "\\E") if (matchRegex(book.title(), "\\Q" + search + "\\E")
|| matchRegex(book.description, "\\Q" + search + "\\E")) { || matchRegex(book.description(), "\\Q" + search + "\\E")) {
library.addBook(book); library.addBook(book);
} }
} }
@ -209,76 +213,69 @@ bool Library::writeToFile(const std::string& path) {
/* Add each book */ /* Add each book */
for (auto& pair: books) { for (auto& pair: books) {
auto& book = pair.second; auto& book = pair.second;
if (!book.readOnly) { if (!book.readOnly()) {
pugi::xml_node bookNode = libraryNode.append_child("book"); pugi::xml_node bookNode = libraryNode.append_child("book");
bookNode.append_attribute("id") = book.id.c_str(); bookNode.append_attribute("id") = book.id().c_str();
if (!book.path.empty()) { if (!book.path().empty()) {
bookNode.append_attribute("path") = book.path.c_str(); bookNode.append_attribute("path") = computeRelativePath(
removeLastPathElement(path, true, false), book.path()).c_str();
} }
if (!book.last.empty() && book.last != "undefined") { if (!book.indexPath().empty()) {
bookNode.append_attribute("last") = book.last.c_str(); bookNode.append_attribute("indexPath") = computeRelativePath(
removeLastPathElement(path, true, false), book.indexPath()).c_str();
bookNode.append_attribute("indexType") = "xapian";
} }
if (!book.indexPath.empty()) if (book.origId().empty()) {
bookNode.append_attribute("indexPath") = book.indexPath.c_str(); if (!book.title().empty())
bookNode.append_attribute("title") = book.title().c_str();
if (!book.indexPath.empty() || !book.indexPathAbsolute.empty()) { if (!book.name().empty())
if (book.indexType == XAPIAN) { bookNode.append_attribute("name") = book.name().c_str();
bookNode.append_attribute("indexType") = "xapian";
}
}
if (book.origId.empty()) { if (!book.tags().empty())
if (!book.title.empty()) bookNode.append_attribute("tags") = book.tags().c_str();
bookNode.append_attribute("title") = book.title.c_str();
if (!book.name.empty()) if (!book.description().empty())
bookNode.append_attribute("name") = book.name.c_str(); bookNode.append_attribute("description") = book.description().c_str();
if (!book.tags.empty()) if (!book.language().empty())
bookNode.append_attribute("tags") = book.tags.c_str(); bookNode.append_attribute("language") = book.language().c_str();
if (!book.description.empty()) if (!book.creator().empty())
bookNode.append_attribute("description") = book.description.c_str(); bookNode.append_attribute("creator") = book.creator().c_str();
if (!book.language.empty()) if (!book.publisher().empty())
bookNode.append_attribute("language") = book.language.c_str(); bookNode.append_attribute("publisher") = book.publisher().c_str();
if (!book.creator.empty()) if (!book.favicon().empty())
bookNode.append_attribute("creator") = book.creator.c_str(); bookNode.append_attribute("favicon") = book.favicon().c_str();
if (!book.publisher.empty()) if (!book.faviconMimeType().empty())
bookNode.append_attribute("publisher") = book.publisher.c_str();
if (!book.favicon.empty())
bookNode.append_attribute("favicon") = book.favicon.c_str();
if (!book.faviconMimeType.empty())
bookNode.append_attribute("faviconMimeType") bookNode.append_attribute("faviconMimeType")
= book.faviconMimeType.c_str(); = book.faviconMimeType().c_str();
} else {
bookNode.append_attribute("origId") = book.origId().c_str();
} }
if (!book.date.empty()) { if (!book.date().empty()) {
bookNode.append_attribute("date") = book.date.c_str(); bookNode.append_attribute("date") = book.date().c_str();
} }
if (!book.url.empty()) { if (!book.url().empty()) {
bookNode.append_attribute("url") = book.url.c_str(); bookNode.append_attribute("url") = book.url().c_str();
} }
if (!book.origId.empty()) if (!book.articleCount())
bookNode.append_attribute("origId") = book.origId.c_str(); bookNode.append_attribute("articleCount") = to_string(book.articleCount()).c_str();
if (!book.articleCount.empty()) if (!book.mediaCount())
bookNode.append_attribute("articleCount") = book.articleCount.c_str(); bookNode.append_attribute("mediaCount") = to_string(book.mediaCount()).c_str();
if (!book.mediaCount.empty()) if (!book.size()) {
bookNode.append_attribute("mediaCount") = book.mediaCount.c_str(); bookNode.append_attribute("size") = to_string(book.size()).c_str();
if (!book.size.empty()) {
bookNode.append_attribute("size") = book.size.c_str();
} }
} }
} }
@ -294,10 +291,11 @@ std::vector<std::string> Library::getBooksLanguages()
for (auto& pair: books) { for (auto& pair: books) {
auto& book = pair.second; auto& book = pair.second;
if (booksLanguagesMap.find(book.language) == booksLanguagesMap.end()) { auto& language = book.language();
if (book.origId.empty()) { if (booksLanguagesMap.find(language) == booksLanguagesMap.end()) {
booksLanguagesMap[book.language] = true; if (book.origId().empty()) {
booksLanguages.push_back(book.language); booksLanguagesMap[language] = true;
booksLanguages.push_back(language);
} }
} }
} }
@ -312,10 +310,11 @@ std::vector<std::string> Library::getBooksCreators()
for (auto& pair: books) { for (auto& pair: books) {
auto& book = pair.second; auto& book = pair.second;
if (booksCreatorsMap.find(book.creator) == booksCreatorsMap.end()) { auto& creator = book.creator();
if (book.origId.empty()) { if (booksCreatorsMap.find(creator) == booksCreatorsMap.end()) {
booksCreatorsMap[book.creator] = true; if (book.origId().empty()) {
booksCreators.push_back(book.creator); booksCreatorsMap[creator] = true;
booksCreators.push_back(creator);
} }
} }
} }
@ -341,10 +340,11 @@ std::vector<std::string> Library::getBooksPublishers()
for (auto& pair:books) { for (auto& pair:books) {
auto& book = pair.second; auto& book = pair.second;
if (booksPublishersMap.find(book.publisher) == booksPublishersMap.end()) { auto& publisher = book.publisher();
if (book.origId.empty()) { if (booksPublishersMap.find(publisher) == booksPublishersMap.end()) {
booksPublishersMap[book.publisher] = true; if (book.origId().empty()) {
booksPublishers.push_back(book.publisher); booksPublishersMap[publisher] = true;
booksPublishers.push_back(publisher);
} }
} }
} }

177
src/manager.cpp
View File

@ -43,38 +43,46 @@ bool Manager::parseXmlDom(const pugi::xml_document& doc,
bool ok = true; bool ok = true;
kiwix::Book book; kiwix::Book book;
book.readOnly = readOnly; book.setReadOnly(readOnly);
book.id = bookNode.attribute("id").value(); book.setId(bookNode.attribute("id").value());
book.path = bookNode.attribute("path").value(); std::string path = bookNode.attribute("path").value();
book.last = (std::string(bookNode.attribute("last").value()) != "undefined" if (isRelativePath(path)) {
path = computeAbsolutePath(
removeLastPathElement(libraryPath, true, false), path);
}
book.setPath(path);
book.setLast(std::string(bookNode.attribute("last").value()) != "undefined"
? bookNode.attribute("last").value() ? bookNode.attribute("last").value()
: ""); : "");
book.indexPath = bookNode.attribute("indexPath").value(); std::string indexPath = bookNode.attribute("indexPath").value();
book.indexType = XAPIAN; if (isRelativePath(indexPath)) {
book.title = bookNode.attribute("title").value(); indexPath = computeAbsolutePath(
book.name = bookNode.attribute("name").value(); removeLastPathElement(libraryPath, true, false), indexPath);
book.tags = bookNode.attribute("tags").value(); }
book.description = bookNode.attribute("description").value(); book.setIndexPath(indexPath);
book.language = bookNode.attribute("language").value(); book.setIndexType(XAPIAN);
book.date = bookNode.attribute("date").value(); book.setTitle(bookNode.attribute("title").value());
book.creator = bookNode.attribute("creator").value(); book.setName(bookNode.attribute("name").value());
book.publisher = bookNode.attribute("publisher").value(); book.setTags(bookNode.attribute("tags").value());
book.url = bookNode.attribute("url").value(); book.setDescription(bookNode.attribute("description").value());
book.origId = bookNode.attribute("origId").value(); book.setLanguage(bookNode.attribute("language").value());
book.articleCount = bookNode.attribute("articleCount").value(); book.setDate(bookNode.attribute("date").value());
book.mediaCount = bookNode.attribute("mediaCount").value(); book.setCreator(bookNode.attribute("creator").value());
book.size = bookNode.attribute("size").value(); book.setPublisher(bookNode.attribute("publisher").value());
book.favicon = bookNode.attribute("favicon").value(); book.setUrl(bookNode.attribute("url").value());
book.faviconMimeType = bookNode.attribute("faviconMimeType").value(); book.setOrigId(bookNode.attribute("origId").value());
book.setArticleCount(strtoull(bookNode.attribute("articleCount").value(), 0, 0));
/* Check absolute and relative paths */ book.setMediaCount(strtoull(bookNode.attribute("mediaCount").value(), 0, 0));
this->checkAndCleanBookPaths(book, libraryPath); book.setSize(strtoull(bookNode.attribute("size").value(), 0, 0));
book.setFavicon(bookNode.attribute("favicon").value());
book.setFaviconMimeType(bookNode.attribute("faviconMimeType").value());
/* Update the book properties with the new importer */ /* Update the book properties with the new importer */
if (libraryVersion.empty() if (libraryVersion.empty()
|| atoi(libraryVersion.c_str()) <= atoi(KIWIX_LIBRARY_VERSION)) { || atoi(libraryVersion.c_str()) <= atoi(KIWIX_LIBRARY_VERSION)) {
if (!book.path.empty()) { ok = false;
ok = this->readBookFromPath(book.pathAbsolute); if (!book.path().empty()) {
ok = this->readBookFromPath(book.path());
} }
} }
@ -111,13 +119,13 @@ bool Manager::parseOpdsDom(const pugi::xml_document& doc, const std::string& url
entryNode = entryNode.next_sibling("entry")) { entryNode = entryNode.next_sibling("entry")) {
kiwix::Book book; kiwix::Book book;
book.readOnly = false; book.setReadOnly(false);
book.id = entryNode.child("id").child_value(); book.setId(entryNode.child("id").child_value());
book.title = entryNode.child("title").child_value(); book.setTitle(entryNode.child("title").child_value());
book.description = entryNode.child("summary").child_value(); book.setDescription(entryNode.child("summary").child_value());
book.language = entryNode.child("language").child_value(); book.setLanguage(entryNode.child("language").child_value());
book.date = entryNode.child("updated").child_value(); book.setDate(entryNode.child("updated").child_value());
book.creator = entryNode.child("author").child("name").child_value(); book.setCreator(entryNode.child("author").child("name").child_value());
for(pugi::xml_node linkNode = entryNode.child("link"); linkNode; for(pugi::xml_node linkNode = entryNode.child("link"); linkNode;
linkNode = linkNode.next_sibling("link")) { linkNode = linkNode.next_sibling("link")) {
std::string rel = linkNode.attribute("rel").value(); std::string rel = linkNode.attribute("rel").value();
@ -128,14 +136,14 @@ bool Manager::parseOpdsDom(const pugi::xml_document& doc, const std::string& url
auto fileHandle = downloader.download(faviconUrl); auto fileHandle = downloader.download(faviconUrl);
if (fileHandle.success) { if (fileHandle.success) {
auto content = getFileContent(fileHandle.path); auto content = getFileContent(fileHandle.path);
book.favicon = base64_encode((const unsigned char*)content.data(), content.size()); book.setFavicon(base64_encode((const unsigned char*)content.data(), content.size()));
book.faviconMimeType = linkNode.attribute("type").value(); book.setFaviconMimeType(linkNode.attribute("type").value());
} else { } else {
std::cerr << "Cannot get favicon content from " << faviconUrl << std::endl; std::cerr << "Cannot get favicon content from " << faviconUrl << std::endl;
} }
} else if (rel == "http://opds-spec.org/acquisition/open-access") { } else if (rel == "http://opds-spec.org/acquisition/open-access") {
book.url = linkNode.attribute("href").value(); book.setUrl(linkNode.attribute("href").value());
} }
} }
@ -203,21 +211,19 @@ string Manager::addBookFromPathAndGetId(const string pathToOpen,
if (this->readBookFromPath(pathToOpen, &book)) { if (this->readBookFromPath(pathToOpen, &book)) {
if (pathToSave != pathToOpen) { if (pathToSave != pathToOpen) {
book.path = pathToSave; book.setPath(isRelativePath(pathToSave)
book.pathAbsolute
= isRelativePath(pathToSave)
? computeAbsolutePath( ? computeAbsolutePath(
removeLastPathElement(writableLibraryPath, true, false), removeLastPathElement(writableLibraryPath, true, false),
pathToSave) pathToSave)
: pathToSave; : pathToSave);
} }
if (!checkMetaData if (!checkMetaData
|| (checkMetaData && !book.title.empty() && !book.language.empty() || (checkMetaData && !book.title().empty() && !book.language().empty()
&& !book.date.empty())) { && !book.date().empty())) {
book.url = url; book.setUrl(url);
library.addBook(book); library->addBook(book);
return book.id; return book.id();
} }
} }
@ -242,37 +248,28 @@ bool Manager::readBookFromPath(const string path, kiwix::Book* book)
kiwix::Reader* reader = new kiwix::Reader(path); kiwix::Reader* reader = new kiwix::Reader(path);
if (book != NULL) { if (book != NULL) {
book->path = path; book->setPath(path);
book->pathAbsolute = path; book->setId(reader->getId());
book->id = reader->getId(); book->setDescription(reader->getDescription());
book->description = reader->getDescription(); book->setLanguage(reader->getLanguage());
book->language = reader->getLanguage(); book->setDate(reader->getDate());
book->date = reader->getDate(); book->setCreator(reader->getCreator());
book->creator = reader->getCreator(); book->setPublisher(reader->getPublisher());
book->publisher = reader->getPublisher(); book->setTitle(reader->getTitle());
book->title = reader->getTitle(); book->setName(reader->getName());
book->name = reader->getName(); book->setTags(reader->getTags());
book->tags = reader->getTags(); book->setOrigId(reader->getOrigId());
book->origId = reader->getOrigId(); book->setArticleCount(reader->getArticleCount());
std::ostringstream articleCountStream; book->setMediaCount(reader->getMediaCount());
articleCountStream << reader->getArticleCount(); book->setSize(reader->getFileSize());
book->articleCount = articleCountStream.str();
std::ostringstream mediaCountStream;
mediaCountStream << reader->getMediaCount();
book->mediaCount = mediaCountStream.str();
ostringstream convert;
convert << reader->getFileSize();
book->size = convert.str();
string favicon; string favicon;
string faviconMimeType; string faviconMimeType;
if (reader->getFavicon(favicon, faviconMimeType)) { if (reader->getFavicon(favicon, faviconMimeType)) {
book->favicon = base64_encode( book->setFavicon(base64_encode(
reinterpret_cast<const unsigned char*>(favicon.c_str()), reinterpret_cast<const unsigned char*>(favicon.c_str()),
favicon.length()); favicon.length()));
book->faviconMimeType = faviconMimeType; book->setFaviconMimeType(faviconMimeType);
} }
} }
@ -306,13 +303,12 @@ bool Manager::setBookIndex(const string id,
const supportedIndexType type) const supportedIndexType type)
try { try {
auto book = library.getBookById(id); auto book = library.getBookById(id);
book.indexPath = path; book.setIndexPath(isRelativePath(path)
book.indexPathAbsolute = isRelativePath(path)
? computeAbsolutePath( ? computeAbsolutePath(
removeLastPathElement(writableLibraryPath, true, false), removeLastPathElement(writableLibraryPath, true, false),
path) path)
: path; : path);
book.indexType = type; book.setIndexType(type);
return true; return true;
} catch (...) { } catch (...) {
return false; return false;
@ -321,41 +317,14 @@ try {
bool Manager::setBookPath(const string id, const string path) bool Manager::setBookPath(const string id, const string path)
try { try {
auto book = library.getBookById(id); auto book = library.getBookById(id);
book.path = path; book.setPath(isRelativePath(path)
book.pathAbsolute = isRelativePath(path)
? computeAbsolutePath( ? computeAbsolutePath(
removeLastPathElement(writableLibraryPath, true, false), removeLastPathElement(writableLibraryPath, true, false),
path) path)
: path; : path);
return true; return true;
} catch(...) { } catch(...) {
return false; return false;
} }
void Manager::checkAndCleanBookPaths(Book& book, const string& libraryPath)
{
if (!book.path.empty()) {
if (isRelativePath(book.path)) {
book.pathAbsolute = computeAbsolutePath(
removeLastPathElement(libraryPath, true, false), book.path);
} else {
book.pathAbsolute = book.path;
book.path = computeRelativePath(
removeLastPathElement(libraryPath, true, false), book.pathAbsolute);
}
}
if (!book.indexPath.empty()) {
if (isRelativePath(book.indexPath)) {
book.indexPathAbsolute = computeAbsolutePath(
removeLastPathElement(libraryPath, true, false), book.indexPath);
} else {
book.indexPathAbsolute = book.indexPath;
book.indexPath
= computeRelativePath(removeLastPathElement(libraryPath, true, false),
book.indexPathAbsolute);
}
}
}
} }

16
src/opds_dumper.cpp
View File

@ -54,30 +54,30 @@ std::string gen_date_str()
pugi::xml_node OPDSDumper::handleBook(Book book, pugi::xml_node root_node) { pugi::xml_node OPDSDumper::handleBook(Book book, pugi::xml_node root_node) {
auto entry_node = root_node.append_child("entry"); auto entry_node = root_node.append_child("entry");
ADD_TEXT_ENTRY(entry_node, "title", book.title); ADD_TEXT_ENTRY(entry_node, "title", book.title());
ADD_TEXT_ENTRY(entry_node, "id", "urn:uuid:"+book.id); ADD_TEXT_ENTRY(entry_node, "id", "urn:uuid:"+book.id());
ADD_TEXT_ENTRY(entry_node, "icon", rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath()); ADD_TEXT_ENTRY(entry_node, "icon", rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath());
ADD_TEXT_ENTRY(entry_node, "updated", date); ADD_TEXT_ENTRY(entry_node, "updated", date);
ADD_TEXT_ENTRY(entry_node, "summary", book.description); ADD_TEXT_ENTRY(entry_node, "summary", book.description());
auto content_node = entry_node.append_child("link"); auto content_node = entry_node.append_child("link");
content_node.append_attribute("type") = "text/html"; content_node.append_attribute("type") = "text/html";
content_node.append_attribute("href") = (rootLocation + "/" + book.getHumanReadableIdFromPath()).c_str(); content_node.append_attribute("href") = (rootLocation + "/" + book.getHumanReadableIdFromPath()).c_str();
auto author_node = entry_node.append_child("author"); auto author_node = entry_node.append_child("author");
ADD_TEXT_ENTRY(author_node, "name", book.creator); ADD_TEXT_ENTRY(author_node, "name", book.creator());
if (! book.url.empty()) { if (! book.url().empty()) {
auto acquisition_link = entry_node.append_child("link"); auto acquisition_link = entry_node.append_child("link");
acquisition_link.append_attribute("rel") = "http://opds-spec.org/acquisition/open-access"; acquisition_link.append_attribute("rel") = "http://opds-spec.org/acquisition/open-access";
acquisition_link.append_attribute("type") = "application/x-zim"; acquisition_link.append_attribute("type") = "application/x-zim";
acquisition_link.append_attribute("href") = book.url.c_str(); acquisition_link.append_attribute("href") = book.url().c_str();
} }
if (! book.faviconMimeType.empty() ) { if (! book.faviconMimeType().empty() ) {
auto image_link = entry_node.append_child("link"); auto image_link = entry_node.append_child("link");
image_link.append_attribute("rel") = "http://opds-spec.org/image/thumbnail"; image_link.append_attribute("rel") = "http://opds-spec.org/image/thumbnail";
image_link.append_attribute("type") = book.faviconMimeType.c_str(); image_link.append_attribute("type") = book.faviconMimeType().c_str();
image_link.append_attribute("href") = (rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath()).c_str(); image_link.append_attribute("href") = (rootLocation + "/meta?name=favicon&content=" + book.getHumanReadableIdFromPath()).c_str();
} }
return entry_node; return entry_node;