Update mime database from Qt

qtbase/071a9c90615966e6af375ec46c1b4acd5d1cd628
  QMimeDatabase: introduce QMimeMagicResult to accumulate magic results

Change-Id: I877922d518def275f15037d60d090955afbc1e21
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/libs/utils/mimetypes2/mimedatabase.cpp

@@ -421,13 +421,14 @@ MimeType MimeDatabasePrivate::findByData(const QByteArray &data, int *accuracyPt
     }
 #endif
 
-    *accuracyPtr = 0;
+    MimeMagicResult result;
-    QString candidate;
     for (const auto &provider : providers())
-        provider->findByMagic(data, accuracyPtr, &candidate);
+        provider->findByMagic(data, result);
 
-    if (!candidate.isEmpty())
+    if (result.isValid()) {
-        return MimeType(MimeTypePrivate(candidate));
+        *accuracyPtr = result.accuracy;
+        return MimeType(MimeTypePrivate(result.candidate));
+    }
 
     if (isTextFile(data)) {
         *accuracyPtr = 5;

src/libs/utils/mimetypes2/mimeprovider.cpp

@@ -362,7 +362,7 @@ bool MimeBinaryProvider::matchMagicRule(MimeBinaryProvider::CacheFile *cacheFile
     return false;
 }
 
-void MimeBinaryProvider::findByMagic(const QByteArray &data, int *accuracyPtr, QString *candidate)
+void MimeBinaryProvider::findByMagic(const QByteArray &data, MimeMagicResult &result)
 {
     const int magicListOffset = m_cacheFile->getUint32(PosMagicListOffset);
     const int numMatches = m_cacheFile->getUint32(magicListOffset);
@@ -378,14 +378,16 @@ void MimeBinaryProvider::findByMagic(const QByteArray &data, int *accuracyPtr, Q
             const char *mimeType = m_cacheFile->getCharStar(mimeTypeOffset);
             if (m_overriddenMimeTypes.contains(QLatin1String(mimeType)))
                 continue;
-            *accuracyPtr = m_cacheFile->getUint32(off);
+            const int accuracy = static_cast<int>(m_cacheFile->getUint32(off));
-            // Return the first match. We have no rules for conflicting magic data...
+            if (accuracy > result.accuracy) {
-            // (mime.cache itself is sorted, but what about local overrides with a lower prio?)
+                result.accuracy = accuracy;
-            *candidate = QString::fromLatin1(mimeType);
+                result.candidate = QString::fromLatin1(mimeType);
+                // Return the first match, mime.cache is sorted
                 return;
             }
         }
     }
+}
 
 void MimeBinaryProvider::addParents(const QString &mime, QStringList &result)
 {
@@ -747,16 +749,16 @@ void MimeXMLProvider::addFileNameMatches(const QString &fileName, MimeGlobMatchR
     m_mimeTypeGlobs.matchingGlobs(fileName, result, filterFunc);
 }
 
-void MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr, QString *candidate)
+void MimeXMLProvider::findByMagic(const QByteArray &data, MimeMagicResult &result)
 {
     for (const MimeMagicRuleMatcher &matcher : std::as_const(m_magicMatchers)) {
         if (m_overriddenMimeTypes.contains(matcher.mimetype()))
             continue;
         if (matcher.matches(data)) {
             const int priority = matcher.priority();
-            if (priority > *accuracyPtr) {
+            if (priority > result.accuracy) {
-                *accuracyPtr = priority;
+                result.accuracy = priority;
-                *candidate = matcher.mimetype();
+                result.candidate = matcher.mimetype();
             }
         }
     }

src/libs/utils/mimetypes2/mimeprovider_p.h

@@ -28,6 +28,14 @@ class MimeMagicRuleMatcher;
 class MimeTypeXMLData;
 class MimeProviderBase;
 
+struct MimeMagicResult
+{
+    bool isValid() const { return !candidate.isEmpty(); }
+
+    QString candidate;
+    int accuracy = 0;
+};
+
 class MimeProviderBase
 {
     Q_DISABLE_COPY(MimeProviderBase)
@@ -43,7 +51,7 @@ public:
     virtual void addParents(const QString &mime, QStringList &result) = 0;
     virtual QString resolveAlias(const QString &name) = 0;
     virtual void addAliases(const QString &name, QStringList &result) = 0;
-    virtual void findByMagic(const QByteArray &data, int *accuracyPtr, QString *candidate) = 0;
+    virtual void findByMagic(const QByteArray &data, MimeMagicResult &result) = 0;
     virtual void addAllMimeTypes(QList<MimeType> &result) = 0;
     virtual MimeTypePrivate::LocaleHash localeComments(const QString &name) = 0;
     virtual bool hasGlobDeleteAll(const QString &name) = 0;
@@ -92,7 +100,7 @@ public:
     void addParents(const QString &mime, QStringList &result) override;
     QString resolveAlias(const QString &name) override;
     void addAliases(const QString &name, QStringList &result) override;
-    void findByMagic(const QByteArray &data, int *accuracyPtr, QString *candidate) override;
+    void findByMagic(const QByteArray &data, MimeMagicResult &result) override;
     void addAllMimeTypes(QList<MimeType> &result) override;
     MimeTypePrivate::LocaleHash localeComments(const QString &name) override;
     bool hasGlobDeleteAll(const QString &name) override;
@@ -168,7 +176,7 @@ public:
     void addParents(const QString &mime, QStringList &result) override;
     QString resolveAlias(const QString &name) override;
     void addAliases(const QString &name, QStringList &result) override;
-    void findByMagic(const QByteArray &data, int *accuracyPtr, QString *candidate) override;
+    void findByMagic(const QByteArray &data, MimeMagicResult &result) override;
     void addAllMimeTypes(QList<MimeType> &result) override;
     void ensureLoaded() override;
     MimeTypePrivate::LocaleHash localeComments(const QString &name) override;