atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add API to get home path

Browse Source
This commit is contained in:
Edouard DUPIN 2017-01-03 21:10:02 +01:00
parent 1c79ae4a3f
commit 98ee57a69f
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etk/os/FSNode.cpp
View File

@ -89,8 +89,6 @@ extern "C" {
} }
#endif #endif
std::string etk::simplifyPath(std::string _input) { std::string etk::simplifyPath(std::string _input) {
// step 1 : for windows change \ in /: // step 1 : for windows change \ in /:
TK_DEBUG("Simplify(1) : '" << _input << "'"); TK_DEBUG("Simplify(1) : '" << _input << "'");
@ -317,6 +315,10 @@ std::string etk::FSNodeGetApplicationPath() {
return baseApplPath; return baseApplPath;
} }
std::string etk::FSNodeGetHomePath() {
return baseFolderHome;
}
#ifdef HAVE_ZIP_DATA #ifdef HAVE_ZIP_DATA
static etk::Archive* s_APKArchive = nullptr; static etk::Archive* s_APKArchive = nullptr;
static void loadAPK(const std::string& _apkPath) { static void loadAPK(const std::string& _apkPath) {
@ -2473,8 +2475,8 @@ bool etk::FSNodeExist(const std::string& _path) {
bool etk::FSNodeMove(const std::string& _path1, const std::string& _path2) { bool etk::FSNodeMove(const std::string& _path1, const std::string& _path2) {
etk::FSNode tmpNode(_path1); etk::FSNode tmpNode(_path1);
if (false==tmpNode.exist()) { if (tmpNode.exist() == false) {
TK_DEBUG("try to move un existant file \"" << _path1 << "\""); TK_DEBUG("try to move un existant file '" << _path1 << "'");
return false; return false;
} }
// no check error in every case // no check error in every case
@ -2550,13 +2552,13 @@ bool etk::FSNodeTouch(const std::string& _path) {
bool etk::FSNodeEcho(const std::string& _path, const std::string& _dataTowrite) { bool etk::FSNodeEcho(const std::string& _path, const std::string& _dataTowrite) {
etk::FSNode tmpNode(_path); etk::FSNode tmpNode(_path);
if (false==tmpNode.exist()) { if (tmpNode.exist() == false) {
return false; return false;
} }
if (typeNode_folder==tmpNode.getNodeType()) { if (tmpNode.getNodeType() == typeNode_folder) {
return false; return false;
} }
if (false==tmpNode.fileOpenWrite()) { if (tmpNode.fileOpenWrite() == false) {
return false; return false;
} }
// convert in UTF8 : // convert in UTF8 :
@ -2574,13 +2576,13 @@ bool etk::FSNodeEcho(const std::string& _path, const std::string& _dataTowrite)
bool etk::FSNodeEchoAdd(const std::string& _path, const std::string& _dataTowrite) { bool etk::FSNodeEchoAdd(const std::string& _path, const std::string& _dataTowrite) {
etk::FSNode tmpNode(_path); etk::FSNode tmpNode(_path);
if (false==tmpNode.exist()) { if (tmpNode.exist() == false) {
return false; return false;
} }
if (typeNode_folder==tmpNode.getNodeType()) { if (tmpNode.getNodeType() == typeNode_folder) {
return false; return false;
} }
if (false==tmpNode.fileOpenAppend()) { if (tmpNode.fileOpenAppend() == false) {
return false; return false;
} }
// convert in UTF8 : // convert in UTF8 :
@ -2600,11 +2602,11 @@ void etk::FSNodeHistory(const std::string& _path, int32_t _historyCount) {
// step 1 : Move the file to prevent writing error // step 1 : Move the file to prevent writing error
//Get the first oldest save : //Get the first oldest save :
for (int32_t iii=_historyCount-1; iii>0 ; iii--) { for (int32_t iii=_historyCount-1; iii>0 ; iii--) {
if (true==etk::FSNodeExist(_path + "-" + etk::to_string(iii)) ) { if (etk::FSNodeExist(_path + "-" + etk::to_string(iii)) == true) {
etk::FSNodeMove(_path + "-" + etk::to_string(iii), _path + "-" + etk::to_string(iii+1)); etk::FSNodeMove(_path + "-" + etk::to_string(iii), _path + "-" + etk::to_string(iii+1));
} }
} }
if (true==etk::FSNodeExist(_path) ) { if (etk::FSNodeExist(_path) == true) {
etk::FSNodeMove(_path, _path + "-1"); etk::FSNodeMove(_path, _path + "-1");
} }
} }

5
etk/os/FSNode.hpp
View File

@ -57,6 +57,11 @@ namespace etk {
* @return The application path * @return The application path
*/ */
std::string FSNodeGetApplicationPath(); std::string FSNodeGetApplicationPath();
/**
* @brief Get the user Home path.
* @return The Home path: "~"
*/
std::string FSNodeGetHomePath();
/** /**
* @brief List of Type that a node can have (this wrap some type that not exist on Windows) * @brief List of Type that a node can have (this wrap some type that not exist on Windows)
*/ */