sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Temporary workaround for android data directory.

Browse Source
This commit is contained in:
lotodore
2012-04-22 11:22:55 +00:00
parent e9e320300c
commit e9b7eee156
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+15 -1
View File
@@ -107,7 +107,9 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
const char *homePath = getenv("HOME"); const char *homePath = getenv("HOME");
if(homePath) { if(homePath) {
configFileName = homePath; configFileName = homePath;
#ifndef ANDROID
configFileName += "/.pokerth/"; configFileName += "/.pokerth/";
#endif
////define log-dir ////define log-dir
logDir = configFileName; logDir = configFileName;
logDir += "log-files/"; logDir += "log-files/";
@@ -123,13 +125,20 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
mkdir(dataDir.c_str(), MODUS); mkdir(dataDir.c_str(), MODUS);
mkdir(cacheDir.c_str(), MODUS); mkdir(cacheDir.c_str(), MODUS);
} }
#ifdef ANDROID
// TODO temporarily use sdcard for data files.
dataDir = "/sdcard/pokerth/data/";
#endif
#endif #endif
ostringstream tempIntToString; ostringstream tempIntToString;
tempIntToString << configRev; tempIntToString << configRev;
configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str())); configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str()));
#ifdef ANDROID
configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, "/sdcard/pokerth/data/"));
#else
configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, myQtToolsInterface->getDataPathStdString(myArgv0))); configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, myQtToolsInterface->getDataPathStdString(myArgv0)));
#endif
configList.push_back(ConfigInfo("Language", CONFIG_TYPE_INT, myQtToolsInterface->getDefaultLanguage())); configList.push_back(ConfigInfo("Language", CONFIG_TYPE_INT, myQtToolsInterface->getDefaultLanguage()));
/*configList.push_back(ConfigInfo("InternetServerAddressIRCChannelUpdateDone", CONFIG_TYPE_INT, "1"));*/ //HACK /*configList.push_back(ConfigInfo("InternetServerAddressIRCChannelUpdateDone", CONFIG_TYPE_INT, "1"));*/ //HACK
configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1"));
@@ -314,8 +323,13 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
const char *tmpStr = confAppDataPath->Attribute("value"); const char *tmpStr = confAppDataPath->Attribute("value");
if (tmpStr) tempAppDataPath = tmpStr; if (tmpStr) tempAppDataPath = tmpStr;
//if appdatapath changes directly update it here not in UpdateConfig() //if appdatapath changes directly update it here not in UpdateConfig()
#ifdef ANDROID
if(tempAppDataPath != "/sdcard/pokerth/data/") {
confAppDataPath->SetAttribute("value", "/sdcard/pokerth/data/");
#else
if(tempAppDataPath != myQtToolsInterface->getDataPathStdString(myArgv0)) { if(tempAppDataPath != myQtToolsInterface->getDataPathStdString(myArgv0)) {
confAppDataPath->SetAttribute("value", myQtToolsInterface->stringToUtf8(myQtToolsInterface->getDataPathStdString(myArgv0))); confAppDataPath->SetAttribute("value", myQtToolsInterface->stringToUtf8(myQtToolsInterface->getDataPathStdString(myArgv0)));
#endif
doc.SaveFile( configFileName ); doc.SaveFile( configFileName );
} }
} }