kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ViewProperties] Check part of home first before doing file system stuff

Browse source 
There's no point in creating a QFileInfo instance and checking for file properties if we're not going to do anything with it
when not inside home.

Differential Revision: https://phabricator.kde.org/D15237
This commit is contained in:
Kai Uwe Broulik 2018-09-17 16:02:50 +02:00
parent cb6c71ae1b
commit 7ec783e749
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/views/viewproperties.cpp
View file

@ -63,17 +63,19 @@ ViewProperties::ViewProperties(const QUrl& url) :
useDetailsViewWithPath = true;
} else if (url.isLocalFile()) {
m_filePath = url.toLocalFile();
const QFileInfo dirInfo(m_filePath);
const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);
// Check if the directory is writable and check if the ".directory" file exists and
// is read- and writable.
if (!dirInfo.isWritable()
|| (fileInfo.exists() && !(fileInfo.isReadable() && fileInfo.isWritable()))
|| !isPartOfHome(m_filePath)) {
#ifdef Q_OS_WIN
// m_filePath probably begins with C:/ - the colon is not a valid character for paths though
m_filePath = QDir::separator() + m_filePath.remove(QLatin1Char(':'));
#endif
bool useDestinationDir = !isPartOfHome(m_filePath);
if (!useDestinationDir) {
const QFileInfo dirInfo(m_filePath);
const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);
useDestinationDir = !dirInfo.isWritable() || (dirInfo.size() > 0 && fileInfo.exists() && !(fileInfo.isReadable() && fileInfo.isWritable()));
}
if (useDestinationDir) {
#ifdef Q_OS_WIN
// m_filePath probably begins with C:/ - the colon is not a valid character for paths though
m_filePath = QDir::separator() + m_filePath.remove(QLatin1Char(':'));
#endif
m_filePath = destinationDir(QStringLiteral("local")) + m_filePath;
}
} else {