mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

PrismExternalUpdater: clang-tidy

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-05-03 17:33:20 +05:00
parent 1f291a2d79
commit 53dda7cd32
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
2 changed files with 66 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

118
launcher/updater/PrismExternalUpdater.cpp
View file

@ -21,9 +21,8 @@
*/
#include "PrismExternalUpdater.h"
#include <QCoreApplication>
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QMessageBox>
#include <QProcess>
@ -58,19 +57,18 @@ PrismExternalUpdater::PrismExternalUpdater(QWidget* parent, const QString& appDi
{
priv->appDir = QDir(appDir);
priv->dataDir = QDir(dataDir);
auto settings_file = priv->dataDir.absoluteFilePath("prismlauncher_update.cfg");
priv->settings = std::make_unique<QSettings>(settings_file, QSettings::Format::IniFormat);
auto settingsFile = priv->dataDir.absoluteFilePath("prismlauncher_update.cfg");
priv->settings = std::make_unique<QSettings>(settingsFile, QSettings::Format::IniFormat);
priv->allowBeta = priv->settings->value("allow_beta", false).toBool();
priv->autoCheck = priv->settings->value("auto_check", true).toBool();
bool interval_ok = false;
bool intervalOk = false;
// default once per day
priv->updateInterval = priv->settings->value("update_interval", 86400).toInt(&interval_ok);
if (!interval_ok) {
priv->updateInterval = priv->settings->value("update_interval", 86400).toInt(&intervalOk);
if (!intervalOk) {
priv->updateInterval = 86400;
}
auto last_check = priv->settings->value("last_check");
if (!last_check.isNull() && last_check.isValid()) {
priv->lastCheck = QDateTime::fromString(last_check.toString(), Qt::ISODate);
if (const auto lastCheck = priv->settings->value("last_check"); !lastCheck.isNull() && lastCheck.isValid()) {
priv->lastCheck = QDateTime::fromString(lastCheck.toString(), Qt::ISODate);
}
priv->parent = parent;
connectTimer();
@ -95,7 +93,7 @@ void PrismExternalUpdater::checkForUpdates()
checkForUpdates(true);
}
void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
void PrismExternalUpdater::checkForUpdates(bool triggeredByUser) const
{
QProgressDialog progress(tr("Checking for updates..."), "", 0, 0, priv->parent);
progress.setCancelButton(nullptr);
@ -106,15 +104,15 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
QCoreApplication::processEvents();
QProcess proc;
auto exe_name = QStringLiteral("%1_updater").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
#if defined Q_OS_WIN32
exe_name.append(".exe");
auto exeName = QStringLiteral("%1_updater").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
#ifdef Q_OS_WIN32
exeName.append(".exe");
auto env = QProcessEnvironment::systemEnvironment();
env.insert("__COMPAT_LAYER", "RUNASINVOKER");
proc.setProcessEnvironment(env);
#else
exe_name = QString("bin/%1").arg(exe_name);
exeName = QString("bin/%1").arg(exeName);
#endif
QStringList args = { "--check-only", "--dir", priv->dataDir.absolutePath(), "--debug" };
@ -122,9 +120,8 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
args.append("--pre-release");
}
proc.start(priv->appDir.absoluteFilePath(exe_name), args);
auto result_start = proc.waitForStarted(5000);
if (!result_start) {
proc.start(priv->appDir.absoluteFilePath(exeName), args);
if (auto resultStart = proc.waitForStarted(5000); !resultStart) {
auto err = proc.error();
qDebug() << "Failed to start updater after 5 seconds."
<< "reason:" << err << proc.errorString();
@ -142,8 +139,7 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
}
QCoreApplication::processEvents();
auto result_finished = proc.waitForFinished(60000);
if (!result_finished) {
if (auto resultFinished = proc.waitForFinished(60000); !resultFinished) {
proc.kill();
auto err = proc.error();
auto output = proc.readAll();
@ -163,15 +159,15 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
return;
}
auto exit_code = proc.exitCode();
auto exitCode = proc.exitCode();
auto std_output = proc.readAllStandardOutput();
auto std_error = proc.readAllStandardError();
auto stdOutput = proc.readAllStandardOutput();
auto stdError = proc.readAllStandardError();
progress.hide();
QCoreApplication::processEvents();
switch (exit_code) {
switch (exitCode) {
case 0:
// no update available
if (triggeredByUser) {
@ -186,10 +182,10 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
case 1:
// there was an error
{
qDebug() << "Updater subprocess error" << qPrintable(std_error);
qDebug() << "Updater subprocess error" << qPrintable(stdError);
auto msgBox = QMessageBox(QMessageBox::Warning, tr("Update Check Error"),
tr("There was an error running the update check."), QMessageBox::Ok, priv->parent);
msgBox.setDetailedText(QString(std_error));
msgBox.setDetailedText(QString(stdError));
msgBox.setMinimumWidth(460);
msgBox.adjustSize();
msgBox.exec();
@ -198,28 +194,27 @@ void PrismExternalUpdater::checkForUpdates(bool triggeredByUser)
case 100:
// update available
{
auto [first_line, remainder1] = StringUtils::splitFirst(std_output, '\n');
auto [second_line, remainder2] = StringUtils::splitFirst(remainder1, '\n');
auto [third_line, release_notes] = StringUtils::splitFirst(remainder2, '\n');
auto version_name = StringUtils::splitFirst(first_line, ": ").second.trimmed();
auto version_tag = StringUtils::splitFirst(second_line, ": ").second.trimmed();
auto release_timestamp = QDateTime::fromString(StringUtils::splitFirst(third_line, ": ").second.trimmed(), Qt::ISODate);
qDebug() << "Update available:" << version_name << version_tag << release_timestamp;
qDebug() << "Update release notes:" << release_notes;
auto [firstLine, remainder1] = StringUtils::splitFirst(stdOutput, '\n');
auto [secondLine, remainder2] = StringUtils::splitFirst(remainder1, '\n');
auto [thirdLine, releaseNotes] = StringUtils::splitFirst(remainder2, '\n');
auto versionName = StringUtils::splitFirst(firstLine, ": ").second.trimmed();
auto versionTag = StringUtils::splitFirst(secondLine, ": ").second.trimmed();
auto releaseTimestamp = QDateTime::fromString(StringUtils::splitFirst(thirdLine, ": ").second.trimmed(), Qt::ISODate);
qDebug() << "Update available:" << versionName << versionTag << releaseTimestamp;
qDebug() << "Update release notes:" << releaseNotes;
offerUpdate(version_name, version_tag, release_notes, triggeredByUser);
offerUpdate(versionName, versionTag, releaseNotes, triggeredByUser);
}
break;
default:
// unknown error code
{
qDebug() << "Updater exited with unknown code" << exit_code;
auto msgBox =
QMessageBox(QMessageBox::Information, tr("Unknown Update Error"),
tr("The updater exited with an unknown condition.\nExit Code: %1").arg(QString::number(exit_code)),
QMessageBox::Ok, priv->parent);
auto detail_txt = tr("StdOut: %1\nStdErr: %2").arg(QString(std_output)).arg(QString(std_error));
msgBox.setDetailedText(detail_txt);
qDebug() << "Updater exited with unknown code" << exitCode;
auto msgBox = QMessageBox(QMessageBox::Information, tr("Unknown Update Error"),
tr("The updater exited with an unknown condition.\nExit Code: %1").arg(QString::number(exitCode)),
QMessageBox::Ok, priv->parent);
auto detailTxt = tr("StdOut: %1\nStdErr: %2").arg(QString(stdOutput)).arg(QString(stdError));
msgBox.setDetailedText(detailTxt);
msgBox.setMinimumWidth(460);
msgBox.adjustSize();
msgBox.exec();
@ -269,7 +264,7 @@ void PrismExternalUpdater::setBetaAllowed(bool allowed)
priv->settings->sync();
}
void PrismExternalUpdater::resetAutoCheckTimer()
void PrismExternalUpdater::resetAutoCheckTimer() const
{
if (priv->autoCheck && priv->updateInterval > 0) {
auto now = QDateTime::currentDateTime();
@ -277,9 +272,9 @@ void PrismExternalUpdater::resetAutoCheckTimer()
qint64 timeoutMs = 0;
if (priv->lastCheck.isValid()) {
qint64 diff = priv->lastCheck.secsTo(now);
qint64 secs_left = std::max<qint64>(priv->updateInterval - diff, 0);
timeoutMs = secs_left * 1000;
const qint64 diff = priv->lastCheck.secsTo(now);
const qint64 secsLeft = std::max<qint64>(priv->updateInterval - diff, 0);
timeoutMs = secsLeft * 1000;
}
timeoutMs = std::min(timeoutMs, static_cast<qint64>(INT_MAX));
@ -303,19 +298,22 @@ void PrismExternalUpdater::disconnectTimer()
disconnect(&priv->updateTimer, &QTimer::timeout, this, &PrismExternalUpdater::autoCheckTimerFired);
}
void PrismExternalUpdater::autoCheckTimerFired()
void PrismExternalUpdater::autoCheckTimerFired() const
{
qDebug() << "Auto update Timer fired";
checkForUpdates(false);
}
void PrismExternalUpdater::offerUpdate(const QString& version_name, const QString& version_tag, const QString& release_notes, const bool ignoreSkipped)
void PrismExternalUpdater::offerUpdate(const QString& versionName,
const QString& versionTag,
const QString& releaseNotes,
const bool ignoreSkipped) const
{
priv->settings->beginGroup("skip");
auto should_skip = !ignoreSkipped && priv->settings->value(version_tag, false).toBool();
auto shouldSkip = !ignoreSkipped && priv->settings->value(versionTag, false).toBool();
priv->settings->endGroup();
if (should_skip) {
if (shouldSkip) {
auto msgBox = QMessageBox(QMessageBox::Information, tr("No Update Available"), tr("There are no new updates available."),
QMessageBox::Ok, priv->parent);
msgBox.setMinimumWidth(460);
@ -324,18 +322,18 @@ void PrismExternalUpdater::offerUpdate(const QString& version_name, const QStrin
return;
}
UpdateAvailableDialog dlg(BuildConfig.printableVersionString(), version_name, release_notes);
UpdateAvailableDialog dlg(BuildConfig.printableVersionString(), versionName, releaseNotes);
auto result = dlg.exec();
qDebug() << "offer dlg result" << result;
switch (result) {
case UpdateAvailableDialog::Install: {
performUpdate(version_tag);
performUpdate(versionTag);
return;
}
case UpdateAvailableDialog::Skip: {
priv->settings->beginGroup("skip");
priv->settings->setValue(version_tag, true);
priv->settings->setValue(versionTag, true);
priv->settings->endGroup();
priv->settings->sync();
return;
@ -346,26 +344,26 @@ void PrismExternalUpdater::offerUpdate(const QString& version_name, const QStrin
}
}
void PrismExternalUpdater::performUpdate(const QString& version_tag)
void PrismExternalUpdater::performUpdate(const QString& versionTag) const
{
QProcess proc;
auto exe_name = QStringLiteral("%1_updater").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
#if defined Q_OS_WIN32
exe_name.append(".exe");
auto exeName = QStringLiteral("%1_updater").arg(BuildConfig.LAUNCHER_APP_BINARY_NAME);
#ifdef Q_OS_WIN32
exeName.append(".exe");
auto env = QProcessEnvironment::systemEnvironment();
env.insert("__COMPAT_LAYER", "RUNASINVOKER");
proc.setProcessEnvironment(env);
#else
exe_name = QString("bin/%1").arg(exe_name);
exeName = QString("bin/%1").arg(exeName);
#endif
QStringList args = { "--dir", priv->dataDir.absolutePath(), "--install-version", version_tag };
QStringList args = { "--dir", priv->dataDir.absolutePath(), "--install-version", versionTag };
if (priv->allowBeta) {
args.append("--pre-release");
}
proc.setProgram(priv->appDir.absoluteFilePath(exe_name));
proc.setProgram(priv->appDir.absoluteFilePath(exeName));
proc.setArguments(args);
auto result = proc.startDetached();
if (!result) {

18
launcher/updater/PrismExternalUpdater.h
View file

@ -22,12 +22,10 @@
#pragma once
#include <QObject>
#include "ExternalUpdater.h"
/*!
* An implementation for the updater on windows and linux that uses out external updater.
* An implementation for the updater on Windows and linux that uses out external updater.
*/
class PrismExternalUpdater : public ExternalUpdater {
@ -41,7 +39,7 @@ class PrismExternalUpdater : public ExternalUpdater {
* Check for updates manually, showing the user a progress bar and an alert if no updates are found.
*/
void checkForUpdates() override;
void checkForUpdates(bool triggeredByUser);
void checkForUpdates(bool triggeredByUser) const;
/*!
* Indicates whether or not to check for updates automatically.
@ -62,7 +60,7 @@ class PrismExternalUpdater : public ExternalUpdater {
* Set whether or not to check for updates automatically.
*
* The update schedule cycle will be reset in a short delay after the property’s new value is set. This is to allow
* reverting this property without kicking off a schedule change immediately."
* reverting this property without kicking off a schedule change immediately.
*/
void setAutomaticallyChecksForUpdates(bool check) override;
@ -70,7 +68,7 @@ class PrismExternalUpdater : public ExternalUpdater {
* Set the current automatic update check interval in seconds.
*
* The update schedule cycle will be reset in a short delay after the property’s new value is set. This is to allow
* reverting this property without kicking off a schedule change immediately."
* reverting this property without kicking off a schedule change immediately.
*/
void setUpdateCheckInterval(double seconds) override;
@ -79,15 +77,15 @@ class PrismExternalUpdater : public ExternalUpdater {
*/
void setBetaAllowed(bool allowed) override;
void resetAutoCheckTimer();
void resetAutoCheckTimer() const;
void disconnectTimer();
void connectTimer();
void offerUpdate(const QString& version_name, const QString& version_tag, const QString& release_notes, bool ignoreSkipped);
void performUpdate(const QString& version_tag);
void offerUpdate(const QString& versionName, const QString& versionTag, const QString& releaseNotes, bool ignoreSkipped) const;
void performUpdate(const QString& versionTag) const;
public slots:
void autoCheckTimerFired();
void autoCheckTimerFired() const;
private:
class Private;