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

[DEV] add an API to get real path of a FSNode

Browse Source
This commit is contained in:
Edouard DUPIN 2014-10-10 23:25:39 +02:00
parent fbc89d59db
commit 73f816c19c
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etk/log.cpp
View File

@ -78,6 +78,10 @@ enum etk::log::level& getDefaultLevel() {
return g_val; return g_val;
} }
int32_t& getsizeLog() {
static int32_t g_val = 5;
return g_val;
}
static std::vector<std::pair<std::string, enum etk::log::level>>& getList() { static std::vector<std::pair<std::string, enum etk::log::level>>& getList() {
static std::vector<std::pair<std::string, enum etk::log::level>> g_val; static std::vector<std::pair<std::string, enum etk::log::level>> g_val;
return g_val; return g_val;
@ -90,6 +94,9 @@ int32_t etk::log::registerInstance(const std::string& _name) {
} }
} }
getList().push_back(std::make_pair(_name, getDefaultLevel())); getList().push_back(std::make_pair(_name, getDefaultLevel()));
if (_name.size() >= getsizeLog()) {
getsizeLog() = _name.size()+1;
}
//std::cout << "register log : '" << _name << "'=" << getList().size()-1 << std::endl; //std::cout << "register log : '" << _name << "'=" << getList().size()-1 << std::endl;
return getList().size()-1; return getList().size()-1;
} }
@ -301,7 +308,7 @@ void etk::log::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char*
int32_t len = strlen(handle); int32_t len = strlen(handle);
strcat(pointer, getList()[_id].first.c_str()); strcat(pointer, getList()[_id].first.c_str());
pointer = handle+strlen(handle); pointer = handle+strlen(handle);
while (strlen(handle) - len < 8) { while (strlen(handle) - len < getsizeLog()) {
*pointer++ = ' '; *pointer++ = ' ';
*pointer = '\0'; *pointer = '\0';
} }

5
etk/os/FSNode.cpp
View File

@ -2034,3 +2034,8 @@ std::string etk::FSNodeReadAllData(const std::string& _path) {
node.fileClose(); node.fileClose();
return output; return output;
} }
std::string etk::FSNodeGetRealName(const std::string& _path) {
etk::FSNode node(_path);
return node.getFileSystemName();
}

6
etk/os/FSNode.h
View File

@ -709,6 +709,12 @@ namespace etk {
* @return all the data of the file in a string * @return all the data of the file in a string
*/ */
std::string FSNodeReadAllData(const std::string& _path); std::string FSNodeReadAllData(const std::string& _path);
/**
* @brief get the system name of the current path
* @param[in] _path "DATA:xxx" etk file name.
* @return return real file name "/aaa/bbb/ccc/xxx"
*/
std::string FSNodeGetRealName(const std::string& _path);
}; };
#endif #endif