summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--helper.cpp27
-rw-r--r--helper.h1
2 files changed, 5 insertions, 23 deletions
diff --git a/helper.cpp b/helper.cpp
index 214e950..4b42f0e 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -30,6 +30,8 @@
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QAction>
+#include <QMimeDatabase>
+#include <QMimeType>
#include <stdio.h>
@@ -37,28 +39,9 @@
namespace Helper {
const QString mimeType(const QString &path){
- QString retval;
- magic_t mc = magic_open(MAGIC_MIME_TYPE);
- QByteArray name = path.toUtf8();
- if(mc){
- magic_load(mc, nullptr);
- const char* magic_c = magic_file(mc, name.constData());
- retval = QString(magic_c);
- magic_close(mc);
- }
- if(retval.toLower().startsWith("application/octet-stream")){
- magic_t mc = magic_open(MAGIC_NONE);
- if(mc){
- magic_load(mc, nullptr);
- const char* magic_c = magic_file(mc, name.constData());
- QString desc(magic_c);
- magic_close(mc);
- if(desc.toLower().contains("mpeg sequence") || desc.toLower().contains("microsoft asf") || desc.toLower().contains("matroska")){
- retval = "video/";
- }
- }
- }
- return retval;
+ QMimeDatabase db;
+ QMimeType type = db.mimeTypeForFile(path);
+ return type.name();
}
const QString md5Sum(const QString &path){
diff --git a/helper.h b/helper.h
index 4b8f5ec..fee3324 100644
--- a/helper.h
+++ b/helper.h
@@ -15,7 +15,6 @@
#include <QMetaType>
#include <QJsonDocument>
-#include <magic.h>
#include <pictureviewer2.h>
#ifndef MAGICKCORE_QUANTUM_DEPTH