jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 16:32:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor OS checking code

Browse source
This commit is contained in:
RickyRister 2025-02-12 20:50:05 -08:00
parent 9032310b3e
commit fc63b87163
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/client/network/release_channel.cpp
View file

@ -39,9 +39,9 @@ void ReleaseChannel::checkForUpdates()
} }
// Different release channel checking functions for different operating systems // Different release channel checking functions for different operating systems
#if defined(Q_OS_MACOS)
bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName) bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
{ {
#if defined(Q_OS_MACOS)
static QRegularExpression version_regex("macOS(\\d+)"); static QRegularExpression version_regex("macOS(\\d+)");
auto match = version_regex.match(fileName); auto match = version_regex.match(fileName);
if (!match.hasMatch()) { if (!match.hasMatch()) {
@ -52,10 +52,8 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
int sys_maj = QSysInfo::productVersion().split(".")[0].toInt(); int sys_maj = QSysInfo::productVersion().split(".")[0].toInt();
int rel_maj = match.captured(1).toInt(); int rel_maj = match.captured(1).toInt();
return rel_maj == sys_maj; return rel_maj == sys_maj;
}
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
{
#if Q_PROCESSOR_WORDSIZE == 4 #if Q_PROCESSOR_WORDSIZE == 4
return fileName.contains("32bit"); return fileName.contains("32bit");
#elif Q_PROCESSOR_WORDSIZE == 8 #elif Q_PROCESSOR_WORDSIZE == 8
@ -66,16 +64,15 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
return fileName.contains("Win10"); return fileName.contains("Win10");
} }
#else #else
Q_UNUSED(fileName);
return false;
#endif
#else // If the OS doesn't fit one of the above #defines, then it will never match
Q_UNUSED(fileName);
return false; return false;
#endif #endif
} }
#else
bool ReleaseChannel::downloadMatchesCurrentOS(const QString &)
{
// If the OS doesn't fit one of the above #defines, then it will never match
return false;
}
#endif
QString StableReleaseChannel::getManualDownloadUrl() const QString StableReleaseChannel::getManualDownloadUrl() const
{ {