FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better detection of writeability of current app directory.

Browse Source
This commit is contained in:
Martin Rotter 2016-08-18 08:37:32 +02:00
parent 8486b072a6
commit 9b886427ef
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/miscellaneous/iofactory.cpp
View File

@ -24,12 +24,25 @@
#include <QFileInfo>
#include <QFile>
#include <QObject>
#include <QTemporaryFile>
#include <QTextStream>
IOFactory::IOFactory() {
}
bool IOFactory::isFolderWritable(const QString &folder) {
QString real_file = folder;
if (!real_file.endsWith(QDir::separator())) {
real_file += QDir::separator();
}
real_file += "test-permissions-file";
return QTemporaryFile(real_file).open();
}
QString IOFactory::getSystemFolder(QStandardPaths::StandardLocation location) {
return QStandardPaths::writableLocation(location);
}

4
src/miscellaneous/iofactory.h
View File

@ -31,7 +31,9 @@ class IOFactory {
private:
IOFactory();
public:
public:
static bool isFolderWritable(const QString &folder);
// Returns system-wide folder according to type.
static QString getSystemFolder(QStandardPaths::StandardLocation location);

2
src/miscellaneous/settings.cpp
View File

@ -332,7 +332,7 @@ SettingsProperties Settings::determineProperties() {
const QString home_path = qApp->homeFolderPath() + QDir::separator() + QString(APP_LOW_H_NAME);
const QString home_path_file = home_path + properties.m_settingsSuffix;
const bool portable_settings_available = QFileInfo(app_path).isWritable();
const bool portable_settings_available = IOFactory::isFolderWritable(app_path);
const bool non_portable_settings_exist = QFile::exists(home_path_file);
// We will use PORTABLE settings only and only if it is available and NON-PORTABLE