From 47bd2048048f71163e5e15785132abeeaf7ea69e Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 1 Sep 2014 00:06:18 +0200 Subject: [PATCH] Make it possible to open archives via the command line This used to work before afcf8961f6666a912e0e6e5072a000837f7cf6aa (only if "Open archives as folder" was enabled in the settings though). The reason why this commit broke it is that the mime type of a file is not determined automatically any more before asking KProtocolManager::protocolForArchiveMimetype for the correct protocol, so the determination of the protocol may fail. Keeping the isMimeTypeKnown() check in DolphinView::openItemAsFolderUrl still makes sense, because it prevents GUI blocking if the user tries to open many files at the same time. Therefore, we now call determineMimeType() in DolphinViewContainer::slotUrlIsFileError(const KUrl&) and then try to determine the correct protocol and use it to open the archive in the view, rather than hoping that slotItemActivated(item) will do the right thing. BUG: 333078 REVIEW: 119877 FIXED-IN: 4.14.1 --- src/dolphinviewcontainer.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 93af3e8fbc..a11ba4202c 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -463,7 +463,16 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled() void DolphinViewContainer::slotUrlIsFileError(const KUrl& url) { const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); - slotItemActivated(item); + + // Find out if the file can be opened in the view (for example, this is the + // case if the file is an archive). The mime type must be known for that. + item.determineMimeType(); + const KUrl& folderUrl = DolphinView::openItemAsFolderUrl(item, true); + if (!folderUrl.isEmpty()) { + m_view->setUrl(folderUrl); + } else { + slotItemActivated(item); + } } void DolphinViewContainer::slotItemActivated(const KFileItem& item)