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

Check for invalid version strings in versions.xml; fix display problem; update release notes for Phil

Browse Source
This commit is contained in:
Guy Scharf 2020-07-21 13:50:06 -07:00
parent d8a7cf2133
commit 01c663b692
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -26,6 +26,7 @@
<li>[fix] Adjust font size and column widths on Statistics page.</li> <li>[fix] Adjust font size and column widths on Statistics page.</li>
<li>[fix] Improve language in various error messages.</li> <li>[fix] Improve language in various error messages.</li>
<li>[fix] Date at right end of Overview page reflects actual data, not any future notes.</li> <li>[fix] Date at right end of Overview page reflects actual data, not any future notes.</li>
<li>[fix] Limit SD card scan to mounted vfat volumes.</li>
</ul> </ul>
<p> <p>
<b>Changes and fixes in OSCAR v1.1.1</b> <b>Changes and fixes in OSCAR v1.1.1</b>

20
oscar/checkupdates.cpp
View File

@ -64,7 +64,6 @@ QString platformStr()
return platform; return platform;
} }
//static const QString OSCAR_Version_File = "http://www.guyscharf.com/VERSION/versions.xml";
static const QString OSCAR_Version_File = "http://www.sleepfiles.com/OSCAR/versions/versions.xml"; static const QString OSCAR_Version_File = "http://www.sleepfiles.com/OSCAR/versions/versions.xml";
static QString versionXML; static QString versionXML;
@ -90,7 +89,6 @@ QString readLocalVersions() {
return QString(); return QString();
} }
return QString(qba).toLower(); return QString(qba).toLower();
} }
/*! \fn GetVersionInfo /*! \fn GetVersionInfo
@ -124,8 +122,13 @@ VersionInfo getVersionInfo (QString type, QString platform) {
//qDebug() << "expecting version or notes, read" << reader.name(); //qDebug() << "expecting version or notes, read" << reader.name();
if (reader.name() == "version") { if (reader.name() == "version") {
QString fileVersion = reader.readElementText(); QString fileVersion = reader.readElementText();
if (Version(fileVersion) > getVersion()) Version fv(fileVersion);
foundInfo.version = fileVersion; // We found a more recent version if (!fv.IsValid()) {
qWarning() << "Server file versions.xml contains an invalid version code" << fileVersion;
} else {
if (fv > getVersion())
foundInfo.version = fileVersion; // We found a more recent version
}
} }
else if (reader.name() == "notes") { else if (reader.name() == "notes") {
foundInfo.notes = reader.readElementText(); foundInfo.notes = reader.readElementText();
@ -145,7 +148,7 @@ VersionInfo getVersionInfo (QString type, QString platform) {
} }
} }
else { else {
qWarning() << "Versions file improperly formed --" << reader.errorString(); qWarning() << "Versions.xml file improperly formed --" << reader.errorString();
reader.raiseError(QObject::tr("New versions file improperly formed")); reader.raiseError(QObject::tr("New versions file improperly formed"));
} }
} }
@ -158,9 +161,12 @@ void CheckUpdates::compareVersions () {
VersionInfo releaseVersion = getVersionInfo ("release", platformStr()); VersionInfo releaseVersion = getVersionInfo ("release", platformStr());
VersionInfo testVersion = getVersionInfo ("test", platformStr()); VersionInfo testVersion = getVersionInfo ("test", platformStr());
if (testVersion.version.length() == 0 && releaseVersion.version.length() == 0 && showIfCurrent) msg = "";
if (testVersion.version.length() == 0 && releaseVersion.version.length() == 0) {
if (showIfCurrent)
msg = QObject::tr("You are running the latest release of OSCAR"); msg = QObject::tr("You are running the latest release of OSCAR");
else { } else {
msg = QObject::tr("A more recent version of OSCAR is available"); msg = QObject::tr("A more recent version of OSCAR is available");
msg += "<p>" + QObject::tr("You are running version %1").arg(getVersion()) + "</p>"; msg += "<p>" + QObject::tr("You are running version %1").arg(getVersion()) + "</p>";
if (releaseVersion.version.length() > 0) { if (releaseVersion.version.length() > 0) {