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

+ better deal with relative/absolute paths

This commit is contained in:
kelson42 2013-08-05 19:08:50 +08:00
parent cb95e1f2ee
commit 34d69ae2c2
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/kiwix/manager.cpp
View File

@ -66,9 +66,9 @@ namespace kiwix {
this->checkAndCleanBookPaths(book, libraryPath);
/* Update the book properties with the new importer */
if (libraryVersion.empty() || atoi(libraryVersion.c_str()) < atoi(KIWIX_LIBRARY_VERSION)) {
if (libraryVersion.empty() || atoi(libraryVersion.c_str()) <= atoi(KIWIX_LIBRARY_VERSION)) {
if (!book.path.empty()) {
ok = this->readBookFromPath(book.pathAbsolute, book);
ok = this->readBookFromPath(book.pathAbsolute);
}
}
@ -226,7 +226,7 @@ namespace kiwix {
const string url, const bool checkMetaData) {
kiwix::Book book;
if (this->readBookFromPath(pathToOpen, book)) {
if (this->readBookFromPath(pathToOpen, &book)) {
if (pathToSave != pathToOpen) {
book.path = pathToSave;
@ -250,35 +250,38 @@ namespace kiwix {
return !(this->addBookFromPathAndGetId(pathToOpen, pathToSave, url, checkMetaData).empty());
}
bool Manager::readBookFromPath(const string path, kiwix::Book &book) {
bool Manager::readBookFromPath(const string path, kiwix::Book *book) {
try {
kiwix::Reader *reader = new kiwix::Reader(path);
book.path = path;
book.pathAbsolute = path;
book.id = reader->getId();
book.description = reader->getDescription();
book.language = reader->getLanguage();
book.date = reader->getDate();
book.creator = reader->getCreator();
book.publisher = reader->getPublisher();
book.title = reader->getTitle();
if (book != NULL) {
book->path = path;
book->pathAbsolute = path;
book->id = reader->getId();
book->description = reader->getDescription();
book->language = reader->getLanguage();
book->date = reader->getDate();
book->creator = reader->getCreator();
book->publisher = reader->getPublisher();
book->title = reader->getTitle();
std::ostringstream articleCountStream;
articleCountStream << reader->getArticleCount();
book.articleCount = articleCountStream.str();
book->articleCount = articleCountStream.str();
std::ostringstream mediaCountStream;
mediaCountStream << reader->getMediaCount();
book.mediaCount = mediaCountStream.str();
book->mediaCount = mediaCountStream.str();
ostringstream convert; convert << reader->getFileSize();
book.size = convert.str();
book->size = convert.str();
string favicon;
string faviconMimeType;
if (reader->getFavicon(favicon, faviconMimeType)) {
book.favicon = base64_encode(reinterpret_cast<const unsigned char*>(favicon.c_str()), favicon.length());
book.faviconMimeType = faviconMimeType;
book->favicon = base64_encode(reinterpret_cast<const unsigned char*>(favicon.c_str()), favicon.length());
book->faviconMimeType = faviconMimeType;
}
}
delete reader;

2
src/common/kiwix/manager.h
View File

@ -79,7 +79,7 @@ namespace kiwix {
protected:
kiwix::Library library;
bool readBookFromPath(const string path, Book &book);
bool readBookFromPath(const string path, Book *book = NULL);
bool parseXmlDom(const pugi::xml_document &doc, const bool readOnly, const string libraryPath);
private: