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

Merge pull request #197 from kiwix/ensure_path_abs 

Ensure path abs
This commit is contained in:
Matthieu Gautier 2019-02-07 15:55:51 +01:00 committed by GitHub
parent ab94ac0ee8 35d812a5f7
commit 788d16ec01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/manager.cpp
View File

@ -208,12 +208,16 @@ bool Manager::addBookFromPath(const std::string& pathToOpen,
bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book) bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
{ {
std::string tmp_path = path;
if (isRelativePath(path)) {
tmp_path = computeAbsolutePath(getCurrentDirectory(), path);
}
try { try {
kiwix::Reader reader(path); kiwix::Reader reader(tmp_path);
book->update(reader); book->update(reader);
book->setPathValid(true); book->setPathValid(true);
} catch (const std::exception& e) { } catch (const std::exception& e) {
std::cerr << "Invalid " << path << " : " << e.what() << std::endl; std::cerr << "Invalid " << tmp_path << " : " << e.what() << std::endl;
book->setPathValid(false); book->setPathValid(false);
return false; return false;
} }

2
src/reader.cpp
View File

@ -241,8 +241,6 @@ Entry Reader::getMainPage() const
throw NoEntry(); throw NoEntry();
} }
string url = "";
zim::Article article; zim::Article article;
if (this->zimFileHandler->getFileheader().hasMainPage()) if (this->zimFileHandler->getFileheader().hasMainPage())
{ {