tastytea
/
remwharead
1
0
Fork 0
Code Issues 1 Pull Requests Releases 37 Activity

Replace `Poco::Path::dataHome()` with `get_data_home()`.
continuous-integration/drone/push Build is passing Details 

`Poco::Path::dataHome()` does not follow the XDG Base Directory Specification.
This commit is contained in:
tastytea 2019-10-27 07:21:18 +01:00
parent 253047c0b5
commit ff7b6338a0
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sqlite.hpp
View File

@ -111,6 +111,8 @@ private:
fs::path _dbpath;
std::unique_ptr<Session> _session;
bool _connected;
fs::path get_data_home() const;
};
} // namespace remwharead

38
src/lib/sqlite.cpp
View File

@ -19,11 +19,7 @@
#include <Poco/Data/SQLite/Connector.h>
#include <Poco/Data/Session.h>
#include <Poco/Version.h>
#if POCO_VERSION >= 0x01090000 // Path::dataHome() is only in 1.9 and above.
#include <Poco/Path.h>
#else
#include <Poco/Environment.h>
#endif
#include <algorithm>
#include <exception>
#include <iostream>
@ -34,30 +30,14 @@ using std::cerr;
using std::endl;
using namespace Poco::Data::Keywords;
using Poco::Data::Statement;
#if POCO_VERSION < 0x01090000
using Poco::Environment;
#endif
Database::Database()
: _connected(false)
{
try
{
#if POCO_VERSION >= 0x01090000
_dbpath = Poco::Path::dataHome() / fs::path("remwharead");
#else
if (Environment::has("XDG_DATA_HOME"))
{
_dbpath = Environment::get("XDG_DATA_HOME")
/ fs::path("remwharead");
}
else if (Environment::has("HOME"))
{
_dbpath = Environment::get("HOME")
/ fs::path(".local/share/remwharead");
} // Else use current directory.
#endif
_dbpath = get_data_home();
if (!fs::exists(_dbpath))
{
fs::create_directories(_dbpath);
@ -185,4 +165,20 @@ list<Database::entry> Database::retrieve(const time_point &start,
return {};
}
fs::path Database::get_data_home() const
{
fs::path path;
if (Environment::has("XDG_DATA_HOME"))
{
path = Environment::get("XDG_DATA_HOME") / fs::path("remwharead");
}
else if (Environment::has("HOME"))
{
path = Environment::get("HOME") / fs::path(".local/share/remwharead");
} // Else return empty path.
return path;
}
} // namespace remwharead