Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update uab mimetype and uninstall process #267

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −35
Open

fix: update uab mimetype and uninstall process #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 57 additions & 34 deletions src/deb-installer/uab/uab_dbus_package_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <QDBusUnixFileDescriptor>
#include <QFile>
#include <QFileInfo>
#include <QTimer>
#include <QtConcurrent/QtConcurrentRun>
#include <QDebug>

namespace Uab {
Expand Down Expand Up @@ -153,47 +153,70 @@ bool UabDBusPackageManager::installFormFile(const UabPackage::Ptr &installPtr)
return true;
}

/**
@brief Uninstall \a uninstallPtr package.
This function will return immediately, and the uninstall process will run in the thread-pool,
avoid the dbus interface blocks threads.
@return True if uninstall start, false if \a uninstallPtr invalid or is running
*/
bool UabDBusPackageManager::uninstall(const UabPackage::Ptr &uninstallPtr)
{
if (!uninstallPtr || !uninstallPtr->isValid() || isRunning()) {
return false;
}
ensureInterface();

QVariantMap pkgParams;
pkgParams[kllParamId] = uninstallPtr->info()->id;
pkgParams[kllParamVersion] = uninstallPtr->info()->version;
pkgParams[kllParamChannel] = uninstallPtr->info()->channel;
pkgParams[kllParamModule] = uninstallPtr->info()->module;
QVariantMap params;
params[kllParamPackage] = pkgParams;

QDBusReply<QVariantMap> reply = m_interface->call(kllDBusUninstall, params);
if (reply.error().isValid()) {
qWarning() << qPrintable("call LinglongPM dbus fails:") << reply.error().message();
return false;
}

const QVariantMap data = reply.value();
const int code = data.value(kllRetCode).toInt();
if (Uab::UabSuccess != code) {
qWarning() << QString("LinglingPM return error: [%1] %2").arg(code).arg(data.value(kllRetMessage).toString());
return false;
}

m_currentTask.taskId = data.value(kllRetTaskId).toString();
m_currentTask.code = code;
m_currentTask.message = data.value(kllRetMessage).toString();

qInfo() << QString("Requset LinglingPM uninstall: %1/%2 [message]: %3")
.arg(uninstallPtr->info()->id)
.arg(uninstallPtr->info()->version)
.arg(m_currentTask.message);

QTimer::singleShot(0, this, [this]() {
Q_EMIT progressChanged(100, m_currentTask.message);
Q_EMIT packageFinished(true);
m_currentTask.taskId = "mark uninstall";

QtConcurrent::run([this, uninstallPtr]() {
bool callRet{false};
QString message;

do {
QVariantMap pkgParams;
pkgParams[kllParamId] = uninstallPtr->info()->id;
pkgParams[kllParamVersion] = uninstallPtr->info()->version;
pkgParams[kllParamChannel] = uninstallPtr->info()->channel;
pkgParams[kllParamModule] = uninstallPtr->info()->module;
QVariantMap params;
params[kllParamPackage] = pkgParams;

QDBusReply<QVariantMap> reply = m_interface->call(kllDBusUninstall, params);
if (reply.error().isValid()) {
qWarning() << qPrintable("call LinglongPM dbus fails:") << reply.error().message();
break;
}

const QVariantMap data = reply.value();
const int code = data.value(kllRetCode).toInt();
if (Uab::UabSuccess != code) {
message = data.value(kllRetMessage).toString();
qWarning() << QString("LinglingPM return error: [%1] %2").arg(code).arg(message);
break;
}

const QString taskId = data.value(kllRetTaskId).toString();
message = data.value(kllRetMessage).toString();

qInfo() << QString("Requset LinglingPM uninstall: %1/%2 [message]: %3")
.arg(uninstallPtr->info()->id)
.arg(uninstallPtr->info()->version)
.arg(message);

callRet = true;
} while (false);

// notify on package manager thread
QMetaObject::invokeMethod(
this,
[this, message, callRet]() {
m_currentTask.taskId.clear();
Q_EMIT progressChanged(callRet ? 100 : 0, message);
Q_EMIT packageFinished(callRet);
},
Qt::QueuedConnection);
});

// uninstall not need receive task info, remove imdealtly and fast
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/deb-installer/utils/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ Pkg::PackageType Utils::detectPackage(const QString &filePath)
if (info.suffix().toLower() == "deb" || mime.name().startsWith("application/vnd.debian.binary-package")) {
return Pkg::Deb;
}
if (info.suffix().toLower() == "uab") {
if (info.suffix().toLower() == "uab" || mime.name().startsWith("application/vnd.linyaps.uab")) {
return Pkg::Uab;
}

Expand Down
Loading