BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-08-17 16:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

version checking fix and thank you windows for having min and max macros

Browse Source
This commit is contained in:
Anonymous275 2022-01-18 18:16:45 +02:00
parent 674aae6b7c
commit e8d25beac0
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Logger.h
View File

@ -5,7 +5,8 @@
#pragma once
#include <easyloggingpp/src/easylogging++.h>
#undef min
#undef max
class Log {
public:
static void Init();

28
src/Network/Update.cpp
View File

@ -6,6 +6,31 @@
#include "Launcher.h"
#include "Logger.h"
#include "Http.h"
#include <sstream>
struct Ver {
std::vector<size_t> data;
explicit Ver(const std::string& from_string) {
std::string token;
std::istringstream tokenStream(from_string);
while (std::getline(tokenStream, token, '.')) {
data.emplace_back(std::stol(token));
}
}
std::strong_ordering operator<=>(Ver const& rhs) const noexcept {
size_t const fields = std::min(data.size(), rhs.data.size());
for(size_t i = 0; i != fields; ++i) {
if(data[i] == rhs.data[i]) continue;
else if(data[i] < rhs.data[i]) return std::strong_ordering::less;
else return std::strong_ordering::greater;
}
if(data.size() == rhs.data.size()) return std::strong_ordering::equal;
else if(data.size() > rhs.data.size()) return std::strong_ordering::greater;
else return std::strong_ordering::less;
}
bool operator==(Ver const& rhs) const noexcept {
return std::is_eq(*this <=> rhs);
}
};
void Launcher::UpdateCheck() {
@ -32,7 +57,8 @@ void Launcher::UpdateCheck() {
RemoteVer += c;
}
}
if(RemoteVer > FullVersion){
if(Ver(RemoteVer) > Ver(FullVersion)){
system("cls");
LOG(INFO) << "Update found! Downloading...";
if(std::rename(EP.c_str(), Back.c_str())){