From a2e4ecc9f5e6f2db3346d9dcc7752413be95fb46 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Thu, 21 Jul 2011 12:13:44 +0000 Subject: [PATCH] + kiwix-manage is not able anymore to add ZIM file without title || date || language metadata --- src/common/kiwix/manager.cpp | 12 ++++++++---- src/common/kiwix/manager.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/common/kiwix/manager.cpp b/src/common/kiwix/manager.cpp index 0e1899f13..2e866232d 100644 --- a/src/common/kiwix/manager.cpp +++ b/src/common/kiwix/manager.cpp @@ -188,13 +188,17 @@ namespace kiwix { return library.current; } - bool Manager::addBookFromPath(const string path, const string url) { + bool Manager::addBookFromPath(const string path, const string url, const bool checkMetaData) { kiwix::Book book; if (this->readBookFromPath(path, book)) { - book.url = url; - library.addBook(book); - return true; + + if (!checkMetaData || + checkMetaData && !book.title.empty() && !book.language.empty() && !book.date.empty()) { + book.url = url; + library.addBook(book); + return true; + } } return false; diff --git a/src/common/kiwix/manager.h b/src/common/kiwix/manager.h index f6294860d..fc5fe7d9c 100644 --- a/src/common/kiwix/manager.h +++ b/src/common/kiwix/manager.h @@ -55,7 +55,7 @@ namespace kiwix { bool setBookIndex(const string id, const string path, const supportedIndexType type); bool setBookPath(const string id, const string path); string getCurrentBookId(); - bool addBookFromPath(const string path, const string url = ""); + bool addBookFromPath(const string path, const string url = "", const bool checkMetaData = false); Library cloneLibrary(); bool getBookById(const string id, Book &book); bool updateBookLastOpenDateById(const string id);