mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 16:41:02 +02:00
Add BuildsRequest and config.json support to qt launcher
This commit is contained in:
parent
dbc136c438
commit
f236b64b06
6 changed files with 267 additions and 130 deletions
|
@ -136,6 +136,8 @@ set(src_files
|
||||||
src/LoginRequest.cpp
|
src/LoginRequest.cpp
|
||||||
src/SignupRequest.h
|
src/SignupRequest.h
|
||||||
src/SignupRequest.cpp
|
src/SignupRequest.cpp
|
||||||
|
src/BuildsRequest.h
|
||||||
|
src/BuildsRequest.cpp
|
||||||
src/UserSettingsRequest.h
|
src/UserSettingsRequest.h
|
||||||
src/UserSettingsRequest.cpp
|
src/UserSettingsRequest.cpp
|
||||||
src/PathUtils.h
|
src/PathUtils.h
|
||||||
|
@ -231,13 +233,14 @@ if (APPLE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if (LAUNCHER_SOURCE_TREE_RESOURCES)
|
|
||||||
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="${CMAKE_CURRENT_SOURCE_DIR}/resources/")
|
if (LAUNCHER_SOURCE_TREE_RESOURCES)
|
||||||
message("Use source tree resources path: file://${CMAKE_CURRENT_SOURCE_DIR}/resources/")
|
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="${CMAKE_CURRENT_SOURCE_DIR}/resources/")
|
||||||
else()
|
message("Use source tree resources path: file://${CMAKE_CURRENT_SOURCE_DIR}/resources/")
|
||||||
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="qrc:/")
|
else()
|
||||||
message("Use resource.rcc path: qrc:/")
|
target_compile_definitions(${PROJECT_NAME} PRIVATE RESOURCE_PREFIX_URL="qrc:/")
|
||||||
endif()
|
message("Use resource.rcc path: qrc:/")
|
||||||
|
endif()
|
||||||
|
|
||||||
target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_BUILD_VERSION="${BUILD_VERSION}")
|
target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_BUILD_VERSION="${BUILD_VERSION}")
|
||||||
|
|
||||||
|
|
115
launchers/qt/src/BuildsRequest.cpp
Normal file
115
launchers/qt/src/BuildsRequest.cpp
Normal file
|
@ -0,0 +1,115 @@
|
||||||
|
#include "BuildsRequest.h"
|
||||||
|
|
||||||
|
#include "Helper.h"
|
||||||
|
|
||||||
|
#include <QUrlQuery>
|
||||||
|
#include <QNetworkReply>
|
||||||
|
#include <QJsonDocument>
|
||||||
|
#include <QJsonArray>
|
||||||
|
#include <QJsonObject>
|
||||||
|
#include <QProcessEnvironment>
|
||||||
|
|
||||||
|
bool Builds::getBuild(QString tag, Build* outBuild) {
|
||||||
|
if (tag.isNull()) {
|
||||||
|
tag = defaultTag;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto& build : builds) {
|
||||||
|
if (build.tag == tag) {
|
||||||
|
*outBuild = build;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void BuildsRequest::send(QNetworkAccessManager& nam) {
|
||||||
|
QString latestBuildRequestUrl { "https://thunder.highfidelity.com/builds/api/tags/latest/?format=json" };
|
||||||
|
QProcessEnvironment processEnvironment = QProcessEnvironment::systemEnvironment();
|
||||||
|
|
||||||
|
if (processEnvironment.contains("HQ_LAUNCHER_BUILDS_URL")) {
|
||||||
|
latestBuildRequestUrl = processEnvironment.value("HQ_LAUNCHER_BUILDS_URL");
|
||||||
|
}
|
||||||
|
|
||||||
|
QNetworkRequest request{ QUrl(latestBuildRequestUrl) };
|
||||||
|
auto reply = nam.get(request);
|
||||||
|
|
||||||
|
QObject::connect(reply, &QNetworkReply::finished, this, &BuildsRequest::receivedResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
void BuildsRequest::receivedResponse() {
|
||||||
|
_state = State::Finished;
|
||||||
|
|
||||||
|
auto reply = static_cast<QNetworkReply*>(sender());
|
||||||
|
|
||||||
|
if (reply->error()) {
|
||||||
|
qDebug() << "Error getting builds from thunder: " << reply->errorString();
|
||||||
|
_error = Error::Unknown;
|
||||||
|
emit finished();
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
qDebug() << "Builds reply has been received";
|
||||||
|
|
||||||
|
auto data = reply->readAll();
|
||||||
|
|
||||||
|
QJsonParseError parseError;
|
||||||
|
auto doc = QJsonDocument::fromJson(data, &parseError);
|
||||||
|
|
||||||
|
if (parseError.error) {
|
||||||
|
qDebug() << "Error parsing response from thunder: " << data;
|
||||||
|
_error = Error::Unknown;
|
||||||
|
} else {
|
||||||
|
auto root = doc.object();
|
||||||
|
if (!root.contains("default_tag")) {
|
||||||
|
//setApplicationState(ApplicationState::UnexpectedError);
|
||||||
|
_error = Error::MissingDefaultTag;
|
||||||
|
emit finished();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_latestBuilds.defaultTag = root["default_tag"].toString();
|
||||||
|
|
||||||
|
auto results = root["results"];
|
||||||
|
if (!results.isArray()) {
|
||||||
|
//setApplicationState(ApplicationState::UnexpectedError);
|
||||||
|
_error = Error::MalformedResponse;
|
||||||
|
emit finished();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto result : results.toArray()) {
|
||||||
|
auto entry = result.toObject();
|
||||||
|
Build build;
|
||||||
|
build.tag = entry["name"].toString();
|
||||||
|
build.latestVersion = entry["latest_version"].toInt();
|
||||||
|
build.buildNumber = entry["build_number"].toInt();
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
build.installerZipURL = entry["installers"].toObject()["windows"].toObject()["zip_url"].toString();
|
||||||
|
#elif defined(Q_OS_MACOS)
|
||||||
|
build.installerZipURL = entry["installers"].toObject()["mac"].toObject()["zip_url"].toString();
|
||||||
|
#else
|
||||||
|
#error "Launcher is only supported on Windows and Mac OS"
|
||||||
|
#endif
|
||||||
|
_latestBuilds.builds.push_back(build);
|
||||||
|
}
|
||||||
|
|
||||||
|
auto launcherResults = root["launcher"].toObject();
|
||||||
|
|
||||||
|
Build launcherBuild;
|
||||||
|
launcherBuild.latestVersion = launcherResults["version"].toInt();
|
||||||
|
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
launcherBuild.installerZipURL = launcherResults["windows"].toObject()["url"].toString();
|
||||||
|
#elif defined(Q_OS_MACOS)
|
||||||
|
launcherBuild.installerZipURL = launcherResults["mac"].toObject()["url"].toString();
|
||||||
|
#else
|
||||||
|
#error "Launcher is only supported on Windows and Mac OS"
|
||||||
|
#endif
|
||||||
|
_latestBuilds.launcherBuild = launcherBuild;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
emit finished();
|
||||||
|
}
|
54
launchers/qt/src/BuildsRequest.h
Normal file
54
launchers/qt/src/BuildsRequest.h
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QNetworkAccessManager>
|
||||||
|
|
||||||
|
struct Build {
|
||||||
|
QString tag{ QString::null };
|
||||||
|
int latestVersion{ 0 };
|
||||||
|
int buildNumber{ 0 };
|
||||||
|
QString installerZipURL{ QString::null };
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Builds {
|
||||||
|
bool getBuild(QString tag, Build* outBuild);
|
||||||
|
|
||||||
|
QString defaultTag;
|
||||||
|
std::vector<Build> builds;
|
||||||
|
Build launcherBuild;
|
||||||
|
};
|
||||||
|
|
||||||
|
class BuildsRequest : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
enum class State {
|
||||||
|
Unsent,
|
||||||
|
Sending,
|
||||||
|
Finished
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class Error {
|
||||||
|
None = 0,
|
||||||
|
Unknown,
|
||||||
|
MalformedResponse,
|
||||||
|
MissingDefaultTag,
|
||||||
|
};
|
||||||
|
Q_ENUM(Error)
|
||||||
|
|
||||||
|
void send(QNetworkAccessManager& nam);
|
||||||
|
Error getError() const { return _error; }
|
||||||
|
|
||||||
|
const Builds& getLatestBuilds() const { return _latestBuilds; }
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void finished();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void receivedResponse();
|
||||||
|
|
||||||
|
private:
|
||||||
|
State _state { State::Unsent };
|
||||||
|
Error _error { Error::None };
|
||||||
|
|
||||||
|
Builds _latestBuilds;
|
||||||
|
};
|
|
@ -27,6 +27,10 @@
|
||||||
|
|
||||||
#include <qregularexpression.h>
|
#include <qregularexpression.h>
|
||||||
|
|
||||||
|
//#define BREAK_ON_ERROR
|
||||||
|
|
||||||
|
const QString configLoggedInKey{ "loggedIn" };
|
||||||
|
const QString configLauncherPathKey{ "launcherPath" };
|
||||||
|
|
||||||
QString LauncherState::getContentCachePath() const {
|
QString LauncherState::getContentCachePath() const {
|
||||||
return _launcherDirectory.filePath("cache");
|
return _launcherDirectory.filePath("cache");
|
||||||
|
@ -45,23 +49,21 @@ QString LauncherState::getClientExecutablePath() const {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool LauncherState::shouldDownloadContentCache() const {
|
QString LauncherState::getConfigFilePath() const {
|
||||||
return !_contentCacheURL.isNull() && !QFile::exists(getContentCachePath());
|
QDir clientDirectory = getClientDirectory();
|
||||||
|
return clientDirectory.absoluteFilePath("config.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
bool LatestBuilds::getBuild(QString tag, Build* outBuild) {
|
QString LauncherState::getLauncherFilePath() const {
|
||||||
if (tag.isNull()) {
|
#if defined(Q_OS_WIN)
|
||||||
tag = defaultTag;
|
return _launcherDirectory.absoluteFilePath("launcher.exe");
|
||||||
}
|
#elif defined(Q_OS_MACOS)
|
||||||
|
return _launcherDirectory.absoluteFilePath("launcher.app");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
for (auto& build : builds) {
|
bool LauncherState::shouldDownloadContentCache() const {
|
||||||
if (build.tag == tag) {
|
return !_contentCacheURL.isNull() && !QFile::exists(getContentCachePath());
|
||||||
*outBuild = build;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const std::array<QString, LauncherState::UIState::UI_STATE_NUM> QML_FILE_FOR_UI_STATE =
|
static const std::array<QString, LauncherState::UIState::UI_STATE_NUM> QML_FILE_FOR_UI_STATE =
|
||||||
|
@ -70,7 +72,7 @@ static const std::array<QString, LauncherState::UIState::UI_STATE_NUM> QML_FILE_
|
||||||
|
|
||||||
void LauncherState::ASSERT_STATE(LauncherState::ApplicationState state) {
|
void LauncherState::ASSERT_STATE(LauncherState::ApplicationState state) {
|
||||||
if (_applicationState != state) {
|
if (_applicationState != state) {
|
||||||
#ifdef Q_OS_WIN
|
#ifdef BREAK_ON_ERROR
|
||||||
__debugbreak();
|
__debugbreak();
|
||||||
#endif
|
#endif
|
||||||
setApplicationState(ApplicationState::UnexpectedError);
|
setApplicationState(ApplicationState::UnexpectedError);
|
||||||
|
@ -84,8 +86,8 @@ void LauncherState::ASSERT_STATE(const std::vector<LauncherState::ApplicationSta
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef BREAK_ON_ERROR
|
||||||
__debugbreak();
|
__debugbreak();
|
||||||
#endif
|
#endif
|
||||||
setApplicationState(ApplicationState::UnexpectedError);
|
setApplicationState(ApplicationState::UnexpectedError);
|
||||||
}
|
}
|
||||||
|
@ -126,15 +128,15 @@ LauncherState::UIState LauncherState::getUIState() const {
|
||||||
case ApplicationState::LaunchingHighFidelity:
|
case ApplicationState::LaunchingHighFidelity:
|
||||||
return DOWNLOAD_FINSISHED;
|
return DOWNLOAD_FINSISHED;
|
||||||
case ApplicationState::UnexpectedError:
|
case ApplicationState::UnexpectedError:
|
||||||
#ifdef Q_OS_WIN
|
#ifdef BREAK_ON_ERROR
|
||||||
__debugbreak();
|
__debugbreak();
|
||||||
#endif
|
#endif
|
||||||
return ERROR_SCREEN;
|
return ERROR_SCREEN;
|
||||||
default:
|
default:
|
||||||
qDebug() << "FATAL: No UI for" << _applicationState;
|
qDebug() << "FATAL: No UI for" << _applicationState;
|
||||||
#ifdef Q_OS_WIN
|
#ifdef BREAK_ON_ERROR
|
||||||
__debugbreak();
|
__debugbreak();
|
||||||
#endif
|
#endif
|
||||||
return ERROR_SCREEN;
|
return ERROR_SCREEN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -147,98 +149,35 @@ LauncherState::LastLoginError LauncherState::getLastLoginError() const {
|
||||||
return _lastLoginError;
|
return _lastLoginError;
|
||||||
}
|
}
|
||||||
|
|
||||||
void LauncherState::requestBuilds() {
|
|
||||||
ASSERT_STATE(ApplicationState::Init);
|
|
||||||
setApplicationState(ApplicationState::RequestingBuilds);
|
|
||||||
|
|
||||||
// TODO Show splash screen until this request is complete
|
|
||||||
|
|
||||||
QString latestBuildRequestUrl { "https://thunder.highfidelity.com/builds/api/tags/latest/?format=json" };
|
|
||||||
QProcessEnvironment processEnvironment =QProcessEnvironment::systemEnvironment();
|
|
||||||
|
|
||||||
if (processEnvironment.contains("HQ_LAUNCHER_BUILDS_URL")) {
|
|
||||||
latestBuildRequestUrl = processEnvironment.value("HQ_LAUNCHER_BUILDS_URL");
|
|
||||||
}
|
|
||||||
|
|
||||||
auto request = new QNetworkRequest(QUrl(latestBuildRequestUrl));
|
|
||||||
auto reply = _networkAccessManager.get(*request);
|
|
||||||
|
|
||||||
QObject::connect(reply, &QNetworkReply::finished, this, &LauncherState::receivedBuildsReply);
|
|
||||||
}
|
|
||||||
|
|
||||||
void LauncherState::restart() {
|
void LauncherState::restart() {
|
||||||
setApplicationState(ApplicationState::Init);
|
setApplicationState(ApplicationState::Init);
|
||||||
requestBuilds();
|
requestBuilds();
|
||||||
}
|
}
|
||||||
|
|
||||||
void LauncherState::receivedBuildsReply() {
|
void LauncherState::requestBuilds() {
|
||||||
auto reply = static_cast<QNetworkReply*>(sender());
|
ASSERT_STATE(ApplicationState::Init);
|
||||||
|
setApplicationState(ApplicationState::RequestingBuilds);
|
||||||
|
|
||||||
ASSERT_STATE(ApplicationState::RequestingBuilds);
|
auto request = new BuildsRequest();
|
||||||
|
|
||||||
if (reply->error()) {
|
QObject::connect(request, &BuildsRequest::finished, this, [=] {
|
||||||
qDebug() << "Error getting builds from thunder: " << reply->errorString();
|
ASSERT_STATE(ApplicationState::RequestingBuilds);
|
||||||
} else {
|
if (request->getError() != BuildsRequest::Error::None) {
|
||||||
qDebug() << "Builds reply has been received";
|
setApplicationStateError("Could not retrieve latest builds");
|
||||||
auto data = reply->readAll();
|
return;
|
||||||
QJsonParseError parseError;
|
|
||||||
auto doc = QJsonDocument::fromJson(data, &parseError);
|
|
||||||
if (parseError.error) {
|
|
||||||
qDebug() << "Error parsing response from thunder: " << data;
|
|
||||||
} else {
|
|
||||||
auto root = doc.object();
|
|
||||||
if (!root.contains("default_tag")) {
|
|
||||||
setApplicationState(ApplicationState::UnexpectedError);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_latestBuilds.defaultTag = root["default_tag"].toString();
|
|
||||||
|
|
||||||
auto results = root["results"];
|
|
||||||
if (!results.isArray()) {
|
|
||||||
setApplicationState(ApplicationState::UnexpectedError);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto result : results.toArray()) {
|
|
||||||
auto entry = result.toObject();
|
|
||||||
Build build;
|
|
||||||
build.tag = entry["name"].toString();
|
|
||||||
build.latestVersion = entry["latest_version"].toInt();
|
|
||||||
build.buildNumber = entry["build_number"].toInt();
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
build.installerZipURL = entry["installers"].toObject()["windows"].toObject()["zip_url"].toString();
|
|
||||||
#elif defined(Q_OS_MACOS)
|
|
||||||
build.installerZipURL = entry["installers"].toObject()["mac"].toObject()["zip_url"].toString();
|
|
||||||
#else
|
|
||||||
#error "Launcher is only supported on Windows and Mac OS"
|
|
||||||
#endif
|
|
||||||
_latestBuilds.builds.push_back(build);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto launcherResults = root["launcher"].toObject();
|
|
||||||
|
|
||||||
Build launcherBuild;
|
|
||||||
launcherBuild.latestVersion = launcherResults["version"].toInt();
|
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
launcherBuild.installerZipURL = launcherResults["windows"].toObject()["url"].toString();
|
|
||||||
#elif defined(Q_OS_MACOS)
|
|
||||||
launcherBuild.installerZipURL = launcherResults["mac"].toObject()["url"].toString();
|
|
||||||
#else
|
|
||||||
#error "Launcher is only supported on Windows and Mac OS"
|
|
||||||
#endif
|
|
||||||
_latestBuilds.launcherBuild = launcherBuild;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (shouldDownloadLauncher()) {
|
_latestBuilds = request->getLatestBuilds();
|
||||||
//downloadLauncher();
|
|
||||||
}
|
if (shouldDownloadLauncher()) {
|
||||||
getCurrentClientVersion();
|
//downloadLauncher();
|
||||||
|
}
|
||||||
|
getCurrentClientVersion();
|
||||||
|
});
|
||||||
|
|
||||||
|
request->send(_networkAccessManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool LauncherState::shouldDownloadLauncher() {
|
bool LauncherState::shouldDownloadLauncher() {
|
||||||
return _latestBuilds.launcherBuild.latestVersion != atoi(LAUNCHER_BUILD_VERSION);
|
return _latestBuilds.launcherBuild.latestVersion != atoi(LAUNCHER_BUILD_VERSION);
|
||||||
}
|
}
|
||||||
|
@ -271,7 +210,29 @@ void LauncherState::getCurrentClientVersion() {
|
||||||
}
|
}
|
||||||
qDebug() << "Current client version is: " << _currentClientVersion;
|
qDebug() << "Current client version is: " << _currentClientVersion;
|
||||||
|
|
||||||
setApplicationState(ApplicationState::WaitingForSignup);
|
{
|
||||||
|
auto path = getConfigFilePath();
|
||||||
|
QFile configFile{ path };
|
||||||
|
|
||||||
|
if (configFile.open(QIODevice::ReadOnly)) {
|
||||||
|
QJsonDocument doc = QJsonDocument::fromJson(configFile.readAll());
|
||||||
|
auto root = doc.object();
|
||||||
|
|
||||||
|
_config.launcherPath = getLauncherFilePath();
|
||||||
|
_config.loggedIn = false;
|
||||||
|
if (root.contains(configLoggedInKey)) {
|
||||||
|
_config.loggedIn = root["loggedIn"].toBool();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qDebug() << "Failed to open config.json";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_config.loggedIn) {
|
||||||
|
downloadClient();
|
||||||
|
} else {
|
||||||
|
setApplicationState(ApplicationState::WaitingForSignup);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -337,6 +298,7 @@ void LauncherState::signup(QString email, QString username, QString password, QS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
_config.loggedIn = true;
|
||||||
_loginResponse = loginRequest->getToken();
|
_loginResponse = loginRequest->getToken();
|
||||||
_loginTokenResponse = loginRequest->getRawToken();
|
_loginTokenResponse = loginRequest->getRawToken();
|
||||||
|
|
||||||
|
@ -372,6 +334,7 @@ void LauncherState::login(QString username, QString password, QString displayNam
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_config.loggedIn = true;
|
||||||
_loginResponse = request->getToken();
|
_loginResponse = request->getToken();
|
||||||
_loginTokenResponse = request->getRawToken();
|
_loginTokenResponse = request->getRawToken();
|
||||||
|
|
||||||
|
@ -672,7 +635,17 @@ void LauncherState::launchClient() {
|
||||||
clientPath = installDirectory.absoluteFilePath("interface.app/Contents/MacOS/interface");
|
clientPath = installDirectory.absoluteFilePath("interface.app/Contents/MacOS/interface");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// TODO Get correct home path
|
auto path = getConfigFilePath();
|
||||||
|
QFile configFile{ path };
|
||||||
|
if (configFile.open(QIODevice::WriteOnly)) {
|
||||||
|
QJsonDocument doc = QJsonDocument::fromJson(configFile.readAll());
|
||||||
|
doc.setObject({
|
||||||
|
{ configLoggedInKey, _config.loggedIn },
|
||||||
|
{ configLauncherPathKey, _config.launcherPath },
|
||||||
|
});
|
||||||
|
configFile.write(doc.toJson());
|
||||||
|
}
|
||||||
|
|
||||||
QString defaultScriptsPath;
|
QString defaultScriptsPath;
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
defaultScriptsPath = installDirectory.filePath("scripts/simplifiedUIBootstrapper.js");
|
defaultScriptsPath = installDirectory.filePath("scripts/simplifiedUIBootstrapper.js");
|
||||||
|
@ -694,9 +667,9 @@ void LauncherState::setApplicationState(ApplicationState state) {
|
||||||
qDebug() << "Changing application state: " << _applicationState << " -> " << state;
|
qDebug() << "Changing application state: " << _applicationState << " -> " << state;
|
||||||
|
|
||||||
if (state == ApplicationState::UnexpectedError) {
|
if (state == ApplicationState::UnexpectedError) {
|
||||||
#ifdef Q_OS_WIN
|
#ifdef BREAK_ON_ERROR
|
||||||
__debugbreak();
|
__debugbreak();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
_applicationState = state;
|
_applicationState = state;
|
||||||
|
|
|
@ -10,20 +10,11 @@
|
||||||
#include "LoginRequest.h"
|
#include "LoginRequest.h"
|
||||||
#include "SignupRequest.h"
|
#include "SignupRequest.h"
|
||||||
#include "UserSettingsRequest.h"
|
#include "UserSettingsRequest.h"
|
||||||
|
#include "BuildsRequest.h"
|
||||||
|
|
||||||
struct Build {
|
struct LauncherConfig {
|
||||||
QString tag;
|
QString launcherPath{ QString::null };
|
||||||
int latestVersion;
|
bool loggedIn{ false };
|
||||||
int buildNumber;
|
|
||||||
QString installerZipURL;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct LatestBuilds {
|
|
||||||
bool getBuild(QString tag, Build* outBuild);
|
|
||||||
|
|
||||||
QString defaultTag;
|
|
||||||
std::vector<Build> builds;
|
|
||||||
Build launcherBuild;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class LauncherState : public QObject {
|
class LauncherState : public QObject {
|
||||||
|
@ -107,7 +98,6 @@ public:
|
||||||
|
|
||||||
// Request builds
|
// Request builds
|
||||||
void requestBuilds();
|
void requestBuilds();
|
||||||
Q_INVOKABLE void receivedBuildsReply();
|
|
||||||
|
|
||||||
// Signup
|
// Signup
|
||||||
Q_INVOKABLE void signup(QString email, QString username, QString password, QString displayName);
|
Q_INVOKABLE void signup(QString email, QString username, QString password, QString displayName);
|
||||||
|
@ -156,13 +146,17 @@ private:
|
||||||
QString getContentCachePath() const;
|
QString getContentCachePath() const;
|
||||||
QString getClientDirectory() const;
|
QString getClientDirectory() const;
|
||||||
QString getClientExecutablePath() const;
|
QString getClientExecutablePath() const;
|
||||||
|
QString getConfigFilePath() const;
|
||||||
|
QString getLauncherFilePath() const;
|
||||||
|
|
||||||
bool shouldDownloadLauncher();
|
bool shouldDownloadLauncher();
|
||||||
|
|
||||||
QNetworkAccessManager _networkAccessManager;
|
QNetworkAccessManager _networkAccessManager;
|
||||||
LatestBuilds _latestBuilds;
|
Builds _latestBuilds;
|
||||||
QDir _launcherDirectory;
|
QDir _launcherDirectory;
|
||||||
|
|
||||||
|
LauncherConfig _config;
|
||||||
|
|
||||||
// Application State
|
// Application State
|
||||||
ApplicationState _applicationState { ApplicationState::Init };
|
ApplicationState _applicationState { ApplicationState::Init };
|
||||||
LoginToken _loginResponse;
|
LoginToken _loginResponse;
|
||||||
|
|
|
@ -20,8 +20,6 @@ Q_IMPORT_PLUGIN(QtQuick2Plugin);
|
||||||
Q_IMPORT_PLUGIN(QtQuickControls2Plugin);
|
Q_IMPORT_PLUGIN(QtQuickControls2Plugin);
|
||||||
Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin);
|
Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool hasSuffix(const std::string& path, const std::string& suffix) {
|
bool hasSuffix(const std::string& path, const std::string& suffix) {
|
||||||
if (path.substr(path.find_last_of(".") + 1) == suffix) {
|
if (path.substr(path.find_last_of(".") + 1) == suffix) {
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue