Git commit 3906648d1edcd56edee092ecd992d1366dadc31d by Elvis Angelaccio.
Committed on 08/12/2015 at 21:03.
Pushed by elvisangelaccio into branch 'Applications/15.12'.

Fix opening of archives whose mimetype cannot be detected-by-content

shared-mime-info 1.5 (and thus QMimeDatabase) cannot
detect-by-content tar archives created with the --format=3Dv7 flag.
Instead of adding another exception (like we did for ISO files), let's just=
 use
the mimetype detected from the extension if the one from content could not =
be
determined.

BUG: 355955
FIXED-IN: 15.12.0

M  +3    -2    kerfuffle/archive_kerfuffle.cpp

http://commits.kde.org/ark/3906648d1edcd56edee092ecd992d1366dadc31d

diff --git a/kerfuffle/archive_kerfuffle.cpp b/kerfuffle/archive_kerfuffle.=
cpp
index e3397c3..11c8911 100644
--- a/kerfuffle/archive_kerfuffle.cpp
+++ b/kerfuffle/archive_kerfuffle.cpp
@@ -87,8 +87,9 @@ QString Archive::determineMimeType(const QString& filenam=
e)
 =

     if (mimeFromExtension !=3D mimeFromContent) {
 =

-        // #354344: ISO files are currently not detected-by-content.
-        if (mimeFromExtension.inherits(QStringLiteral("application/x-cd-im=
age"))) {
+        if (mimeFromContent =3D=3D db.mimeTypeForName(QStringLiteral("appl=
ication/octet-stream"))) {
+            qCWarning(ARK) << "Could not detect mimetype from content."
+                           << "Using extension-based mimetype:" << mimeFro=
mExtension.name();
             return mimeFromExtension.name();
         }
 =