Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: replace MIME name checks with method calls

Browse source 
for flexibility

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-04 21:35:38 +03:00
parent 3cf815c995
commit c2d19af39f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gwenview/lib/mimetypeutils.cpp
View file

@ -62,12 +62,11 @@ QString urlMimeType(const KUrl& url)
if (url.isEmpty()) { if (url.isEmpty()) {
return "unknown"; return "unknown";
} }
// Try a simple guess, using extension for remote urls // Check for local files
QString mimeType = KMimeType::findByUrl(url)->name(); QString mimeType = KMimeType::findByUrl(url)->name();
if (mimeType == "application/octet-stream") { if (mimeType == KMimeType::defaultMimeType()) {
kDebug() << "KMimeType::findByUrl() failed to find mimetype for" << url << ". Falling back to KIO::stat()."; kDebug() << "KMimeType::findByUrl() failed to find mimetype for" << url << ". Falling back to KIO::stat().";
// No luck, look deeper. This can happens with http urls if the filename // No luck, look deeper
// does not provide any extension.
KIO::UDSEntry statentry; KIO::UDSEntry statentry;
KIO::NetAccess::stat(url, statentry, KApplication::kApplication()->activeWindow()); KIO::NetAccess::stat(url, statentry, KApplication::kApplication()->activeWindow());
mimeType = statentry.stringValue(KIO::UDSEntry::UDS_MIME_TYPE); mimeType = statentry.stringValue(KIO::UDSEntry::UDS_MIME_TYPE);

2
okular/core/document.cpp
View file

@ -1982,7 +1982,7 @@ Document::OpenResult Document::openDocument( const QString & docFile, const KUrl
qstdin.open( stdin, QIODevice::ReadOnly ); qstdin.open( stdin, QIODevice::ReadOnly );
filedata = qstdin.readAll(); filedata = qstdin.readAll();
mime = KMimeType::findByContent( filedata ); mime = KMimeType::findByContent( filedata );
if ( !mime || mime->name() == QLatin1String( "application/octet-stream" ) ) if ( !mime || mime->isDefault() )
return OpenError; return OpenError;
document_size = filedata.size(); document_size = filedata.size();
triedMimeFromFileContent = true; triedMimeFromFileContent = true;