Skip to content

fix (GEN): Version control checks #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phil7789 merged 3 commits into from
Apr 16, 2026
Merged

fix (GEN): Version control checks #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6de1357
Remove doubled code
Phil7789 Apr 16, 2026
a06e317
Fix wrong version comparison
Phil7789 Apr 16, 2026
4baaba6
Update Changelog.txt
Phil7789 Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
* the pdb file is generated during the build process

:lady_beetle: **Fixes**
* CONF - fix UB during coordinate conversion during the parsing of the .ese file for atc stations and vis points
* might need further investigation. On random occasions the conversion of coordinates from the .ese file caused an access violation, possible due to wrong / missing values from the ese file (reason unknown / if related to ES itself)
* CONF - fix crash during coordinate conversion while parsing the .ese file for atc stations and vis points
* due to a wrong coordinate in the .ese file the split was wrong and parameters missing - now guarded against
* GEN - version check could report newer remote version if minor or patch was newer but major was older

[Changelog v0.14.4]
:gear: **Changed Features / Behaviour**
Expand Down
32 changes: 0 additions & 32 deletions area.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,38 +59,6 @@ vsid::Area::Point vsid::Area::toPoint(std::pair<std::string, std::string> &pos)
return {lat, lon};
}

//double vsid::Area::toDeg(std::string& coord)
//{
// std::vector<std::string> dms = vsid::utils::split(coord, '.');
// int multi = 0; // default state in exception case
//
// try
// {
// if (dms.size() < 4)
// throw std::out_of_range("Coordinate string \"" + coord + "\" does not contain enough parts for DMS conversion!");
//
// multi = (dms.at(0).find('S') != std::string::npos || dms.at(0).find('W') != std::string::npos) ? -1 : 1;
//
// double deg = std::stod(dms[0].substr(1, dms[0].length()));
// double min = std::stod(dms[1]) / 60;
// double sec = (std::stod(dms[2]) + std::stod("0." + dms[3])) / 3600;
//
// return (deg + min + sec) * multi;
// }
// catch (std::out_of_range &e)
// {
// messageHandler->writeMessage("ERROR", "Out of bounds while calculating coordinate: " + coord + ". " + e.what());
// }
// catch (const std::invalid_argument& e)
// {
// messageHandler->writeMessage("ERROR", "Invalid number format in coord " + coord + ". " + e.what());
// }
//
// messageHandler->writeMessage("WARNING", "Fallback state for \"" + coord + "\"! Failed to calculate. DMS will be set to 0.0");
//
// return 0.0;
//}

bool vsid::Area::inside(const EuroScopePlugIn::CPosition& fplnPos)
{
std::pair<Point, Point> l5 = { {fplnPos.m_Latitude, fplnPos.m_Longitude}, {fplnPos.m_Latitude + 0.05, fplnPos.m_Longitude + 0.05} };
Expand Down
8 changes: 0 additions & 8 deletions area.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,5 @@ namespace vsid
* @param pos the fpln position as pair of lat/long coordinates
*/
Point toPoint(std::pair<std::string, std::string> &pos);

/**
* @brief Transforms lat/long string value into decimal equivalent // #refactor - change to utils.h version
*
* @param coord
* @return double
*/
/*double toDeg(std::string& coord);*/
};
}
38 changes: 15 additions & 23 deletions versionchecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,34 +41,26 @@ std::string vsid::version::semverToString(const vsid::version::semver& v)

int vsid::version::compSemVer(const vsid::version::semver& local, const vsid::version::semver& remote)
{
if (!std::get<3>(remote))
{
if (std::get<0>(remote) > std::get<0>(local) ||
std::get<1>(remote) > std::get<1>(local) ||
std::get<2>(remote) > std::get<2>(local))
{
return 1; // new stable release
}
}
else
// get base version (major, minor, patch)
auto baseLocal = std::tie(std::get<0>(local), std::get<1>(local), std::get<2>(local));
auto baseRemote = std::tie(std::get<0>(remote), std::get<1>(remote), std::get<2>(remote));

bool remoteIsStable = !std::get<3>(remote);
bool localIsStable = !std::get<3>(local);

if (baseRemote > baseLocal) return remoteIsStable ? 1 : 2; // remote is newer, 1 = stable, 2 = pre-release

if (baseRemote == baseLocal)
{
if ((std::get<0>(remote) > std::get<0>(local) ||
std::get<1>(remote) > std::get<1>(local) ||
std::get<2>(remote) > std::get<2>(local)) &&
std::get<3>(remote) != std::get<3>(local))
if (!remoteIsStable && !localIsStable)
{
return 2; // assumed new pre-release
}
else if (std::get<0>(remote) == std::get<0>(local) &&
std::get<1>(remote) == std::get<1>(local) &&
std::get<2>(remote) == std::get<2>(local) &&
std::get<3>(remote) != std::get<3>(local))
{
return 2; // assumed new pre-release, only hash differs
if (std::get<3>(remote) != std::get<3>(local)) return 2; // assumed new pre-release
}
else if (remoteIsStable && !localIsStable)
return 1; // new stable release
}

return 0;
return 0; // default state - no update
}

std::optional<std::string> vsid::version::getHttp(bool prerelease)
Expand Down
Loading