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

[DEBUG] correct on Android files

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-18 21:29:53 +02:00
parent 5588dbfdb2
commit 4393fdf060
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etk/os/FSNode.cpp
View File

@ -176,13 +176,18 @@ std::string etk::FSNodeGetApplicationName() {
#endif #endif
// for specific device contraint : // for specific device contraint :
void etk::setBaseFolderData(const char* _folder) { void etk::setBaseFolderData(const char* _folder, const char* _applName) {
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
{ {
std::unique_lock<std::mutex> lock(getNodeMutex()); std::unique_lock<std::mutex> lock(getNodeMutex());
baseFolderData = "assets/"; baseFolderData = "assets/";
if (_applName != nullptr) {
baseFolderData += _applName;
baseFolderData += "/";
}
s_fileAPK = _folder; s_fileAPK = _folder;
} }
TK_INFO("baseFolderData : '" << baseFolderData << "'");
loadAPK(s_fileAPK); loadAPK(s_fileAPK);
#else #else
TK_WARNING("Not Availlable Outside Android"); TK_WARNING("Not Availlable Outside Android");
@ -193,6 +198,7 @@ void etk::setBaseFolderDataUser(const char* _folder) {
std::unique_lock<std::mutex> lock(getNodeMutex()); std::unique_lock<std::mutex> lock(getNodeMutex());
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
baseFolderDataUser = _folder; baseFolderDataUser = _folder;
TK_INFO("baseFolderDataUser : '" << baseFolderDataUser << "'");
#else #else
TK_WARNING("Not Availlable Outside Android"); TK_WARNING("Not Availlable Outside Android");
#endif #endif
@ -202,6 +208,7 @@ void etk::setBaseFolderCache(const char* _folder) {
std::unique_lock<std::mutex> lock(getNodeMutex()); std::unique_lock<std::mutex> lock(getNodeMutex());
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
baseFolderCache = _folder; baseFolderCache = _folder;
TK_INFO("baseFolderCache : '" << baseFolderCache << "'");
#else #else
TK_WARNING("Not Availlable Outside Android"); TK_WARNING("Not Availlable Outside Android");
#endif #endif
@ -1351,7 +1358,7 @@ std::vector<etk::FSNode *> etk::FSNode::folderGetSubList(bool _showHidenFile, bo
if( m_type == etk::FSN_TYPE_DATA if( m_type == etk::FSN_TYPE_DATA
|| m_type == etk::FSN_TYPE_THEME_DATA) { || m_type == etk::FSN_TYPE_THEME_DATA) {
std::vector<std::string> listAdded; std::vector<std::string> listAdded;
std::string assetsName = "assets/"; std::string assetsName = baseFolderData;
std::string FolderName = getNameFolder(); std::string FolderName = getNameFolder();
if (s_APKArchive==NULL) { if (s_APKArchive==NULL) {
return tmpp; return tmpp;
@ -1444,7 +1451,7 @@ void etk::FSNode::folderGetRecursiveFiles(std::vector<std::string>& _output, boo
#ifdef HAVE_ZIP_DATA #ifdef HAVE_ZIP_DATA
if( m_type == etk::FSN_TYPE_DATA if( m_type == etk::FSN_TYPE_DATA
|| m_type == etk::FSN_TYPE_THEME_DATA) { || m_type == etk::FSN_TYPE_THEME_DATA) {
std::string assetsName = "assets/"; std::string assetsName = baseFolderData;
std::string FolderName = getNameFolder(); std::string FolderName = getNameFolder();
if (s_APKArchive==NULL) { if (s_APKArchive==NULL) {
return; return;

3
etk/os/FSNode.h
View File

@ -580,8 +580,9 @@ namespace etk {
/** /**
* @brief Set manualy the folder of the Data.(like /usr/shared/applName/ for linux) * @brief Set manualy the folder of the Data.(like /usr/shared/applName/ for linux)
* @param[in] _folder folder path of the cathegorie * @param[in] _folder folder path of the cathegorie
* @param[in] _applName Base name of the application
*/ */
void setBaseFolderData(const char* _folder); void setBaseFolderData(const char* _folder, const char* _applName=nullptr);
/** /**
* @brief Set the user data folder (like /home/machin/.local/applName/ for linux) * @brief Set the user data folder (like /home/machin/.local/applName/ for linux)
* @param[in] _folder folder path of the cathegorie * @param[in] _folder folder path of the cathegorie