squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-10 17:35:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Store version numbers in the appropriate type

Browse Source
This commit is contained in:
sledgehammer999
2025-06-30 10:08:22 +03:00
parent c47b981a56
commit 9ad4a94940
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/programupdater.cpp
View File

@@ -49,23 +49,20 @@
namespace
{
bool isVersionMoreRecent(const QString &remoteVersion)
bool isVersionMoreRecent(const ProgramUpdater::Version &remoteVersion)
{
using Version = Utils::Version<4, 3>;
const auto newVersion = Version::fromString(remoteVersion);
if (!newVersion.isValid())
if (!remoteVersion.isValid())
return false;
const Version currentVersion {QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD};
if (newVersion == currentVersion)
const ProgramUpdater::Version currentVersion {QBT_VERSION_MAJOR, QBT_VERSION_MINOR, QBT_VERSION_BUGFIX, QBT_VERSION_BUILD};
if (remoteVersion == currentVersion)
{
const bool isDevVersion = QStringLiteral(QBT_VERSION_STATUS).contains(
QRegularExpression(u"(alpha|beta|rc)"_s));
if (isDevVersion)
return true;
}
return (newVersion > currentVersion);
return (remoteVersion > currentVersion);
}
QString buildVariant()
@@ -99,7 +96,7 @@ void ProgramUpdater::checkForUpdates() const
m_hasCompletedOneReq = false;
}
QString ProgramUpdater::getNewVersion() const
ProgramUpdater::Version ProgramUpdater::getNewVersion() const
{
return shouldUseFallback() ? m_fallbackRemoteVersion : m_remoteVersion;
}
@@ -153,9 +150,10 @@ void ProgramUpdater::rssDownloadFinished(const Net::DownloadResult &result)
if (!version.isEmpty())
{
qDebug("Detected version is %s", qUtf8Printable(version));
if (isVersionMoreRecent(version))
const ProgramUpdater::Version tmpVer {version};
if (isVersionMoreRecent(tmpVer))
{
m_remoteVersion = version;
m_remoteVersion = tmpVer;
m_updateURL = updateLink;
}
}
@@ -192,9 +190,9 @@ void ProgramUpdater::fallbackDownloadFinished(const Net::DownloadResult &result)
if (const QJsonValue verJSON = json[platformKey][u"version"_s]; verJSON.isString())
{
const auto ver = verJSON.toString();
if (isVersionMoreRecent(ver))
m_fallbackRemoteVersion = ver;
const ProgramUpdater::Version tmpVer {verJSON.toString()};
if (isVersionMoreRecent(tmpVer))
m_fallbackRemoteVersion = tmpVer;
}
handleFinishedRequest();
@@ -215,10 +213,5 @@ void ProgramUpdater::handleFinishedRequest()
bool ProgramUpdater::shouldUseFallback() const
{
using Version = Utils::Version<4, 3>;
const auto remote = Version::fromString(m_remoteVersion);
const auto fallback = Version::fromString(m_fallbackRemoteVersion);
return fallback > remote;
return m_fallbackRemoteVersion > m_remoteVersion;
}