kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 11:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

servicemenuinstaller: Use QMimeDatabase instead of running xdg-mime

Browse source 
Test Plan: ./test_run.rb still passes all tests.

Reviewers: elvisangelaccio, sitter, ngraham

Reviewed By: elvisangelaccio, ngraham

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D22465
This commit is contained in:
Alexander Potashev 2019-07-15 02:21:35 +03:00
parent 981e96efe6
commit a001c39229
1 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
View file

@ -24,6 +24,7 @@
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QMimeDatabase>
#include <KLocalizedString> #include <KLocalizedString>
@ -42,41 +43,6 @@ Q_NORETURN void fail(const QString &str)
exit(1); exit(1);
} }
bool evaluateShell(const QString &program, const QStringList &arguments, QString &output, QString &errorText)
{
QProcess process;
process.start(program, arguments, QIODevice::ReadOnly);
if (!process.waitForStarted()) {
fail(i18n("Failed to run process: %1 %2", program, arguments.join(" ")));
}
if (!process.waitForFinished()) {
fail(i18n("Process did not finish in reasonable time: %1 %2", program, arguments.join(" ")));
}
const auto stdoutResult = QString::fromUtf8(process.readAllStandardOutput()).trimmed();
const auto stderrResult = QString::fromUtf8(process.readAllStandardError()).trimmed();
if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0) {
output = stdoutResult;
return true;
} else {
errorText = stderrResult + stdoutResult;
return false;
}
}
QString mimeType(const QString &path)
{
QString result;
QString errorText;
if (evaluateShell("xdg-mime", QStringList{"query", "filetype", path}, result, errorText)) {
return result;
} else {
fail(i18n("Failed to run xdg-mime %1: %2", path, errorText));
}
}
QString getServiceMenusDir() QString getServiceMenusDir()
{ {
const QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); const QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
@ -114,7 +80,7 @@ void runUncompress(const QString &inputPath, const QString &outputPath) {
"multipart/x-zip"}, "multipart/x-zip"},
UncompressCommand{"unzip", QStringList{}, QStringList{"-d"}}}); UncompressCommand{"unzip", QStringList{}, QStringList{"-d"}}});
const auto mime = mimeType(inputPath); const auto mime = QMimeDatabase().mimeTypeForFile(inputPath).name();
UncompressCommand command{}; UncompressCommand command{};
for (const auto &pair : mimeTypeToCommand) { for (const auto &pair : mimeTypeToCommand) {