ec2550ad7f
- Add patches to fix issues with MimeTypeFinderJob (kde#398908): * 0001-MimeTypeFinderJob-Resolve-symlinks-for-a-local-file.patch * 0002-MimeTypeFinderJob-the-StatJob-details-should-include.patch * 0003-kio_file-pass-the-absolute-path-to-QMimeDatabase-mim.patch OBS-URL: https://build.opensuse.org/request/show/893118 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=335
64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
From dc5e968eefa4e6fafa0eecdfd36e7ea17b42fc08 Mon Sep 17 00:00:00 2001
|
|
From: Ahmad Samir <a.samirh78@gmail.com>
|
|
Date: Thu, 13 May 2021 23:03:57 +0200
|
|
Subject: [PATCH 3/3] kio_file: pass the absolute path to
|
|
QMimeDatabase::mimeTypeForFile()
|
|
|
|
Otherwise detecting the mime type based on the file content may fail and
|
|
return application/octet-stream.
|
|
|
|
And pass the whole url to createUDSEntry(), less QFile::decodeName/encodeName()
|
|
in the middle is better and less error prone.
|
|
|
|
Note that without this change a MimeTypeFinderJob could end up failing to
|
|
find the mime type of a local file based on the file contents.
|
|
|
|
(cherry picked from commit c748d6987252fafc296cde9351b289ef734cf861)
|
|
---
|
|
src/ioslaves/file/file_unix.cpp | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
|
|
index 99d46c8f..940e3cbc 100644
|
|
--- a/src/ioslaves/file/file_unix.cpp
|
|
+++ b/src/ioslaves/file/file_unix.cpp
|
|
@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
|
|
}
|
|
#endif
|
|
|
|
-static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details)
|
|
+static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
|
|
{
|
|
assert(entry.count() == 0); // by contract :-)
|
|
int entries = 0;
|
|
@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
|
|
|
|
if (details & KIO::StatMimeType) {
|
|
QMimeDatabase db;
|
|
- entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(filename).name());
|
|
+ entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
|
|
}
|
|
|
|
return true;
|
|
@@ -1186,7 +1186,7 @@ void FileProtocol::listDir(const QUrl &url)
|
|
listEntry(entry);
|
|
|
|
} else {
|
|
- if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) {
|
|
+ if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
|
|
#if HAVE_SYS_XATTR_H
|
|
if (isNtfsHidden(filename)) {
|
|
bool ntfsHidden = true;
|
|
@@ -1476,7 +1476,7 @@ void FileProtocol::stat(const QUrl &url)
|
|
const KIO::StatDetails details = getStatDetails();
|
|
|
|
UDSEntry entry;
|
|
- if (!createUDSEntry(url.fileName(), _path, entry, details)) {
|
|
+ if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
|
|
error(KIO::ERR_DOES_NOT_EXIST, path);
|
|
return;
|
|
}
|
|
--
|
|
2.25.1
|
|
|