mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 02:36:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make Program Updater choose the same build for download

Browse source 
We're probably stuck offering the duo of RC_1_2 and RC_2_0 for some
time in the future. So hardcode the choices and make the Program Updater
choose the variant the user currently uses.
This commit is contained in:
sledgehammer999 2024-08-24 23:52:53 +03:00
parent bb0fcc5841
commit b0fbe7bfdb
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/gui/programupdater.cpp
View file

@ -29,6 +29,9 @@
#include "programupdater.h" #include "programupdater.h"
#include <libtorrent/version.hpp>
#include <QtCore/qconfig.h>
#include <QtGlobal> #include <QtGlobal>
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
@ -71,6 +74,22 @@ namespace
} }
return (newVersion > currentVersion); return (newVersion > currentVersion);
} }
QString buildVariant()
{
#if defined(Q_OS_MACOS)
const auto BASE_OS = u"Mac OS X"_s;
#elif defined(Q_OS_WIN)
const auto BASE_OS = (::IsWindows7OrGreater() && QSysInfo::currentCpuArchitecture().endsWith(u"64"))
? u"Windows x64"_s
: u"Windows"_s;
#endif
if constexpr ((QT_VERSION_MAJOR == 6) && (LIBTORRENT_VERSION_MAJOR == 1))
return BASE_OS;
return u"%1 (qt%2 lt%3%4)"_s.arg(BASE_OS, QString::number(QT_VERSION_MAJOR), QString::number(LIBTORRENT_VERSION_MAJOR), QString::number(LIBTORRENT_VERSION_MINOR));
}
} }
void ProgramUpdater::checkForUpdates() const void ProgramUpdater::checkForUpdates() const
@ -107,14 +126,7 @@ void ProgramUpdater::rssDownloadFinished(const Net::DownloadResult &result)
: QString {}; : QString {};
}; };
#ifdef Q_OS_MACOS const QString variant = buildVariant();
const QString OS_TYPE = u"Mac OS X"_s;
#elif defined(Q_OS_WIN)
const QString OS_TYPE = (::IsWindows7OrGreater() && QSysInfo::currentCpuArchitecture().endsWith(u"64"))
? u"Windows x64"_s
: u"Windows"_s;
#endif
bool inItem = false; bool inItem = false;
QString version; QString version;
QString updateLink; QString updateLink;
@ -140,7 +152,7 @@ void ProgramUpdater::rssDownloadFinished(const Net::DownloadResult &result)
{ {
if (inItem && (xml.name() == u"item")) if (inItem && (xml.name() == u"item"))
{ {
if (type.compare(OS_TYPE, Qt::CaseInsensitive) == 0) if (type.compare(variant, Qt::CaseInsensitive) == 0)
{ {
qDebug("The last update available is %s", qUtf8Printable(version)); qDebug("The last update available is %s", qUtf8Printable(version));
if (!version.isEmpty()) if (!version.isEmpty())