TerminalPanel: StatJob::mostLocalUrl only works with ":local" protocols

StatJob::mostLocalUrl was changed to cancel the job automatically if the
protocol Class isn't ":local", mostLocalUrl only makes sense with ioslaves
that actually set UDS_LOCAL_PATH (which should have calss ":local").

I tested that kio-fuse still works, when having the terminal panel open and
changing direcotries in Dolphin, with an sftp:// server.

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 131d166304a01fe08160e7c43f42629afa905b3e..52ff494b2cbd453a3b1a05454854df0f18d3f75e 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -17,6 +17,7 @@
 #include <KParts/ReadOnlyPart>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KParts/ReadOnlyPart>
 #include <KPluginFactory>
 #include <KPluginLoader>

+#include <KProtocolInfo>

 #include <KService>
 #include <KShell>
 #include <kde_terminal_interface.h>
 #include <KService>
 #include <KShell>
 #include <kde_terminal_interface.h>


@@ -186,13 +187,21 @@ void TerminalPanel::changeDir(const QUrl& url)
 
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
 
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());

-    } else {
+        return;
+    }
+
+    // Try stat'ing the url; note that mostLocalUrl only works with ":local" protocols
+    if (KProtocolInfo::protocolClass(url.scheme()) == QLatin1String(":local")) {

         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         if (m_mostLocalUrlJob->uiDelegate()) {
             KJobWidgets::setWindow(m_mostLocalUrlJob, this);
         }
         connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult);
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         if (m_mostLocalUrlJob->uiDelegate()) {
             KJobWidgets::setWindow(m_mostLocalUrlJob, this);
         }
         connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult);

+        return;

     }
     }

+
+    // Last chance, try kio fuse
+    sendCdToTerminalKIOFuse(url);

 }
 
 void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory)
 }
 
 void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory)


@@ -230,6 +239,21 @@ void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHist
     }
 }
 
     }
 }
 

+void TerminalPanel::sendCdToTerminalKIOFuse (const QUrl &url) {
+    // URL isn't local, only hope for the terminal to be in sync with the
+    // DolphinView is to mount the remote URL in KIOFuse and point to it.
+    // If we can't do that for any reason, silently fail.
+    auto reply = m_kiofuseInterface.mountUrl(url.toString());
+    QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher(reply, this);
+    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] (QDBusPendingCallWatcher* watcher) {
+        watcher->deleteLater();
+        if (!reply.isError()) {
+            // Successfully mounted, point to the KIOFuse equivalent path.
+            sendCdToTerminal(reply.value());
+        }
+    });
+}
+

 void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 {
     KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);
 void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 {
     KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);


@@ -237,18 +261,7 @@ void TerminalPanel::slotMostLocalUrlResult(KJob* job)
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     } else {
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     } else {

-        // URL isn't local, only hope for the terminal to be in sync with the
-        // DolphinView is to mount the remote URL in KIOFuse and point to it.
-        // If we can't do that for any reason, silently fail.
-        auto reply = m_kiofuseInterface.mountUrl(url.toString());
-        QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher(reply, this);
-        QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] (QDBusPendingCallWatcher* watcher) {
-            watcher->deleteLater();
-            if (!reply.isError()) {
-                // Successfully mounted, point to the KIOFuse equivalent path.
-                sendCdToTerminal(reply.value());
-            }
-        });
+        sendCdToTerminalKIOFuse(url);

     }
 
     m_mostLocalUrlJob = nullptr;
     }
 
     m_mostLocalUrlJob = nullptr;

diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index 85f175da1f914f61e7f36435506524f1e2b8bdfa..82c2c3fc767863f313421f0aaaf26e9f95aad8fb 100644 (file)
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -77,7 +77,7 @@ private:
 
     void changeDir(const QUrl& url);
     void sendCdToTerminal(const QString& path, HistoryPolicy addToHistory = HistoryPolicy::AddToHistory);
 
     void changeDir(const QUrl& url);
     void sendCdToTerminal(const QString& path, HistoryPolicy addToHistory = HistoryPolicy::AddToHistory);

-
+    void sendCdToTerminalKIOFuse (const QUrl &url);

 private:
     bool m_clearTerminal;
     KIO::StatJob* m_mostLocalUrlJob;
 private:
     bool m_clearTerminal;
     KIO::StatJob* m_mostLocalUrlJob;