redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-06-08 06:57:46 +00:00
Code Activity

Make Dalamud version check more robust

Browse source
This commit is contained in:
Joshua Goins 2022-02-23 19:05:53 -05:00
parent 2e399ecff0
commit 2e7f7c5c20
1 changed files with 73 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/assetupdater.cpp
View file

@ -1,10 +1,10 @@
#include "assetupdater.h"
#include <QNetworkReply>
#include <QFile>
#include <QStandardPaths>
#include <QJsonDocument>
#include <QJsonObject>
#include <QNetworkReply>
#include <QStandardPaths>
#include <quazip/JlCompress.h>
@ -12,21 +12,27 @@
const QString dalamudRemotePath = "https://goatcorp.github.io/dalamud-distrib/";
const QString dalamudVersion = "latest";
const QString dalamudVersionPath = dalamudRemotePath + "/version";
const QString dalamudVersionPath = dalamudRemotePath + "version";
const QString nativeLauncherRemotePath = "https://github.com/redstrate/nativelauncher/releases/download/";
const QString nativeLauncherRemotePath =
"https://github.com/redstrate/nativelauncher/releases/download/";
const QString nativeLauncherVersion = "v1.0.0";
AssetUpdater::AssetUpdater(LauncherCore& launcher) : launcher(launcher) {
connect(launcher.mgr, &QNetworkAccessManager::finished, this, &AssetUpdater::finishDownload);
connect(launcher.mgr, &QNetworkAccessManager::finished, this,
&AssetUpdater::finishDownload);
launcher.mgr->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
}
void AssetUpdater::update(const ProfileSettings& profile) {
QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
const QString dataDir =
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
const bool hasDalamud = QFile::exists(dataDir + "/NativeLauncher.exe") && QFile::exists(dataDir + "/Dalamud");
qInfo() << "Starting update sequence...";
const bool hasDalamud = QFile::exists(dataDir + "/NativeLauncher.exe") &&
QFile::exists(dataDir + "/Dalamud");
bool isDalamudUpdated = false;
if (hasDalamud) {
@ -45,25 +51,38 @@ void AssetUpdater::update(const ProfileSettings& profile) {
QJsonDocument doc = QJsonDocument::fromJson(depsJson.readAll());
// TODO: UGLY
QString versionString = doc["targets"].toObject()[".NETCoreApp,Version=v5.0"].toObject().keys().filter("Dalamud")[0];
QString versionString =
doc["targets"]
.toObject()[".NETCoreApp,Version=v5.0"]
.toObject()
.keys()
.filter("Dalamud")[0];
versionString = versionString.remove("Dalamud/");
qInfo() << "Dalamud version installed: " << versionString;
if (versionString != remoteDalamudVersion) {
isDalamudUpdated = false;
} else {
qInfo() << "No need to update Dalamud.";
isDalamudUpdated = true;
}
}
}
}
// first we determine if we need dalamud
const bool needsDalamud = profile.enableDalamud && (!hasDalamud || !isDalamudUpdated);
const bool needsDalamud =
profile.enableDalamud && (!hasDalamud || !isDalamudUpdated);
if (needsDalamud) {
// download nativelauncher release (needed to launch the game with fixed ACLs)
// download nativelauncher release (needed to launch the game with fixed
// ACLs)
{
QNetworkRequest request(nativeLauncherRemotePath + nativeLauncherVersion + "/NativeLauncher.exe");
qInfo() << "Downloading NativeLauncher...";
QNetworkRequest request(nativeLauncherRemotePath +
nativeLauncherVersion +
"/NativeLauncher.exe");
auto reply = launcher.mgr->get(request);
reply->setObjectName("NativeLauncher");
@ -71,7 +90,10 @@ void AssetUpdater::update(const ProfileSettings& profile) {
// download dalamud (... duh)
{
QNetworkRequest request(dalamudRemotePath + dalamudVersion + ".zip");
qInfo() << "Downloading Dalamud...";
QNetworkRequest request(dalamudRemotePath + dalamudVersion +
".zip");
auto reply = launcher.mgr->get(request);
reply->setObjectName("Dalamud");
@ -84,12 +106,15 @@ void AssetUpdater::update(const ProfileSettings& profile) {
void AssetUpdater::finishDownload(QNetworkReply* reply) {
const auto checkIfFinished = [=] {
if(QFile::exists(tempDir.path() + "/NativeLauncher.exe") && QFile::exists(tempDir.path() + "/latest.zip")) {
if (QFile::exists(tempDir.path() + "/NativeLauncher.exe") &&
QFile::exists(tempDir.path() + "/latest.zip")) {
beginInstall();
}
};
if (reply->objectName() == "Dalamud") {
qInfo() << "Dalamud finished downloading!";
QFile file(tempDir.path() + "/latest.zip");
file.open(QIODevice::WriteOnly);
file.write(reply->readAll());
@ -97,6 +122,8 @@ void AssetUpdater::finishDownload(QNetworkReply* reply) {
checkIfFinished();
} else if (reply->objectName() == "NativeLauncher") {
qInfo() << "NativeLauncher finished downloading!";
QFile file(tempDir.path() + "/NativeLauncher.exe");
file.open(QIODevice::WriteOnly);
file.write(reply->readAll());
@ -104,20 +131,37 @@ void AssetUpdater::finishDownload(QNetworkReply* reply) {
checkIfFinished();
} else if (reply->objectName() == "DalamudVersionCheck") {
QJsonDocument doc = QJsonDocument::fromJson(reply->readAll());
QByteArray str = reply->readAll();
// for some god forsaken reason, the version string comes back as raw
// bytes, ex: \xFF\xFE{\x00\"\x00""A\x00s\x00s\x00""e\x00m\x00 so we
// start at the first character of the json '{' and work our way up.
QString reassmbled;
for (int i = str.indexOf('{'); i < str.size(); i++) {
char t = str[i];
if (QChar(t).isPrint())
reassmbled += t;
}
QJsonDocument doc = QJsonDocument::fromJson(reassmbled.toUtf8());
remoteDalamudVersion = doc["AssemblyVersion"].toString();
qInfo() << "Latest Dalamud version reported: " << remoteDalamudVersion;
update(*currentSettings);
currentSettings = nullptr;
}
}
void AssetUpdater::beginInstall() {
QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
QString dataDir =
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
bool success = !JlCompress::extractDir(tempDir.path() + "/latest.zip", dataDir + "/Dalamud").empty();
bool success = !JlCompress::extractDir(tempDir.path() + "/latest.zip",
dataDir + "/Dalamud")
.empty();
if (success) {
QFile::copy(tempDir.path() + "/NativeLauncher.exe", dataDir + "/NativeLauncher.exe");
QFile::copy(tempDir.path() + "/NativeLauncher.exe",
dataDir + "/NativeLauncher.exe");
finishedUpdating();
} else {