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

Remove function to read file using a native path. 

All path must be utf8. This is already the case in all our project.
(If this not the case, this is a bug)

So we don't need to have a version with a native and utf8 path.
This commit is contained in:
Matthieu Gautier 2020-01-13 16:59:58 +01:00
parent 5540149e2b
commit 91db055d86
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/manager.h
View File

@ -69,27 +69,13 @@ class Manager
/** /**
* Read a `library.xml` and add book in the file to the library. * Read a `library.xml` and add book in the file to the library.
* *
* @param path The path to the `library.xml`. * @param path The (utf8) path to the `library.xml`.
* @param readOnly Set if the libray path could be overwritten latter with * @param readOnly Set if the libray path could be overwritten latter with
* updated content. * updated content.
* @return True if file has been properly parsed. * @return True if file has been properly parsed.
*/ */
bool readFile(const std::string& path, const bool readOnly = true); bool readFile(const std::string& path, const bool readOnly = true);
/**
* Read a `library.xml` and add book in the file to the library.
*
* @param nativePath The path of the `library.xml`
* @param UTF8Path The utf8 version (?) of the path. Also the path where the
* library will be writen i readOnly is False.
* @param readOnly Set if the libray path could be overwritten latter with
* updated content.
* @return True if file has been properly parsed.
*/
bool readFile(const std::string& nativePath,
const std::string& UTF8Path,
const bool readOnly = true);
/** /**
* Load a library content store in the string. * Load a library content store in the string.
* *

15
src/manager.cpp
View File

@ -137,25 +137,18 @@ bool Manager::readOpds(const std::string& content, const std::string& urlHost)
} }
bool Manager::readFile(const std::string& path, const bool readOnly) bool Manager::readFile(const std::string& path, const bool readOnly)
{
return this->readFile(path, path, readOnly);
}
bool Manager::readFile(const std::string& nativePath,
const std::string& UTF8Path,
const bool readOnly)
{ {
bool retVal = true; bool retVal = true;
pugi::xml_document doc; pugi::xml_document doc;
#ifdef _WIN32 #ifdef _WIN32
pugi::xml_parse_result result = doc.load_file(Utf8ToWide(nativePath).c_str()); pugi::xml_parse_result result = doc.load_file(Utf8ToWide(path).c_str());
#else #else
pugi::xml_parse_result result = doc.load_file(nativePath.c_str()); pugi::xml_parse_result result = doc.load_file(path.c_str());
#endif #endif
if (result) { if (result) {
this->parseXmlDom(doc, readOnly, UTF8Path); this->parseXmlDom(doc, readOnly, path);
} else { } else {
retVal = false; retVal = false;
} }
@ -164,7 +157,7 @@ bool Manager::readFile(const std::string& nativePath,
* able to know where to save the library if new content are * able to know where to save the library if new content are
* available */ * available */
if (!readOnly) { if (!readOnly) {
this->writableLibraryPath = UTF8Path; this->writableLibraryPath = path;
} }
return retVal; return retVal;