spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2026-06-22 22:23:49 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

修复安装默认配置时的bug

Browse Source
This commit is contained in:
RigoLigoRLC
2021-07-21 02:31:47 +08:00
parent 677cde3682
commit f7becc1a66
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spkstore.cpp
+19 -4
View File
@@ -23,16 +23,31 @@ SpkStore::SpkStore(bool aCli, QString &aLogPath)
Instance = this; Instance = this;
// Finish all essential initialization after this. // Finish all essential initialization after this.
if(QFileInfo(QDir::homePath() + "/.config/spark-store/config").exists())
mConfigPath = QDir::homePath() + "/.config/spark-store/config"; //TODO: flexible config via CLI
if(QFileInfo(mConfigPath).exists())
mCfg = new QSettings(QDir::homePath() + "/.config/spark-store/config", QSettings::IniFormat); mCfg = new QSettings(QDir::homePath() + "/.config/spark-store/config", QSettings::IniFormat);
else else
{ {
mCfg = new QSettings(":/info/default_config", QSettings::IniFormat); mCfg = new QSettings(":/info/default_config", QSettings::IniFormat);
#ifndef NDEBUG #if 0
bool cfgDirOk;
if(!qgetenv("SPARK_NO_INSTALL_CONFIG").toInt()) if(!qgetenv("SPARK_NO_INSTALL_CONFIG").toInt())
{ {
if(!QFile::copy(":/info/default_config", QDir::homePath() + "/.config/spark-store/config")) QString path = mConfigPath.section('/', 1, -2, QString::SectionIncludeLeadingSep);
sErrPop(tr("Cannot install default config file!")); if(!QDir().exists(path))
{
if(!QDir().mkpath(path))
sErrPop(QObject::tr("Config directory \"%1\" cannot be created.").arg(path));
else
cfgDirOk = true;
}
else
cfgDirOk = true;
if(cfgDirOk) // Only try copying if config dir is OK
if(!QFile::copy(":/info/default_config", QDir::homePath() + "/.config/spark-store/config"))
sErrPop(tr("Cannot install default config file!"));
} }
#endif #endif
} }