Merge branch 'master' into kf6

[dolphin.git] / src / views / draganddrophelper.cpp

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index f81d4d0bfe9d3b63e70745c772fc30878f4201b2..aaf2baa383501f89e79258e5d9df396f1eb74efd 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -1,63 +1,72 @@
-/***************************************************************************
- *   Copyright (C) 2007-2011 by Peter Penz <peter.penz19@gmail.com>        *
- *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
- *                                                                         *
- *   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: 2007-2011 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2007 David Faure <faure@kde.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "draganddrophelper.h"
 
-#include <KFileItem>
-#include <KLocale>
-#include <konq_operations.h>
-#include <KUrl>
-#include <QApplication>
-#include <QtDBus>
+#include <KIO/DropJob>
+#include <KJobWidgets>
+
+#include <QDBusConnection>
+#include <QDBusMessage>
 #include <QDropEvent>
+#include <QMimeData>
+
+QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache;
 
-QString DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destUrl, QDropEvent* event)
+bool DragAndDropHelper::urlListMatchesUrl(const QList<QUrl> &urls, const QUrl &destUrl)
 {
-    if (!destItem.isNull() && !destItem.isWritable()) {
-        return i18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>", destUrl.pathOrUrl());
+    auto iteratorResult = m_urlListMatchesUrlCache.constFind(destUrl);
+    if (iteratorResult != m_urlListMatchesUrlCache.constEnd()) {
+        return *iteratorResult;
     }
 
-    const QMimeData* mimeData = event->mimeData();
-    if (mimeData->hasFormat("application/x-kde-ark-dndextract-service") &&
-        mimeData->hasFormat("application/x-kde-ark-dndextract-path")) {
-        const QString remoteDBusClient = mimeData->data("application/x-kde-ark-dndextract-service");
-        const QString remoteDBusPath = mimeData->data("application/x-kde-ark-dndextract-path");
+    const bool destUrlMatches = std::find_if(urls.constBegin(),
+                                             urls.constEnd(),
+                                             [destUrl](const QUrl &url) {
+                                                 return url.matches(destUrl, QUrl::StripTrailingSlash);
+                                             })
+        != urls.constEnd();
+
+    return *m_urlListMatchesUrlCache.insert(destUrl, destUrlMatches);
+}
+
+KIO::DropJob *DragAndDropHelper::dropUrls(const QUrl &destUrl, QDropEvent *event, QWidget *window)
+{
+    const QMimeData *mimeData = event->mimeData();
+    if (isArkDndMimeType(mimeData)) {
+        const QString remoteDBusClient = mimeData->data(arkDndServiceMimeType());
+        const QString remoteDBusPath = mimeData->data(arkDndPathMimeType());
 
-        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
-                                                              "org.kde.ark.DndExtract", "extractSelectedFilesTo");
-        message.setArguments(QVariantList() << destUrl.pathOrUrl());
+        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient,
+                                                              remoteDBusPath,
+                                                              QStringLiteral("org.kde.ark.DndExtract"),
+                                                              QStringLiteral("extractSelectedFilesTo"));
+        message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)});
         QDBusConnection::sessionBus().call(message);
-    } else if (!destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile())) {
-        // Drop into a directory or a desktop-file
-        const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-        foreach (const KUrl& url, urls) {
-            if (url == destUrl) {
-                return i18nc("@info:status", "A folder cannot be dropped into itself");
-            }
+    } else {
+        if (urlListMatchesUrl(event->mimeData()->urls(), destUrl)) {
+            return nullptr;
         }
 
-        KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow());
-    } else {
-        KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow());
+        // Drop into a directory or a desktop-file
+        KIO::DropJob *job = KIO::drop(event, destUrl);
+        KJobWidgets::setWindow(job, window);
+        return job;
     }
 
-    return QString();
+    return nullptr;
 }
 
+void DragAndDropHelper::clearUrlListMatchesUrlCache()
+{
+    DragAndDropHelper::m_urlListMatchesUrlCache.clear();
+}
+
+bool DragAndDropHelper::isArkDndMimeType(const QMimeData *mimeData)
+{
+    return mimeData->hasFormat(arkDndServiceMimeType()) && mimeData->hasFormat(arkDndPathMimeType());
+}