chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove old version comparison code.

Browse Source
This commit is contained in:
sawinglogz 2020-01-15 17:15:24 -05:00
parent d7fade5f4c
commit 93b9007f67
3 changed files with 3 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/main.cpp
View File

@ -541,12 +541,12 @@ int main(int argc, char *argv[]) {
}
#endif
int vc = compareVersion(AppSetting->versionString());
if (vc < 0) {
Version settingsVersion = Version(AppSetting->versionString());
if (getVersion() > settingsVersion) {
AppSetting->setShowAboutDialog(1);
// release_notes();
// check_updates = false;
} else if (vc > 0) {
} else if (getVersion() < settingsVersion) {
if (QMessageBox::warning(nullptr, STR_MessageBox_Error,
QObject::tr("The version of OSCAR you just ran is OLDER than the one used to create this data (%1).").
arg(AppSetting->versionString()) +"\n\n"+

141
oscar/version.cpp
View File

@ -83,147 +83,6 @@ QString getPrereleaseSuffix()
}
int checkVersionStatus(QString statusstr)
{
bool ok;
// because Qt Install Framework is dumb and doesn't handle beta/release strings in version numbers,
// so we store them numerically instead
int v =statusstr.toInt(&ok);
if (ok) {
return v;
}
if ((statusstr.compare("testing", Qt::CaseInsensitive) == 0) || (statusstr.compare("unstable", Qt::CaseInsensitive) == 0)) return 0;
else if ((statusstr.compare("beta", Qt::CaseInsensitive) == 0) || (statusstr.compare("untamed", Qt::CaseInsensitive) == 0)) return 1;
else if ((statusstr.compare("rc", Qt::CaseInsensitive) == 0) || (statusstr.compare("almost", Qt::CaseInsensitive) == 0)) return 2;
else if ((statusstr.compare("r", Qt::CaseInsensitive) == 0) || (statusstr.compare("stable", Qt::CaseInsensitive) == 0)) return 3;
// anything else is considered a test build
return 0;
}
struct VersionStruct {
short major;
short minor;
short revision;
short status;
short build;
};
VersionStruct parseVersion(QString versionstring)
{
static VersionStruct version;
QStringList parts = versionstring.split(".");
bool ok, dodgy = false;
if (parts.size() < 3) dodgy = true;
short major = parts[0].toInt(&ok);
if (!ok) dodgy = true;
short minor = parts[1].toInt(&ok);
if (!ok) dodgy = true;
QStringList patchver = parts[2].split("-");
if (patchver.size() < 3) dodgy = true;
short rev = patchver[0].toInt(&ok);
if (!ok) dodgy = true;
short build = patchver[2].toInt(&ok);
if (!ok) dodgy = true;
int status = checkVersionStatus(patchver[1]);
if (!dodgy) {
version.major = major;
version.minor = minor;
version.revision = rev;
version.status = status;
version.build = build;
}
return version;
}
// Compare supplied version string with current version
// < 0 = this one is newer or version supplied is dodgy, 0 = same, and > 0 there is a newer version
int compareVersion(const QString & version)
{
// v1.0.0-beta-2
QStringList parts = version.split(".");
bool ok;
if (parts.size() < 3) {
// dodgy version string supplied.
return -1;
}
int major = parts[0].toInt(&ok);
if (!ok) return -1;
int minor = parts[1].toInt(&ok);
if (!ok) return -1;
if (major > major_version) {
return 1;
} else if (major < major_version) {
return -1;
}
if (minor > minor_version) {
return 1;
} else if (minor < minor_version) {
return -1;
}
int build_index = 1;
int build = 0;
int status = 0;
QStringList patchver = parts[2].split("-");
if (patchver.size() >= 3) {
build_index = 2;
status = checkVersionStatus(patchver[1]);
} else if (patchver.size() < 2) {
return -1;
// dodgy version string supplied.
}
int rev = patchver[0].toInt(&ok);
if (!ok) return -1;
if (rev > revision_number) {
return 1;
} else if (rev < revision_number) {
return -1;
}
build = patchver[build_index].toInt(&ok);
if (!ok) return -1;
int rstatus = checkVersionStatus(ReleaseStatus);
if (patchver.size() == 3) {
// read it if it's actually present.
}
if (status > rstatus) {
return 1;
} else if (status < rstatus) {
return -1;
}
if (build > build_number) {
return 1;
} else if (build < build_number) {
return -1;
}
// Versions match
return 0;
}
bool isReleaseVersion()
{
return (ReleaseStatus == "r");

2
oscar/version.h
View File

@ -42,8 +42,6 @@ const Version & getVersion();
extern const QString VersionString;
int compareVersion(const QString & version);
QString getBranchVersion();
QString getPrereleaseSuffix();
const QString & gitRevision();