jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-27 00:14:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

ReleaseChannel: parse non-numeric OS versions on Windows Server

Browse source 
QSysInfo::productVersion() returns "Server 2022" on Windows Server, so
splitting on '.' and calling toInt() made the version unparseable and
disabled the in-client updater there. Extract the first numeric token
instead; Server 2022 becomes 2022 and matches the Win10 assets.
This commit is contained in:
Lukas Brübach 2026-09-21 11:27:47 +02:00
parent cc9cf9ba63
commit fd8ed26555
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cockatrice/src/client/network/update/client/release_channel.cpp
View file

@ -27,6 +27,27 @@
#define GIT_SHORT_HASH_LEN 7 #define GIT_SHORT_HASH_LEN 7
namespace
{
// QSysInfo::productVersion() is not guaranteed to start with a number, e.g. it returns
// "Server 2022" on Windows Server. Use the first numeric token as the major host version.
std::optional<int> getProductVersionMajor()
{
const QString versionString = QSysInfo::productVersion();
bool ok = false;
static const QRegularExpression firstNumber(R"((\d+))");
const auto match = firstNumber.match(versionString);
const int version = match.hasMatch() ? match.captured(1).toInt(&ok) : 0;
if (!ok) {
qCWarning(ReleaseChannelLog) << "Unable to determine OS version from" << versionString;
return std::nullopt;
}
return version;
}
} // namespace
ReleaseChannel::ReleaseChannel() : netMan(new QNetworkAccessManager(this)), response(nullptr), lastRelease(nullptr) ReleaseChannel::ReleaseChannel() : netMan(new QNetworkAccessManager(this)), response(nullptr), lastRelease(nullptr)
{ {
} }
@ -49,16 +70,7 @@ std::optional<int> ReleaseChannel::getTargetVersionForCurrentOS(const QString &f
{ {
const QRegularExpression *regex = nullptr; const QRegularExpression *regex = nullptr;
static const std::optional<int> systemVersion = [] { static const std::optional<int> systemVersion = getProductVersionMajor();
bool ok = false;
const QString versionString = QSysInfo::productVersion();
const int version = versionString.split('.').first().toInt(&ok);
if (!ok) {
qCWarning(ReleaseChannelLog) << "Unable to determine OS version from" << versionString;
return std::optional<int>();
}
return std::optional<int>{version};
}();
if (!systemVersion) { if (!systemVersion) {
return std::nullopt; return std::nullopt;