Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-09 04:19:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Portable mode: accept 'portable.txt'

Browse source
This commit is contained in:
tobtoht 2022-05-22 19:52:03 +02:00
parent 52705375be
commit 4fcf746c3a
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/utils/Utils.cpp
View file

@ -102,10 +102,18 @@ bool dirExists(const QString &path) {
return pathDir.exists(); return pathDir.exists();
} }
bool portableFileExists(const QString &dir) {
QStringList portableFiles = {".portable", ".portable.txt", "portable.txt"};
return std::find_if(portableFiles.begin(), portableFiles.end(), [dir](const QString &portableFile){
return QFile::exists(dir + "/" + portableFile);
}) != portableFiles.end();
}
QString defaultWalletDir() { QString defaultWalletDir() {
QString portablePath = QCoreApplication::applicationDirPath().append("/%1"); QString portablePath = QCoreApplication::applicationDirPath();
if (QFile::exists(portablePath.arg(".portable")) || QFile::exists(portablePath.arg(".portable.txt"))) { if (Utils::portableFileExists(portablePath)) {
return portablePath.arg("feather_data/wallets"); return portablePath + "/feather_data/wallets";
} }
if (TailsOS::detect()) { if (TailsOS::detect()) {

1
src/utils/Utils.h
View file

@ -22,6 +22,7 @@ namespace Utils
QStringList fileFind(const QRegularExpression &pattern, const QString &baseDir, int level, int depth, int maxPerDir); QStringList fileFind(const QRegularExpression &pattern, const QString &baseDir, int level, int depth, int maxPerDir);
bool dirExists(const QString &path); bool dirExists(const QString &path);
bool portableFileExists(const QString &dir);
QString defaultWalletDir(); QString defaultWalletDir();
QString applicationPath(); QString applicationPath();

6
src/utils/config.cpp
View file

@ -168,9 +168,9 @@ Config::Config(QObject* parent)
} }
QDir Config::defaultConfigDir() { QDir Config::defaultConfigDir() {
QString portablePath = QCoreApplication::applicationDirPath().append("/%1"); QString portablePath = QCoreApplication::applicationDirPath();
if (QFile::exists(portablePath.arg(".portable")) || QFile::exists(portablePath.arg(".portable.txt"))) { if (Utils::portableFileExists(portablePath)) {
return portablePath.arg("feather_data"); return portablePath + "/feather_data";
} }
if (TailsOS::detect()) { if (TailsOS::detect()) {