Add Framework laptop controls and monitoring with hardware-aware discovery
This commit is contained in:
1 parent
787231cb03
commit
8719402d97
50 files changed
+3611
-9
No files matched your search
@@ -125,6 +125,12 @@ public Q_SLOTS:
|
||||
KAuth::ActionReply installpackage(const QVariantMap &arguments)
|
||||
{
|
||||
const QString packageName = arguments.value(QStringLiteral("packageName")).toString();
|
||||
const QString incompatible = packageCompatibilityError(packageName);
|
||||
if (!incompatible.isEmpty()) {
|
||||
KAuth::ActionReply reply = KAuth::ActionReply::HelperErrorReply();
|
||||
reply.addData(QStringLiteral("message"), incompatible);
|
||||
return reply;
|
||||
}
|
||||
if (!isValidPackageName(packageName) || !isPublishedTool(packageName)) {
|
||||
KAuth::ActionReply reply = KAuth::ActionReply::HelperErrorReply();
|
||||
reply.addData(QStringLiteral("message"), QStringLiteral("The requested package is not a published Fedora tool."));
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "packageutils.h"
|
||||
|
||||
#include <QRegularExpression>
|
||||
#include <QFile>
|
||||
|
||||
#include <utility>
|
||||
|
||||
@@ -38,3 +39,15 @@ bool isValidPackageName(const QString &name)
|
||||
static const QRegularExpression expression(QStringLiteral("^[a-z0-9][a-z0-9+._-]*$"));
|
||||
return expression.match(name).hasMatch();
|
||||
}
|
||||
|
||||
QString packageCompatibilityError(const QString &name, const QString &sys)
|
||||
{
|
||||
if (name != QLatin1String("framework-laptop-tools")) return {};
|
||||
auto read = [](const QString &path) {
|
||||
QFile file(path);
|
||||
return file.open(QIODevice::ReadOnly) ? QString::fromUtf8(file.readAll()).trimmed() : QString();
|
||||
};
|
||||
if (read(sys + QStringLiteral("/class/dmi/id/sys_vendor")) == QLatin1String("Framework")
|
||||
&& read(sys + QStringLiteral("/class/dmi/id/product_name")) == QLatin1String("Laptop 13 Pro (Intel Core Ultra Series 3)")) return {};
|
||||
return QStringLiteral("Incompatible: requires Framework Laptop 13 Pro (Intel Core Ultra Series 3).");
|
||||
}
|
||||
@@ -16,3 +16,4 @@ struct PackageRecord
|
||||
|
||||
QList<PackageRecord> parsePackageRecords(const QByteArray &output);
|
||||
bool isValidPackageName(const QString &name);
|
||||
QString packageCompatibilityError(const QString &name, const QString &sys = QStringLiteral("/sys"));
|
||||
@@ -87,13 +87,15 @@ QVariant ToolModel::data(const QModelIndex &index, int role) const
|
||||
case UpdateAvailableRole:
|
||||
return tool.updateAvailable;
|
||||
case ConfigurableRole:
|
||||
return tool.installed
|
||||
return tool.installed && tool.compatibilityError.isEmpty()
|
||||
&& (!tool.configurationCommand.isEmpty()
|
||||
|| tool.packageName == QStringLiteral("plasma-fingerprint-workaround")
|
||||
|| tool.packageName == QStringLiteral("plasma-task-group-shortcuts")
|
||||
|| tool.packageName == QStringLiteral("touchpad-hold-tap"));
|
||||
case ExternalConfigurationRole:
|
||||
return tool.installed && !tool.configurationCommand.isEmpty();
|
||||
case CompatibilityErrorRole:
|
||||
return tool.compatibilityError;
|
||||
default:
|
||||
return {};
|
||||
}
|
||||
@@ -112,6 +114,7 @@ QHash<int, QByteArray> ToolModel::roleNames() const
|
||||
{UpdateAvailableRole, "updateAvailable"},
|
||||
{ConfigurableRole, "configurable"},
|
||||
{ExternalConfigurationRole, "externalConfiguration"},
|
||||
{CompatibilityErrorRole, "compatibilityError"},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -129,9 +132,12 @@ void ToolModel::setPackages(const QList<PackageRecord> &installed,
|
||||
tool.summary = package.summary;
|
||||
tool.installed = true;
|
||||
tool.configurationCommand = readConfigurationCommand(package.name);
|
||||
tool.compatibilityError = packageCompatibilityError(package.name);
|
||||
}
|
||||
|
||||
for (const PackageRecord &package : available) {
|
||||
const QString incompatible = packageCompatibilityError(package.name);
|
||||
if (!incompatible.isEmpty() && !tools.contains(package.name)) continue;
|
||||
Tool &tool = tools[package.name];
|
||||
tool.packageName = package.name;
|
||||
tool.availableVersion = package.version;
|
||||
@@ -139,8 +145,9 @@ void ToolModel::setPackages(const QList<PackageRecord> &installed,
|
||||
if (!tool.installed) {
|
||||
tool.summary = package.summary;
|
||||
}
|
||||
tool.available = true;
|
||||
tool.updateAvailable = tool.installed && updates.contains(package.name);
|
||||
tool.compatibilityError = incompatible;
|
||||
tool.available = incompatible.isEmpty();
|
||||
tool.updateAvailable = tool.available && tool.installed && updates.contains(package.name);
|
||||
}
|
||||
|
||||
QList<Tool> merged = tools.values();
|
||||
|
||||
@@ -16,6 +16,7 @@ struct Tool
|
||||
QString architecture;
|
||||
QString summary;
|
||||
QStringList configurationCommand;
|
||||
QString compatibilityError;
|
||||
bool installed = false;
|
||||
bool available = false;
|
||||
bool updateAvailable = false;
|
||||
@@ -37,6 +38,7 @@ public:
|
||||
UpdateAvailableRole,
|
||||
ConfigurableRole,
|
||||
ExternalConfigurationRole,
|
||||
CompatibilityErrorRole,
|
||||
};
|
||||
|
||||
explicit ToolModel(QObject *parent = nullptr);
|
||||
|
||||
@@ -87,6 +87,7 @@ KCM.SimpleKCM {
|
||||
required property bool updateAvailable
|
||||
required property bool configurable
|
||||
required property bool externalConfiguration
|
||||
required property string compatibilityError
|
||||
|
||||
width: toolList.width
|
||||
|
||||
@@ -121,6 +122,9 @@ KCM.SimpleKCM {
|
||||
Controls.Label {
|
||||
Layout.fillWidth: true
|
||||
text: {
|
||||
if (toolCard.compatibilityError.length > 0) {
|
||||
return toolCard.compatibilityError
|
||||
}
|
||||
if (toolCard.updateAvailable) {
|
||||
return i18n("Installed %1; %2 is available", toolCard.version, toolCard.availableVersion)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user