fs/StandardDirectory: add GetUserCacheDir()

Move code from CreateConfiguredDatabase() and add XDG support.  This
implements an automatic Linux fallback for the setting "db_file" if
none was specified.
This commit is contained in:
Max Kellermann
2014-03-01 22:50:11 +01:00
parent efa6678bcc
commit 36ca57a54e
4 changed files with 26 additions and 15 deletions

View File

@@ -23,16 +23,11 @@
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/ConfigError.hxx"
#include "fs/AllocatedPath.hxx"
#include "fs/StandardDirectory.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
#ifdef ANDROID
#include "Main.hxx"
#include "android/Context.hxx"
#include "fs/AllocatedPath.hxx"
#include "plugins/simple/SimpleDatabasePlugin.hxx"
#endif
Database *
CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
Error &error)
@@ -57,12 +52,9 @@ CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
}
if (param == nullptr) {
#ifdef ANDROID
/* if there is no override, use the Android cache
directory */
/* if there is no override, use the cache directory */
const AllocatedPath cache_dir =
context->GetCacheDir(Java::GetEnv());
const AllocatedPath cache_dir = GetUserCacheDir();
if (cache_dir.IsNull())
return nullptr;
@@ -71,9 +63,6 @@ CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
allocated = new config_param("database");
allocated->AddBlockParam("path", db_file.c_str(), -1);
param = allocated;
#else
return nullptr;
#endif
}
Database *db = DatabaseGlobalInit(loop, listener, *param,