X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0a6257bce3de877e4ae869f974df645c428d32c9..04e493d78cdf46e64562fe8a302426b1fd8c47df:/src/views/viewproperties.cpp diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 100b1ad2d..8bf3b2531 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -1,113 +1,215 @@ -/*************************************************************************** - * Copyright (C) 2006-2010 by Peter Penz * - * Copyright (C) 2006 by Aaron J. Seigo * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2006-2010 Peter Penz + * SPDX-FileCopyrightText: 2006 Aaron J. Seigo + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "viewproperties.h" #include "dolphin_directoryviewpropertysettings.h" #include "dolphin_generalsettings.h" +#include "dolphindebug.h" -#include -#include -#include - -#include #include -#include -#include -#include -#include +#include + +#include +#include -namespace { - const int AdditionalInfoViewPropertiesVersion = 1; - const int NameRolePropertiesVersion = 2; - const int CurrentViewPropertiesVersion = 3; +namespace +{ +const int AdditionalInfoViewPropertiesVersion = 1; +const int NameRolePropertiesVersion = 2; +const int DateRolePropertiesVersion = 4; +const int CurrentViewPropertiesVersion = 4; - // String representation to mark the additional properties of - // the details view as customized by the user. See - // ViewProperties::visibleRoles() for more information. - const char CustomizedDetailsString[] = "CustomizedDetails"; +// String representation to mark the additional properties of +// the details view as customized by the user. See +// ViewProperties::visibleRoles() for more information. +const char CustomizedDetailsString[] = "CustomizedDetails"; - // Filename that is used for storing the properties - const char ViewPropertiesFileName[] = ".directory"; +// Filename that is used for storing the properties +const char ViewPropertiesFileName[] = ".directory"; } -ViewProperties::ViewProperties(const KUrl& url) : - m_changedProps(false), - m_autoSave(true), - m_node(0) +ViewPropertySettings *ViewProperties::loadProperties(const QString &folderPath) const { - GeneralSettings* settings = GeneralSettings::self(); + const QString settingsFile = folderPath + QDir::separator() + ViewPropertiesFileName; + + KFileMetaData::UserMetaData metadata(folderPath); + if (!metadata.isSupported()) { + return new ViewPropertySettings(KSharedConfig::openConfig(settingsFile, KConfig::SimpleConfig)); + } + + std::unique_ptr tempFile(new QTemporaryFile()); + tempFile->setAutoRemove(false); + if (!tempFile->open()) { + qCWarning(DolphinDebug) << "Could not open temp file"; + return nullptr; + } + if (QFile::exists(settingsFile)) { + // copy settings to tempfile to load them separately + QFile::remove(tempFile->fileName()); + QFile::copy(settingsFile, tempFile->fileName()); + + auto config = KConfig(tempFile->fileName(), KConfig::SimpleConfig); + // ignore settings that are outside of dolphin scope + if (config.hasGroup("Dolphin") || config.hasGroup("Settings")) { + const auto groupList = config.groupList(); + for (const auto &group : groupList) { + if (group != QStringLiteral("Dolphin") && group != QStringLiteral("Settings")) { + config.deleteGroup(group); + } + } + return new ViewPropertySettings(KSharedConfig::openConfig(tempFile->fileName(), KConfig::SimpleConfig)); + + } else if (!config.groupList().isEmpty()) { + // clear temp file content + QFile::remove(tempFile->fileName()); + } + } + + // load from metadata + const QString viewPropertiesString = metadata.attribute(QStringLiteral("kde.fm.viewproperties#1")); + if (viewPropertiesString.isEmpty()) { + return nullptr; + } + // load view properties from xattr to temp file then loads into ViewPropertySettings + QFile outputFile(tempFile->fileName()); + outputFile.open(QIODevice::WriteOnly); + outputFile.write(viewPropertiesString.toUtf8()); + outputFile.close(); + return new ViewPropertySettings(KSharedConfig::openConfig(tempFile->fileName(), KConfig::SimpleConfig)); +} + +ViewPropertySettings *ViewProperties::defaultProperties() const +{ + auto props = loadProperties(destinationDir(QStringLiteral("global"))); + if (props == nullptr) { + qCWarning(DolphinDebug) << "Could not load default global viewproperties"; + QTemporaryFile tempFile; + tempFile.setAutoRemove(false); + if (!tempFile.open()) { + qCWarning(DolphinDebug) << "Could not open temp file"; + props = new ViewPropertySettings; + } else { + props = new ViewPropertySettings(KSharedConfig::openConfig(tempFile.fileName(), KConfig::SimpleConfig)); + } + } + + return props; +} + +ViewProperties::ViewProperties(const QUrl &url) + : m_changedProps(false) + , m_autoSave(true) + , m_node(nullptr) +{ + GeneralSettings *settings = GeneralSettings::self(); const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty(); - bool useDetailsViewWithPath = false; + bool useSearchView = false; + bool useTrashView = false; + bool useRecentDocumentsView = false; + bool useDownloadsView = false; // We try and save it to the file .directory in the directory being viewed. // If the directory is not writable by the user or the directory is not local, // we store the properties information in a local file. - if (useGlobalViewProps) { - m_filePath = destinationDir("global"); - } else if (url.protocol().contains("search")) { - m_filePath = destinationDir("search/") + directoryHashForUrl(url); - useDetailsViewWithPath = true; - } else if (url.protocol() == QLatin1String("trash")) { - m_filePath = destinationDir("trash"); - useDetailsViewWithPath = true; + if (url.scheme().contains(QLatin1String("search"))) { + m_filePath = destinationDir(QStringLiteral("search/")) + directoryHashForUrl(url); + useSearchView = true; + } else if (url.scheme() == QLatin1String("trash")) { + m_filePath = destinationDir(QStringLiteral("trash")); + useTrashView = true; + } else if (url.scheme() == QLatin1String("recentlyused")) { + m_filePath = destinationDir(QStringLiteral("recentlyused")); + useRecentDocumentsView = true; + } else if (url.scheme() == QLatin1String("timeline")) { + m_filePath = destinationDir(QStringLiteral("timeline")); + useRecentDocumentsView = true; + } else if (useGlobalViewProps) { + m_filePath = destinationDir(QStringLiteral("global")); } 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)) { + + bool useDestinationDir = !isPartOfHome(m_filePath); + if (!useDestinationDir) { + const KFileItem fileItem(url); + useDestinationDir = fileItem.isSlow(); + } + + 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(':')); + // 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("local") + m_filePath; + m_filePath = destinationDir(QStringLiteral("local")) + m_filePath; + } + + if (m_filePath == QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)) { + useDownloadsView = true; } } else { - m_filePath = destinationDir("remote") + m_filePath; + m_filePath = destinationDir(QStringLiteral("remote")) + m_filePath; } - const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName; - m_node = new ViewPropertySettings(KSharedConfig::openConfig(file)); + m_node = loadProperties(m_filePath); + + bool useDefaultSettings = useGlobalViewProps || + // If the props timestamp is too old, + // use default values instead. + (m_node != nullptr && (!useGlobalViewProps || useSearchView || useTrashView || useRecentDocumentsView || useDownloadsView) + && m_node->timestamp() < settings->viewPropsTimestamp()); + + if (m_node == nullptr) { + // no settings found for m_filepath, load defaults + m_node = defaultProperties(); + useDefaultSettings = true; + } - // If the .directory file does not exist or the timestamp is too old, - // use default values instead. - const bool useDefaultProps = (!useGlobalViewProps || useDetailsViewWithPath) && - (!QFile::exists(file) || - (m_node->timestamp() < settings->viewPropsTimestamp())); - if (useDefaultProps) { - if (useDetailsViewWithPath) { + // default values for special directories + if (useDefaultSettings) { + if (useSearchView) { + const QString path = url.path(); + + if (path == QLatin1String("/images")) { + setViewMode(DolphinView::IconsView); + setPreviewsShown(true); + setVisibleRoles({"text", "dimensions", "imageDateTime"}); + } else if (path == QLatin1String("/audio")) { + setViewMode(DolphinView::DetailsView); + setVisibleRoles({"text", "artist", "album", "duration"}); + } else if (path == QLatin1String("/videos")) { + setViewMode(DolphinView::IconsView); + setPreviewsShown(true); + setVisibleRoles({"text"}); + } else { + setViewMode(DolphinView::DetailsView); + setVisibleRoles({"text", "path", "modificationtime"}); + } + } else if (useTrashView) { setViewMode(DolphinView::DetailsView); - setVisibleRoles(QList() << "path"); + setVisibleRoles({"text", "path", "deletiontime"}); + } else if (useRecentDocumentsView || useDownloadsView) { + setSortOrder(Qt::DescendingOrder); + setSortFoldersFirst(false); + setGroupedSorting(true); + + if (useRecentDocumentsView) { + setSortRole(QByteArrayLiteral("accesstime")); + setViewMode(DolphinView::DetailsView); + setVisibleRoles({"text", "path", "accesstime"}); + } else { + setSortRole(QByteArrayLiteral("modificationtime")); + } } else { - // The global view-properties act as default for directories without - // any view-property configuration. Constructing a ViewProperties - // instance for an empty KUrl ensures that the global view-properties - // are loaded. - KUrl emptyUrl; - ViewProperties defaultProps(emptyUrl); - setDirProperties(defaultProps); - m_changedProps = false; } } @@ -125,6 +227,11 @@ ViewProperties::ViewProperties(const KUrl& url) : Q_ASSERT(m_node->version() == NameRolePropertiesVersion); } + if (m_node->version() < DateRolePropertiesVersion) { + convertDateRoleToModificationTimeRole(); + Q_ASSERT(m_node->version() == DateRolePropertiesVersion); + } + m_node->setVersion(CurrentViewPropertiesVersion); } } @@ -135,8 +242,13 @@ ViewProperties::~ViewProperties() save(); } + if (!m_node->config()->name().endsWith(ViewPropertiesFileName)) { + // remove temp file + QFile::remove(m_node->config()->name()); + } + delete m_node; - m_node = 0; + m_node = nullptr; } void ViewProperties::setViewMode(DolphinView::Mode mode) @@ -192,7 +304,7 @@ bool ViewProperties::hiddenFilesShown() const return m_node->hiddenFilesShown(); } -void ViewProperties::setSortRole(const QByteArray& role) +void ViewProperties::setSortRole(const QByteArray &role) { if (m_node->sortRole() != role) { m_node->setSortRole(role); @@ -231,7 +343,33 @@ bool ViewProperties::sortFoldersFirst() const return m_node->sortFoldersFirst(); } -void ViewProperties::setVisibleRoles(const QList& roles) +void ViewProperties::setSortHiddenLast(bool hiddenLast) +{ + if (m_node->sortHiddenLast() != hiddenLast) { + m_node->setSortHiddenLast(hiddenLast); + update(); + } +} + +bool ViewProperties::sortHiddenLast() const +{ + return m_node->sortHiddenLast(); +} + +void ViewProperties::setDynamicViewPassed(bool dynamicViewPassed) +{ + if (m_node->dynamicViewPassed() != dynamicViewPassed) { + m_node->setDynamicViewPassed(dynamicViewPassed); + update(); + } +} + +bool ViewProperties::dynamicViewPassed() const +{ + return m_node->dynamicViewPassed(); +} + +void ViewProperties::setVisibleRoles(const QList &roles) { if (roles == visibleRoles()) { return; @@ -251,13 +389,13 @@ void ViewProperties::setVisibleRoles(const QList& roles) } // Add the updated values for the current view-mode - foreach (const QByteArray& role, roles) { + newVisibleRoles.reserve(roles.count()); + for (const QByteArray &role : roles) { newVisibleRoles.append(prefix + role); } if (oldVisibleRoles != newVisibleRoles) { - const bool markCustomizedDetails = (m_node->viewMode() == DolphinView::DetailsView) - && !newVisibleRoles.contains(CustomizedDetailsString); + const bool markCustomizedDetails = (m_node->viewMode() == DolphinView::DetailsView) && !newVisibleRoles.contains(CustomizedDetailsString); if (markCustomizedDetails) { // The additional information of the details-view has been modified. Set a marker, // so that it is allowed to also show no additional information without doing the @@ -282,12 +420,11 @@ QList ViewProperties::visibleRoles() const // // For the details-view a special case must be respected: Per default the size // and date should be shown without creating a .directory file. Only if - // the user explictly has modified the properties of the details view (marked + // the user explicitly has modified the properties of the details view (marked // by "CustomizedDetails"), also a details-view with no additional information // is accepted. - QList roles; - roles.append("text"); + QList roles{"text"}; // Iterate through all stored keys and append all roles that match to // the current view mode. @@ -295,7 +432,7 @@ QList ViewProperties::visibleRoles() const const int prefixLength = prefix.length(); const QStringList visibleRoles = m_node->visibleRoles(); - foreach (const QString& visibleRole, visibleRoles) { + for (const QString &visibleRole : visibleRoles) { if (visibleRole.startsWith(prefix)) { const QByteArray role = visibleRole.right(visibleRole.length() - prefixLength).toLatin1(); if (role != "text") { @@ -307,17 +444,16 @@ QList ViewProperties::visibleRoles() const // For the details view the size and date should be shown per default // until the additional information has been explicitly changed by the user const bool useDefaultValues = roles.count() == 1 // "text" - && (m_node->viewMode() == DolphinView::DetailsView) - && !visibleRoles.contains(CustomizedDetailsString); + && (m_node->viewMode() == DolphinView::DetailsView) && !visibleRoles.contains(CustomizedDetailsString); if (useDefaultValues) { roles.append("size"); - roles.append("date"); + roles.append("modificationtime"); } return roles; } -void ViewProperties::setHeaderColumnWidths(const QList& widths) +void ViewProperties::setHeaderColumnWidths(const QList &widths) { if (m_node->headerColumnWidths() != widths) { m_node->setHeaderColumnWidths(widths); @@ -330,7 +466,7 @@ QList ViewProperties::headerColumnWidths() const return m_node->headerColumnWidths(); } -void ViewProperties::setDirProperties(const ViewProperties& props) +void ViewProperties::setDirProperties(const ViewProperties &props) { setViewMode(props.viewMode()); setPreviewsShown(props.previewsShown()); @@ -339,6 +475,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props) setSortRole(props.sortRole()); setSortOrder(props.sortOrder()); setSortFoldersFirst(props.sortFoldersFirst()); + setSortHiddenLast(props.sortHiddenLast()); setVisibleRoles(props.visibleRoles()); setHeaderColumnWidths(props.headerColumnWidths()); m_node->setVersion(props.m_node->version()); @@ -362,24 +499,118 @@ void ViewProperties::update() void ViewProperties::save() { - kDebug() << "Saving view-properties to" << m_filePath; + qCDebug(DolphinDebug) << "Saving view-properties to" << m_filePath; + + auto cleanDotDirectoryFile = [this]() { + const QString settingsFile = m_filePath + QDir::separator() + ViewPropertiesFileName; + if (QFile::exists(settingsFile)) { + qCDebug(DolphinDebug) << "cleaning .directory" << settingsFile; + KConfig cfg(settingsFile, KConfig::OpenFlag::SimpleConfig); + const auto groupList = cfg.groupList(); + for (const auto &group : groupList) { + if (group == QStringLiteral("Dolphin") || group == QStringLiteral("Settings")) { + cfg.deleteGroup(group); + } + } + if (cfg.groupList().isEmpty()) { + QFile::remove(settingsFile); + } else if (cfg.isDirty()) { + cfg.sync(); + } + } + }; + + // ensures the destination dir exists, in case we don't write metadata directly on the folder + QDir destinationDir(m_filePath); + if (!destinationDir.exists() && !destinationDir.mkpath(m_filePath)) { + qCWarning(DolphinDebug) << "Could not create fake directory to store metadata"; + } + + KFileMetaData::UserMetaData metaData(m_filePath); + if (metaData.isSupported()) { + const auto metaDataKey = QStringLiteral("kde.fm.viewproperties#1"); + + const auto items = m_node->items(); + const auto defaultConfig = defaultProperties(); + bool allDefault = true; + for (const auto item : items) { + if (item->name() == "Timestamp") { + continue; + } + if (item->name() == "Version") { + if (m_node->version() != CurrentViewPropertiesVersion) { + allDefault = false; + break; + } else { + continue; + } + } + auto defaultItem = defaultConfig->findItem(item->name()); + if (!defaultItem || defaultItem->property() != item->property()) { + allDefault = false; + break; + } + } + + if (allDefault) { + if (metaData.hasAttribute(metaDataKey)) { + qCDebug(DolphinDebug) << "clearing extended attributes for " << m_filePath; + const auto result = metaData.setAttribute(metaDataKey, QString()); + if (result != KFileMetaData::UserMetaData::NoError) { + qCWarning(DolphinDebug) << "could not clear extended attributes for " << m_filePath << "error:" << result; + } + } + cleanDotDirectoryFile(); + return; + } + + // save config to disk + if (!m_node->save()) { + qCWarning(DolphinDebug) << "could not save viewproperties" << m_node->config()->name(); + return; + } + + QFile configFile(m_node->config()->name()); + if (!configFile.open(QIODevice::ReadOnly)) { + qCWarning(DolphinDebug) << "Could not open readonly config file" << m_node->config()->name(); + } else { + // load config from disk + const QString viewPropertiesString = configFile.readAll(); + + // save to xattr + const auto result = metaData.setAttribute(metaDataKey, viewPropertiesString); + if (result != KFileMetaData::UserMetaData::NoError) { + if (result == KFileMetaData::UserMetaData::NoSpace) { + // copy settings to dotDirectory file as fallback + if (!configFile.copy(m_filePath + QDir::separator() + ViewPropertiesFileName)) { + qCWarning(DolphinDebug) << "could not write viewproperties to .directory for dir " << m_filePath; + } + // free the space used by viewproperties from the file metadata + metaData.setAttribute(metaDataKey, ""); + } else { + qCWarning(DolphinDebug) << "could not save viewproperties to extended attributes for dir " << m_filePath << "error:" << result; + } + // keep .directory file + return; + } + cleanDotDirectoryFile(); + } + + m_changedProps = false; + return; + } + QDir dir; dir.mkpath(m_filePath); m_node->setVersion(CurrentViewPropertiesVersion); - m_node->writeConfig(); - m_changedProps = false; -} + m_node->save(); -bool ViewProperties::exist() const -{ - const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName; - return QFile::exists(file); + m_changedProps = false; } -QString ViewProperties::destinationDir(const QString& subDir) const +QString ViewProperties::destinationDir(const QString &subDir) const { - QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation); - path.append(KGlobal::mainComponent().componentName()); + QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); path.append("/view_properties/").append(subDir); return path; } @@ -389,10 +620,17 @@ QString ViewProperties::viewModePrefix() const QString prefix; switch (m_node->viewMode()) { - case DolphinView::IconsView: prefix = "Icons_"; break; - case DolphinView::CompactView: prefix = "Compact_"; break; - case DolphinView::DetailsView: prefix = "Details_"; break; - default: kWarning() << "Unknown view-mode of the view properties"; + case DolphinView::IconsView: + prefix = QStringLiteral("Icons_"); + break; + case DolphinView::CompactView: + prefix = QStringLiteral("Compact_"); + break; + case DolphinView::DetailsView: + prefix = QStringLiteral("Details_"); + break; + default: + qCWarning(DolphinDebug) << "Unknown view-mode of the view properties"; } return prefix; @@ -400,7 +638,7 @@ QString ViewProperties::viewModePrefix() const void ViewProperties::convertAdditionalInfo() { - QStringList visibleRoles; + QStringList visibleRoles = m_node->visibleRoles(); const QStringList additionalInfo = m_node->additionalInfo(); if (!additionalInfo.isEmpty()) { @@ -408,19 +646,21 @@ void ViewProperties::convertAdditionalInfo() // to Icons_size, Details_date, ... where the suffix just represents // the internal role. One special-case must be handled: "LinkDestination" // has been used for "destination". - visibleRoles.reserve(additionalInfo.count()); - foreach (const QString& info, additionalInfo) { + visibleRoles.reserve(visibleRoles.count() + additionalInfo.count()); + for (const QString &info : additionalInfo) { QString visibleRole = info; int index = visibleRole.indexOf('_'); if (index >= 0 && index + 1 < visibleRole.length()) { ++index; if (visibleRole[index] == QLatin1Char('L')) { - visibleRole.replace("LinkDestination", "destination"); + visibleRole.replace(QLatin1String("LinkDestination"), QLatin1String("destination")); } else { visibleRole[index] = visibleRole[index].toLower(); } } - visibleRoles.append(visibleRole); + if (!visibleRoles.contains(visibleRole)) { + visibleRoles.append(visibleRole); + } } } @@ -442,7 +682,7 @@ void ViewProperties::convertNameRoleToTextRole() QString sortRole = m_node->sortRole(); if (sortRole == QLatin1String("name")) { - sortRole = QLatin1String("text"); + sortRole = QStringLiteral("text"); } m_node->setVisibleRoles(visibleRoles); @@ -451,7 +691,28 @@ void ViewProperties::convertNameRoleToTextRole() update(); } -bool ViewProperties::isPartOfHome(const QString& filePath) +void ViewProperties::convertDateRoleToModificationTimeRole() +{ + QStringList visibleRoles = m_node->visibleRoles(); + for (int i = 0; i < visibleRoles.count(); ++i) { + if (visibleRoles[i].endsWith(QLatin1String("_date"))) { + const int leftLength = visibleRoles[i].length() - 5; + visibleRoles[i] = visibleRoles[i].left(leftLength) + "_modificationtime"; + } + } + + QString sortRole = m_node->sortRole(); + if (sortRole == QLatin1String("date")) { + sortRole = QStringLiteral("modificationtime"); + } + + m_node->setVisibleRoles(visibleRoles); + m_node->setSortRole(sortRole); + m_node->setVersion(DateRolePropertiesVersion); + update(); +} + +bool ViewProperties::isPartOfHome(const QString &filePath) { // For performance reasons cache the path in a static QString // (see QDir::homePath() for more details) @@ -464,10 +725,9 @@ bool ViewProperties::isPartOfHome(const QString& filePath) return filePath.startsWith(homePath); } -QString ViewProperties::directoryHashForUrl(const KUrl& url) +QString ViewProperties::directoryHashForUrl(const QUrl &url) { - const QByteArray hashValue = QCryptographicHash::hash(url.prettyUrl().toLatin1(), - QCryptographicHash::Sha1); + const QByteArray hashValue = QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Sha1); QString hashString = hashValue.toBase64(); hashString.replace('/', '-'); return hashString;