chore: Adjust Clang-format linter rules
120 Column Lines Block Indent for Bracket Align Custom Line Break Rules No Single Line Functions
This commit is contained in:
@ -30,38 +30,30 @@
|
||||
|
||||
using namespace deskflow::gui;
|
||||
|
||||
VersionChecker::VersionChecker(
|
||||
std::shared_ptr<QNetworkAccessManagerProxy> network)
|
||||
: m_network(
|
||||
network ? network : std::make_shared<QNetworkAccessManagerProxy>()) {
|
||||
VersionChecker::VersionChecker(std::shared_ptr<QNetworkAccessManagerProxy> network)
|
||||
: m_network(network ? network : std::make_shared<QNetworkAccessManagerProxy>())
|
||||
{
|
||||
m_network->init();
|
||||
connect(
|
||||
m_network.get(), &QNetworkAccessManagerProxy::finished, this,
|
||||
&VersionChecker::replyFinished);
|
||||
connect(m_network.get(), &QNetworkAccessManagerProxy::finished, this, &VersionChecker::replyFinished);
|
||||
}
|
||||
|
||||
void VersionChecker::checkLatest() const {
|
||||
void VersionChecker::checkLatest() const
|
||||
{
|
||||
const QString url = env_vars::versionUrl();
|
||||
qDebug("checking for updates at: %s", qPrintable(url));
|
||||
auto request = QNetworkRequest(url);
|
||||
auto userAgent = QString("%1 %2 on %3")
|
||||
.arg(kAppName)
|
||||
.arg(kVersion)
|
||||
.arg(QSysInfo::prettyProductName());
|
||||
auto userAgent = QString("%1 %2 on %3").arg(kAppName).arg(kVersion).arg(QSysInfo::prettyProductName());
|
||||
request.setHeader(QNetworkRequest::UserAgentHeader, userAgent);
|
||||
request.setRawHeader("X-" DESKFLOW_APP_NAME "-Version", kVersion);
|
||||
request.setRawHeader(
|
||||
"X-" DESKFLOW_APP_NAME "-Language",
|
||||
QLocale::system().name().toStdString().c_str());
|
||||
request.setRawHeader("X-" DESKFLOW_APP_NAME "-Language", QLocale::system().name().toStdString().c_str());
|
||||
m_network->get(request);
|
||||
}
|
||||
|
||||
void VersionChecker::replyFinished(QNetworkReply *reply) {
|
||||
const auto httpStatus =
|
||||
reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
void VersionChecker::replyFinished(QNetworkReply *reply)
|
||||
{
|
||||
const auto httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (reply->error() != QNetworkReply::NoError) {
|
||||
qWarning(
|
||||
"version check server error: %s", qPrintable(reply->errorString()));
|
||||
qWarning("version check server error: %s", qPrintable(reply->errorString()));
|
||||
qWarning("error checking for updates, http status: %d", httpStatus);
|
||||
return;
|
||||
}
|
||||
@ -71,8 +63,7 @@ void VersionChecker::replyFinished(QNetworkReply *reply) {
|
||||
const auto newestVersion = QString(reply->readAll());
|
||||
qDebug("version check response: %s", qPrintable(newestVersion));
|
||||
|
||||
if (!newestVersion.isEmpty() &&
|
||||
compareVersions(DESKFLOW_VERSION, newestVersion) > 0) {
|
||||
if (!newestVersion.isEmpty() && compareVersions(DESKFLOW_VERSION, newestVersion) > 0) {
|
||||
qDebug("update found");
|
||||
emit updateFound(newestVersion);
|
||||
} else {
|
||||
@ -80,7 +71,8 @@ void VersionChecker::replyFinished(QNetworkReply *reply) {
|
||||
}
|
||||
}
|
||||
|
||||
int VersionChecker::getStageVersion(QString stage) {
|
||||
int VersionChecker::getStageVersion(QString stage)
|
||||
{
|
||||
const char *stableName = "stable";
|
||||
const char *rcName = "rc";
|
||||
const char *betaName = "beta";
|
||||
@ -107,7 +99,8 @@ int VersionChecker::getStageVersion(QString stage) {
|
||||
return otherValue;
|
||||
}
|
||||
|
||||
int VersionChecker::compareVersions(const QString &left, const QString &right) {
|
||||
int VersionChecker::compareVersions(const QString &left, const QString &right)
|
||||
{
|
||||
if (left.compare(right) == 0)
|
||||
return 0; // versions are same.
|
||||
|
||||
@ -134,12 +127,9 @@ int VersionChecker::compareVersions(const QString &left, const QString &right) {
|
||||
const int rightStage = getStageVersion(rightStagePart);
|
||||
|
||||
const bool rightWins =
|
||||
(rightMajor > leftMajor) ||
|
||||
((rightMajor >= leftMajor) && (rightMinor > leftMinor)) ||
|
||||
((rightMajor >= leftMajor) && (rightMinor >= leftMinor) &&
|
||||
(rightPatch > leftPatch)) ||
|
||||
((rightMajor >= leftMajor) && (rightMinor >= leftMinor) &&
|
||||
(rightPatch >= leftPatch) && (rightStage > leftStage));
|
||||
(rightMajor > leftMajor) || ((rightMajor >= leftMajor) && (rightMinor > leftMinor)) ||
|
||||
((rightMajor >= leftMajor) && (rightMinor >= leftMinor) && (rightPatch > leftPatch)) ||
|
||||
((rightMajor >= leftMajor) && (rightMinor >= leftMinor) && (rightPatch >= leftPatch) && (rightStage > leftStage));
|
||||
|
||||
return rightWins ? 1 : -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user