Skip to content

pull updates from gh #408

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

Open
zomfg wants to merge 4 commits into
base: master
Choose a base branch
from
Open

pull updates from gh #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
973b167
update processor: use gh api / removed xml
zomfg Nov 15, 2020
31993ce
test project: removed AppVersion
zomfg Nov 15, 2020
d1df8aa
updates processor: revert version.h
zomfg Nov 15, 2020
8007d44
updates processor / sys try icon: QStringLiterals
zomfg Nov 20, 2020
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
166 changes: 33 additions & 133 deletions Software/src/UpdatesProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
*/

#include <QCoreApplication>
#include <QXmlStreamReader>
#include <QNetworkReply>
#include <QJsonObject>
#include <QJsonDocument>
#include <QJsonArray>
#include <QFile>
#include <QDir>
#include <QProcess>
Expand All @@ -35,10 +37,9 @@
#include "UpdatesProcessor.hpp"
#include "Settings.hpp"

//#define UPDATE_CHECK_URL "https://psieg.de/lightpack/update.xml"
#define UPDATE_CHECK_URL "https://psieg.github.io/Lightpack/update.xml"

const AppVersion kCurVersion(VERSION_STR);
// #define UPDATE_CHECK_URL "https://psieg.de/lightpack/update.xml"
// #define UPDATE_CHECK_URL "https://psieg.github.io/Lightpack/update.xml"
#define UPDATE_CHECK_URL "https://api.github.com/repos/psieg/Lightpack/releases/latest"

UpdatesProcessor::UpdatesProcessor(QObject * parent)
: QObject(parent)
Expand All @@ -60,38 +61,39 @@ void UpdatesProcessor::requestUpdates()
_reply = NULL;
}

QNetworkRequest request(QUrl(UPDATE_CHECK_URL));
QNetworkRequest request(QUrl(QStringLiteral(UPDATE_CHECK_URL)));
request.setHeader(QNetworkRequest::UserAgentHeader, QVariant("psieg/Lightpack"));
request.setSslConfiguration(QSslConfiguration::defaultConfiguration());
_reply = _networkMan.get(request);
connect(_reply, SIGNAL(finished()), this, SIGNAL(readyRead()));
connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
}

QList<UpdateInfo> UpdatesProcessor::readUpdates()
UpdateInfo UpdatesProcessor::readUpdates()
{
QList<UpdateInfo> updates;

QXmlStreamReader xmlReader(_reply->readAll());

if (xmlReader.readNextStartElement()) {
if (xmlReader.name() == "updates") {
readUpdates(&updates, &xmlReader);
QList<UpdateInfo>::iterator it = updates.begin();
while (it != updates.end()) {
UpdateInfo updateInfo = *it;
if (!updateInfo.softwareVersion.isEmpty() && !isVersionMatches(updateInfo.softwareVersion, kCurVersion)) {
updates.removeAll(updateInfo);
} else {
it++;
}
}
}
const QJsonObject& releaseObject = QJsonDocument::fromJson(_reply->readAll()).object();

UpdateInfo update;

update.id = releaseObject.value(QStringLiteral("id")).toInt();
update.url = releaseObject.value(QStringLiteral("html_url")).toString();
update.text = releaseObject.value(QStringLiteral("body")).toString();
update.title = releaseObject.value(QStringLiteral("name")).toString();
update.softwareVersion = QVersionNumber::fromString(releaseObject.value(QStringLiteral("tag_name")).toString());
Copy link
Owner

@psieg psieg Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if this fails, e.g. "FW_version_6+1"?

Copy link
Author

@zomfg zomfg Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

softwareVersion will be isNull() internally and compare() will treat it as v0, so no update

// find firmware in assets?
// update.firmwareVersion = ...
for (const QJsonValue& assetValue : releaseObject.value(QStringLiteral("assets")).toArray()) {
const QJsonObject& obj = assetValue.toObject();
if (obj.value(QStringLiteral("name")).toString().endsWith(QStringLiteral(".exe")))
update.pkgUrl = obj.value(QStringLiteral("browser_download_url")).toString();
else if (obj.value(QStringLiteral("name")).toString().endsWith(QStringLiteral(".exe.updater_signature")))
update.sigUrl = obj.value(QStringLiteral("browser_download_url")).toString();
}
DEBUG_LOW_LEVEL << Q_FUNC_INFO << updates.size() << "updates available";
return updates;
DEBUG_LOW_LEVEL << Q_FUNC_INFO << "latest available version" << update.softwareVersion;
return update;
}

void UpdatesProcessor::loadUpdate(UpdateInfo& info)
void UpdatesProcessor::loadUpdate(const UpdateInfo& info)
{
#ifdef Q_OS_WIN
DEBUG_MID_LEVEL << Q_FUNC_INFO << "fetching" << info.pkgUrl;
Expand Down Expand Up @@ -121,6 +123,7 @@ void UpdatesProcessor::loadUpdate(UpdateInfo& info)
connect(_reply, SIGNAL(finished()), this, SLOT(updatePgkLoaded()));
connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
#else
Q_UNUSED(info)
qWarning() << Q_FUNC_INFO << "Trying to load update on non-windows platform -- ignored";
#endif
}
Expand All @@ -133,7 +136,7 @@ void UpdatesProcessor::updatePgkLoaded()

DEBUG_MID_LEVEL << Q_FUNC_INFO << "fetching " << _sigUrl;

QFile f(QDir::tempPath() + "\\PsiegUpdateElevate_Prismatik.exe");
QFile f(QDir::tempPath() + QStringLiteral("\\PsiegUpdateElevate_Prismatik.exe"));
if (!f.open(QIODevice::WriteOnly)) {
qCritical() << Q_FUNC_INFO << "Failed to write update package";
}
Expand Down Expand Up @@ -164,7 +167,7 @@ void UpdatesProcessor::updateSigLoaded()
return;
DEBUG_MID_LEVEL << Q_FUNC_INFO;

QFile f(QDir::tempPath() + "\\PsiegUpdateElevate_Prismatik.exe.sig");
QFile f(QDir::tempPath() + QStringLiteral("\\PsiegUpdateElevate_Prismatik.exe.sig"));
if (!f.open(QIODevice::WriteOnly)) {
qCritical() << Q_FUNC_INFO << "Failed to write update signature";
}
Expand All @@ -182,113 +185,10 @@ void UpdatesProcessor::updateSigLoaded()
args.append("request");
args.append(QDir::tempPath());
args.append(QCoreApplication::applicationFilePath());
if (QProcess::startDetached(QCoreApplication::applicationDirPath() + "\\UpdateElevate.exe", args)) {
if (QProcess::startDetached(QCoreApplication::applicationDirPath() + QStringLiteral("\\UpdateElevate.exe"), args)) {
QCoreApplication::quit();
} else {
qCritical() << Q_FUNC_INFO << "Failed to start UpdateElevate.exe";
}
}
#endif

bool UpdatesProcessor::isVersionMatches(const QString &predicate, const AppVersion &version)
{
enum Condition {
LT,
GT,
EQ,
LE,
GE
};

Condition cond;
QStringRef predicateRef(&predicate);

QStringRef predicateVerStr = predicateRef.mid(2).trimmed();

QStringRef condStr = predicateRef.left(2);

if (condStr == "lt") {
cond = LT;
} else if (condStr == "gt") {
cond = GT;
} else if (condStr == "eq") {
cond = EQ;
} else if (condStr == "le") {
cond = LE;
} else if (condStr == "ge") {
cond = GE;
} else {
cond = EQ;
predicateVerStr = predicateRef.trimmed();
}

AppVersion predicateVer(predicateVerStr.toString());

if (!version.isValid() || !predicateVer.isValid())
return false;

switch (cond) {
case LT:
return version < predicateVer;
break;
case GT:
return version > predicateVer;
break;
case EQ:
return version == predicateVer;
break;
case LE:
return version <= predicateVer;
break;
case GE:
return version >= predicateVer;
break;
}

Q_ASSERT(false);
return false;
}

QList<UpdateInfo> * UpdatesProcessor::readUpdates(QList<UpdateInfo> *updates, QXmlStreamReader *xmlReader)
{
if (xmlReader->readNextStartElement()) {
while (xmlReader->name() == "update") {
UpdateInfo updateInfo;
while(xmlReader->readNextStartElement()) {
if (xmlReader->name() == "id") {
xmlReader->readNext();
QStringRef id = xmlReader->text();
updateInfo.id = id.toUInt();
} else if (xmlReader->name() == "url") {
xmlReader->readNext();
updateInfo.url = xmlReader->text().toString();
} else if (xmlReader->name() == "pkgUrl") {
xmlReader->readNext();
updateInfo.pkgUrl = xmlReader->text().toString();
} else if (xmlReader->name() == "sigUrl") {
xmlReader->readNext();
updateInfo.sigUrl = xmlReader->text().toString();
} else if (xmlReader->name() == "title") {
xmlReader->readNext();
updateInfo.title = xmlReader->text().toString();
} else if (xmlReader->name() == "text") {
xmlReader->readNext();
updateInfo.text = xmlReader->text().toString();
} else if (xmlReader->name() == "softwareVersion") {
xmlReader->readNext();
updateInfo.softwareVersion = xmlReader->text().toString();
} else if (xmlReader->name() == "firmwareVersion") {
xmlReader->readNext();
updateInfo.firmwareVersion = xmlReader->text().toString();
} else if (xmlReader->name() == "update") {
break;
}
xmlReader->skipCurrentElement();
}
// add updates with defined id only
if(updateInfo.id > 0)
updates->append(updateInfo);
}
}
return updates;
}
91 changes: 5 additions & 86 deletions Software/src/UpdatesProcessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,87 +32,9 @@
#include <QObject>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QVersionNumber>

class QNetworkReply;
class QXmlStreamReader;

class AppVersion
{
public:
AppVersion()
: _major(0)
, _minor(0)
, _rc(0)
, _build(0)
{}

AppVersion(const QString &version)
{
initWith(version);
}

void initWith(const QString &version)
{
QStringList splittedVer = version.split(".");
if (splittedVer.size() > 4 || splittedVer.size() < 1)
{
return;
}

_major = splittedVer[0].toInt();
_minor = splittedVer.size() > 1 ? splittedVer[1].toInt() : 0;
_rc = splittedVer.size() > 2 ? splittedVer[2].toInt() : 0;
_build = splittedVer.size() > 3 ? splittedVer[3].toInt() : 0;
}

bool isValid() const {
return _major != 0 || _minor != 0 || _rc != 0 || _build != 0;
}

int compare(const AppVersion &other) const {
int dmj = this->_major - other._major;
if (dmj != 0)
return dmj;
int dmn = this->_minor - other._minor;
if (dmn != 0)
return dmn;
int drc = this->_rc - other._rc;
if (drc != 0)
return drc;
int dbuild = this->_build - other._build;
return dbuild;
}

bool operator== (const AppVersion &other) const {
return this->compare(other) == 0;
}

bool operator!= (const AppVersion &other) const {
return this->compare(other) != 0;
}

bool operator< (const AppVersion &other) const {
return this->compare(other) < 0;
}

bool operator> (const AppVersion &other) const {
return this->compare(other) > 0;
}

bool operator>= (const AppVersion &other) const {
return *this > other || *this == other ;
}

bool operator<= (const AppVersion &other) const {
return *this < other || *this == other ;
}

private:
uint _major;
uint _minor;
uint _rc;
uint _build;
};

struct UpdateInfo
{
Expand All @@ -129,8 +51,8 @@ struct UpdateInfo
QString sigUrl;
QString title;
QString text;
QString softwareVersion;
QString firmwareVersion;
QVersionNumber softwareVersion;
// QVersionNumber firmwareVersion;

bool operator== (const UpdateInfo &other) const {
return this->id == other.id;
Expand All @@ -147,8 +69,8 @@ class UpdatesProcessor: public QObject
public:
UpdatesProcessor(QObject * parent = NULL);
void requestUpdates();
QList<UpdateInfo> readUpdates();
void loadUpdate(UpdateInfo& info);
UpdateInfo readUpdates();
void loadUpdate(const UpdateInfo& info);

signals:
void readyRead();
Expand All @@ -161,9 +83,6 @@ private slots:
#endif

private:
QList<UpdateInfo> * readUpdates(QList<UpdateInfo> * readUpdates, QXmlStreamReader * xmlReader);
bool isVersionMatches(const QString &predicate, const AppVersion &version);

QNetworkAccessManager _networkMan;
QNetworkReply * _reply;
QString _sigUrl;
Expand Down
Loading