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

+ better deal with accented paths

This commit is contained in:
kelson42 2011-09-05 19:21:58 +00:00
parent 6959085e3c
commit cf07bf827b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,20 +253,20 @@ namespace kiwix {
bool Manager::addBookFromPath(const string pathToOpen, const string pathToSave, const string url, const bool checkMetaData) { bool Manager::addBookFromPath(const string pathToOpen, const string pathToSave, const string url, const bool checkMetaData) {
kiwix::Book book; kiwix::Book book;
if (this->readBookFromPath(pathToOpen, book)) { if (this->readBookFromPath(pathToOpen, book)) {
if (!pathToSave.empty() && pathToSave != pathToOpen) {
book.path = pathToSave;
book.pathAbsolute = pathToSave;
}
if (!checkMetaData || if (!checkMetaData ||
checkMetaData && !book.title.empty() && !book.language.empty() && !book.date.empty()) { checkMetaData && !book.title.empty() && !book.language.empty() && !book.date.empty()) {
book.url = url; book.url = url;
library.addBook(book); library.addBook(book);
return true; return true;
} }
if (!pathToSave.empty() && pathToSave != pathToOpen) {
book.path = pathToSave;
book.pathAbsolute = pathToSave;
}
} }
return false; return false;