github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-17 15:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/Utils.cpp
+11 -3
View File
@@ -102,10 +102,18 @@ bool dirExists(const QString &path) {
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 portablePath = QCoreApplication::applicationDirPath().append("/%1");
if (QFile::exists(portablePath.arg(".portable")) || QFile::exists(portablePath.arg(".portable.txt"))) {
return portablePath.arg("feather_data/wallets");
QString portablePath = QCoreApplication::applicationDirPath();
if (Utils::portableFileExists(portablePath)) {
return portablePath + "/feather_data/wallets";
}
if (TailsOS::detect()) {
src/utils/Utils.h
+1
View File
@@ -22,6 +22,7 @@ namespace Utils
QStringList fileFind(const QRegularExpression &pattern, const QString &baseDir, int level, int depth, int maxPerDir);
bool dirExists(const QString &path);
bool portableFileExists(const QString &dir);
QString defaultWalletDir();
QString applicationPath();
src/utils/config.cpp
+3 -3
View File
@@ -168,9 +168,9 @@ Config::Config(QObject* parent)
}
QDir Config::defaultConfigDir() {
QString portablePath = QCoreApplication::applicationDirPath().append("/%1");
if (QFile::exists(portablePath.arg(".portable")) || QFile::exists(portablePath.arg(".portable.txt"))) {
return portablePath.arg("feather_data");
QString portablePath = QCoreApplication::applicationDirPath();
if (Utils::portableFileExists(portablePath)) {
return portablePath + "/feather_data";
}
if (TailsOS::detect()) {