mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 01:40:02 +00:00
Make it possible to open archives via the command line
This used to work before afcf8961f6
(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
This commit is contained in:
parent
dc378935d3
commit
47bd204804
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue