generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 03:20:11 +01:00
Code Issues Projects Releases Wiki Activity

add new path values (configHome,cacheHome, etc) application config

Browse Source
This commit is contained in:
Björn Schramke
2014-10-09 17:48:42 +02:00
committed by Alex Fabijanic
parent b59329034f
commit b9259452a9
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Util/include/Poco/Util/Application.h
View File

@@ -369,6 +369,7 @@ private:
void getApplicationPath(Poco::Path& path) const; void getApplicationPath(Poco::Path& path) const;
void processOptions(); void processOptions();
bool findAppConfigFile(const std::string& appName, const std::string& extension, Poco::Path& path) const; bool findAppConfigFile(const std::string& appName, const std::string& extension, Poco::Path& path) const;
bool findAppConfigFile(const Path& basePath,const std::string& appName, const std::string& extension, Poco::Path& path) const;
typedef Poco::AutoPtr<LayeredConfiguration> ConfigPtr; typedef Poco::AutoPtr<LayeredConfiguration> ConfigPtr;

24
Util/src/Application.cpp
View File

@@ -166,6 +166,7 @@ void Application::init()
_pConfig->setString("application.dir", appPath.parent().toString()); _pConfig->setString("application.dir", appPath.parent().toString());
_pConfig->setString("application.configDir", Path::configHome() + appPath.getBaseName() + Path::separator()); _pConfig->setString("application.configDir", Path::configHome() + appPath.getBaseName() + Path::separator());
_pConfig->setString("application.cacheDir", Path::cacheHome() + appPath.getBaseName() + Path::separator()); _pConfig->setString("application.cacheDir", Path::cacheHome() + appPath.getBaseName() + Path::separator());
_pConfig->setString("application.tempDir", Path::tempHome() + appPath.getBaseName() + Path::separator());
_pConfig->setString("application.dataDir", Path::dataHome() + appPath.getBaseName() + Path::separator()); _pConfig->setString("application.dataDir", Path::dataHome() + appPath.getBaseName() + Path::separator());
processOptions(); processOptions();
} }
@@ -506,6 +507,29 @@ bool Application::findAppConfigFile(const std::string& appName, const std::strin
} }
bool Application::findAppConfigFile(const Path& basePath, const std::string& appName, const std::string& extension, Path& path) const
{
poco_assert (!appName.empty());
Path p(basePath,appName);
p.setExtension(extension);
bool found = findFile(p);
if (!found)
{
#if defined(_DEBUG)
if (appName[appName.length() - 1] == 'd')
{
p.setBaseName(appName.substr(0, appName.length() - 1));
found = findFile(p);
}
#endif
}
if (found)
path = p;
return found;
}
void Application::defineOptions(OptionSet& options) void Application::defineOptions(OptionSet& options)
{ {
for (SubsystemVec::iterator it = _subsystems.begin(); it != _subsystems.end(); ++it) for (SubsystemVec::iterator it = _subsystems.begin(); it != _subsystems.end(); ++it)

1
Util/src/SystemConfiguration.cpp
View File

@@ -24,7 +24,6 @@
#endif #endif
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include <cstdio> #include <cstdio>
#include "../../Foundation/include/Poco/Path.h"
using Poco::Environment; using Poco::Environment;