[filemanager] Add properties to FileManager requires for sailfish-off…

…ice. Contributes to JB#52722
sailfishos · Jan 27, 2021 · 9bdb5db · 9bdb5db
1 parent 82a94ec
commit 9bdb5db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/plugin/statfileinfo.cpp b/src/plugin/statfileinfo.cpp
@@ -93,7 +93,7 @@ void StatFileInfo::refresh()
 
     m_fileInfo = QFileInfo(m_fileName);
     if (m_fileName.isEmpty()) {
-        m_mimeType = QString();
+        m_mimeType = QMimeType();
         m_baseName = QString();
         m_extension = QString();
 
@@ -106,7 +106,7 @@ void StatFileInfo::refresh()
     // no real cost to constructing one when needed.
     QMimeDatabase mimeDatabase;
 
-    m_mimeType = mimeDatabase.mimeTypeForFile(m_fileInfo).name();
+    m_mimeType = mimeDatabase.mimeTypeForFile(m_fileInfo);
     m_extension = mimeDatabase.suffixForFileName(m_fileName);
     m_baseName = m_fileInfo.fileName();
 

diff --git a/src/plugin/statfileinfo.h b/src/plugin/statfileinfo.h
@@ -35,6 +35,7 @@
 
 #include <QFileInfo>
 #include <QDateTime>
+#include <QMimeType>
 #include <QDir>
 #include <QUrl>
 #include <sys/stat.h>
@@ -55,7 +56,8 @@ class StatFileInfo
     void setFile(QString fileName);
     QString fileName() const { return m_fileInfo.fileName(); }
 
-    QString mimeType() const { return m_mimeType; }
+    QString mimeType() const { return m_mimeType.name(); }
+    QString mimeTypeComment() const { return m_mimeType.comment(); }
 
     // these inspect the file itself without following symlinks
 
@@ -136,7 +138,7 @@ class StatFileInfo
     QString m_fileName;
     QString m_baseName;
     QString m_extension;
-    QString m_mimeType;
+    QMimeType m_mimeType;
     QFileInfo m_fileInfo;
     Sailfish::ArchiveInfo m_archiveInfo;
     struct stat64 m_stat; // after following possible symlinks
@@ -154,6 +156,7 @@ class FileInfo : public QObject, protected StatFileInfo
     Q_PROPERTY(QString file READ file WRITE setFile NOTIFY fileChanged)
     Q_PROPERTY(QString fileName READ fileName NOTIFY fileChanged)
     Q_PROPERTY(QString mimeType READ mimeType NOTIFY fileChanged)
+    Q_PROPERTY(QString mimeTypeComment READ mimeTypeComment NOTIFY fileChanged)
     Q_PROPERTY(qint64 size READ size NOTIFY fileChanged)
     Q_PROPERTY(QDateTime lastModified READ lastModified NOTIFY fileChanged)
     Q_PROPERTY(bool isDir READ isDirAtEnd NOTIFY fileChanged)