Page MenuHome GnuPG
Files F23020654

No OneTemporary
Actions

View Options

diff --git a/src/util.cpp b/src/util.cpp
index 7c79df4..e49c209 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,87 +1,71 @@
#include "util.h"
#include <QDir>
#include <QFileInfo>
-QProcessEnvironment Util::_env;
-bool Util::_envInitialised;
-
-/**
- * @brief Util::initialiseEnvironment set the correct PATH for use with gpg, git
- * etc.
- */
-void Util::initialiseEnvironment()
-{
- if (!_envInitialised) {
- _env = QProcessEnvironment::systemEnvironment();
- _envInitialised = true;
- }
-}
-
/**
* @brief Util::findPasswordStore look for common .password-store folder
* location.
* @return
*/
QString Util::findPasswordStore()
{
QString path;
- initialiseEnvironment();
- if (_env.contains(QStringLiteral("PASSWORD_STORE_DIR"))) {
- path = _env.value(QStringLiteral("PASSWORD_STORE_DIR"));
+ if (qEnvironmentVariableIsSet("PASSWORD_STORE_DIR")) {
+ path = qEnvironmentVariable("PASSWORD_STORE_DIR");
} else {
#ifdef Q_OS_WIN
path = QDir::homePath() + QDir::separator() + QStringLiteral("password-store") + QDir::separator();
#else
path = QDir::homePath() + QDir::separator() + QStringLiteral(".password-store") + QDir::separator();
#endif
}
return Util::normalizeFolderPath(path);
}
/**
* @brief Util::normalizeFolderPath let's always end folders with a
* QDir::separator()
* @param path
* @return
*/
QString Util::normalizeFolderPath(QString path)
{
if (!path.endsWith(QLatin1Char('/')) && !path.endsWith(QDir::separator()))
path += QDir::separator();
return path;
}
/**
* @brief Util::copyDir
* @param src
* @param dest
*/
void Util::copyDir(const QString &src, const QString &dest)
{
QDir srcDir(src);
if (!srcDir.exists()) {
return;
}
srcDir.mkpath(dest);
const auto srcDirs = srcDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
for (const QString &dir : srcDirs) {
copyDir(src + QDir::separator() + dir, dest + QDir::separator() + dir);
}
const auto srcFiles = srcDir.entryList(QDir::Files);
for (const QString &file : srcFiles) {
QFile::copy(src + QDir::separator() + file, dest + QDir::separator() + file);
}
}
const QRegularExpression &Util::endsWithGpg()
{
static const QRegularExpression expr{QStringLiteral("\\.gpg$")};
return expr;
}
const QRegularExpression &Util::protocolRegex()
{
static const QRegularExpression regex{QStringLiteral("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)")};
return regex;
}
diff --git a/src/util.h b/src/util.h
index 68ddedb..74b2c69 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,31 +1,25 @@
#ifndef UTIL_H_
#define UTIL_H_
-#include "storemodel.h"
-#include <QFileSystemModel>
-#include <QProcessEnvironment>
#include <QRegularExpression>
#include <QString>
class StoreModel;
/*!
\class Util
\brief Some static utilities to be used elsewhere.
*/
class Util
{
public:
static QString findPasswordStore();
static QString normalizeFolderPath(QString path);
static void copyDir(const QString &src, const QString &dest);
static const QRegularExpression &endsWithGpg();
static const QRegularExpression &protocolRegex();
private:
- static void initialiseEnvironment();
- static QProcessEnvironment _env;
- static bool _envInitialised;
};
#endif // UTIL_H_

File Metadata

Mime Type
text/x-diff
Expires
Mon, May 12, 6:31 PM (1 d, 13 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
ac/bf/2a21446962b59bcc0a14ae371240

Event Timeline