Skip to content

offline: Fix property invalidation #65

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

Merged
ximion merged 1 commit into from
Nov 17, 2025
Merged

offline: Fix property invalidation #65

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
40 changes: 21 additions & 19 deletions src/offline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,25 @@ Offline::Action Offline::triggerAction() const
bool Offline::updatePrepared() const
{
Q_D(const Offline);
return d->updatePrepared;
return d->m_properties[QLatin1StringView("UpdatePrepared")];
}

bool Offline::updateTriggered() const
{
Q_D(const Offline);
return d->updateTriggered;
return d->m_properties[QLatin1StringView("UpdateTriggered")];
}

bool Offline::upgradePrepared() const
{
Q_D(const Offline);
return d->upgradePrepared;
return d->m_properties[QLatin1StringView("UpgradePrepared")];
}

bool Offline::upgradeTriggered() const
{
Q_D(const Offline);
return d->upgradeTriggered;
return d->m_properties[QLatin1StringView("UpgradeTriggered")];
}

QDBusPendingReply<> Offline::trigger(Action action)
Expand Down Expand Up @@ -249,24 +249,12 @@ void OfflinePrivate::initializeProperties(const QVariantMap &properties)
} else {
triggerAction = Offline::ActionUnset;
}
} else if (property == QLatin1String("UpdatePrepared")) {
updatePrepared = value.toBool();
} else if (property == QLatin1String("UpdateTriggered")) {
updateTriggered = value.toBool();
} else if (property == QLatin1String("UpgradePrepared")) {
upgradePrepared = value.toBool();
} else if (property == QLatin1String("UpgradeTriggered")) {
upgradeTriggered = value.toBool();
} else {
qCWarning(PACKAGEKITQT_OFFLINE) << "Unknown property:" << property << value;
m_properties[property] = value.toBool();
}

++it;
}

if (!properties.isEmpty()) {
q->changed();
}
}

void OfflinePrivate::updateProperties(const QString &interface, const QVariantMap &properties, const QStringList &invalidate)
Expand All @@ -276,11 +264,25 @@ void OfflinePrivate::updateProperties(const QString &interface, const QVariantMa
return;
}

if (!invalidate.isEmpty()) {
qCWarning(PACKAGEKITQT_OFFLINE) << "Properties could not be invalidated" << interface << invalidate;
bool invalidations = false;
for (const QString &property : invalidate) {
invalidations = true;

if (property == QLatin1String("PreparedUpgrade")) {
preparedUpgrade.clear();
} else if (property == QLatin1String("TriggerAction")) {
triggerAction = Offline::ActionUnset;
} else {
m_properties.remove(property);
}
}

initializeProperties(properties);

if (invalidations || !properties.isEmpty()) {
Q_Q(Offline);
q->changed();
}
}

#include "moc_offline.cpp"
5 changes: 1 addition & 4 deletions src/offline_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ class OfflinePrivate
OrgFreedesktopPackageKitOfflineInterface iface;
QVariantMap preparedUpgrade;
Offline::Action triggerAction = Offline::ActionUnset;
bool updatePrepared = false;
bool updateTriggered = false;
bool upgradePrepared = false;
bool upgradeTriggered = false;
QMap<QString, bool> m_properties;
};
}

Expand Down