diff options
author | Arno <arno@disconnect.de> | 2019-11-22 13:15:21 +0100 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2019-11-22 13:15:21 +0100 |
commit | b41db9bfac46ead20e1c9d3b6924231886cfee0c (patch) | |
tree | 2d1ea1041d5b4be18f83f80c24f79dd786cd9962 | |
parent | 85a59da691cfadedfb1b7b680efa0bfe5b44a36c (diff) | |
download | SheMov-b41db9bfac46ead20e1c9d3b6924231886cfee0c.tar.gz SheMov-b41db9bfac46ead20e1c9d3b6924231886cfee0c.tar.bz2 SheMov-b41db9bfac46ead20e1c9d3b6924231886cfee0c.zip |
Use QMime* instead of libmagic
One more step to make it compile with Windows. And once again, it makes
the code much neater and more readable.
-rw-r--r-- | helper.cpp | 27 | ||||
-rw-r--r-- | helper.h | 1 |
2 files changed, 5 insertions, 23 deletions
@@ -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){ @@ -15,7 +15,6 @@ #include <QMetaType> #include <QJsonDocument> -#include <magic.h> #include <pictureviewer2.h> #ifndef MAGICKCORE_QUANTUM_DEPTH |