Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: different take on MIME type determination in curl slave

Browse source 
because FTP and SFTP are special about it so is the MIME type
determination

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-04 04:02:49 +03:00
parent d1fd7fdab6
commit 6820e4e63c
3 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kio/kio/kfileitem.cpp
View file

@ -128,10 +128,6 @@ public:
init();
}
~KFileItemPrivate()
{
}
/**
* Computes the text and mode from the UDSEntry
* Called by constructor, but can be called again later

2
kio/kio/krun.cpp
View file

@ -1338,7 +1338,7 @@ void KRun::slotScanFinished(KJob *job)
const KIO::UDSEntry entry = statJob->statResult();
const QString mimetype = entry.stringValue(KIO::UDSEntry::UDS_MIME_TYPE);
if (mimetype.isEmpty()) {
kWarning(7010) << "get() didn't emit a mimetype! Probably a kioslave bug, please check the implementation of" << url().protocol();
kWarning(7010) << "stat() does not provide a mimetype! Check the implementation of" << url().protocol();
}
mimeTypeDetermined(mimetype);
d->m_job = 0;

40
kioslave/curl/kio_curl.cpp
View file

@ -167,25 +167,6 @@ static inline long HTTPCode(CURL *curl)
return curlresponsecode;
}
// this is for optimization purpose (for KFileItem to not have to determine it via KMimeType)
static inline QString mimeFromMode(const mode_t mode)
{
if (S_ISDIR(mode)) {
return QString::fromLatin1("inode/directory");
} else if (S_ISCHR(mode)) {
return QString::fromLatin1("inode/chardevice");
} else if (S_ISBLK(mode)) {
return QString::fromLatin1("inode/blockdevice");
} else if (S_ISFIFO(mode)) {
return QString::fromLatin1("inode/fifo");
} else if (S_ISSOCK(mode)) {
return QString::fromLatin1("inode/socket");
}
// for files either figure it out from the name or get() and probe the data, FTP and SFTP
// simply do not provide MIME type info
return QString();
}
// for reference:
// https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
static inline KIO::Error HTTPToKIOError(const long httpcode)
@ -1210,9 +1191,24 @@ QList<KIO::UDSEntry> CurlProtocol::udsEntries()
kioudsentry.insert(KIO::UDSEntry::UDS_USER, QString::fromLatin1(ftpowner.constData(), ftpowner.size()));
kioudsentry.insert(KIO::UDSEntry::UDS_GROUP, QString::fromLatin1(ftpgroup.constData(), ftpgroup.size()));
kioudsentry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, ftpmodtime);
const QString mimefrommode = mimeFromMode(stdmode & S_IFMT);
if (!mimefrommode.isEmpty()) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, mimefrommode);
if (S_ISDIR(stdmode & S_IFMT)) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("inode/directory"));
} else if (S_ISCHR(stdmode & S_IFMT)) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("inode/chardevice"));
} else if (S_ISBLK(stdmode & S_IFMT)) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("inode/blockdevice"));
} else if (S_ISFIFO(stdmode & S_IFMT)) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("inode/fifo"));
} else if (S_ISSOCK(stdmode & S_IFMT)) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, QString::fromLatin1("inode/socket"));
} else {
// guesswork
KUrl ftpurl = p_url;
ftpurl.setFileName(ftpfilepath);
const KMimeType::Ptr kmimetype = KMimeType::findByUrl(ftpurl, stdmode & S_IFMT);
if (!kmimetype.isNull()) {
kioudsentry.insert(KIO::UDSEntry::UDS_MIME_TYPE, kmimetype->name());
}
}
if (!ftplinkpath.isEmpty()) {
// link paths to current path causes KIO to do strange things