mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add installation thread to the update process

Browse Source
This commit is contained in:
Martín Capello 2022-01-05 10:57:42 -03:00 committed by David Capello
parent 7ec08ca54c
commit c764e364af
2 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/app/ui/aseprite_update.cpp
View File

@ -46,12 +46,16 @@ AsepriteUpdate::AsepriteUpdate(std::string version) : m_timer(500, this), m_down
void AsepriteUpdate::onBeforeClose(ui::CloseEvent& ev)
{
if (m_download.status() != drm::DownloadThread::Status::FINISHED) {
if (m_download.status() != drm::Thread::Status::FINISHED ||
m_installation && m_installation->status() != drm::Thread::Status::FINISHED) {
log("Stopping, please wait...");
ev.cancel();
}
if (!m_closing) {
m_download.shutdown();
if (m_installation) {
m_installation->shutdown();
}
}
m_closing = true;
@ -75,13 +79,74 @@ void AsepriteUpdate::onDownloadFinished(drm::Package& package)
{
ui::execute_from_ui_thread([this, package] {
log("Download finished!");
drm::LicenseManager::instance()->installPackage(package);
m_installation.reset(new drm::InstallationThread(package));
m_installation->InstallationFailed.connect([this](drm::LicenseManager::InstallationException& e) {
onInstallationFailed(e);
});
m_installation->InstallationPhaseChanged.connect([this](drm::InstallationPhase oldPhase, drm::InstallationPhase phase) {
onInstallationPhaseChanged(oldPhase, phase);
});
m_installation->start();
});
}
void AsepriteUpdate::onInstallationPhaseChanged(drm::InstallationPhase oldPhase, drm::InstallationPhase phase)
{
ui::execute_from_ui_thread([this, oldPhase, phase] {
std::string msg;
switch (oldPhase) {
case drm::InstallationPhase::UNSPECIFIED:
msg = "Installation process started...";
break;
case drm::InstallationPhase::SAVING_PACKAGE:
msg = "Package saved!";
break;
case drm::InstallationPhase::CREATING_BACKUP:
msg = "Backup created!";
break;
case drm::InstallationPhase::UNPACKING_PACKAGE:
msg = "Package unpacked!";
break;
case drm::InstallationPhase::INSTALLING_FILES:
msg = "Files installed!";
break;
}
if (!msg.empty()) log(msg);
msg = "";
switch (phase) {
case drm::InstallationPhase::SAVING_PACKAGE:
msg = "Saving package...";
break;
case drm::InstallationPhase::CREATING_BACKUP:
msg = "Creating backup...";
break;
case drm::InstallationPhase::UNPACKING_PACKAGE:
msg = "Unpacking package...";
break;
case drm::InstallationPhase::INSTALLING_FILES:
msg = "Installing files...";
break;
case drm::InstallationPhase::DONE:
msg = "Installation process finished!";
break;
}
if (!msg.empty()) log(msg);
});
}
// TODO: Create a unique onFailure() method to handle any exception.
void AsepriteUpdate::onInstallationFailed(drm::LicenseManager::InstallationException& e)
{
ui::execute_from_ui_thread([this, e] {
log(e.what());
});
}
void AsepriteUpdate::onTimerTick()
{
if (m_closing && m_download.status() == drm::DownloadThread::Status::FINISHED) {
if (m_closing && m_download.status() == drm::Thread::Status::FINISHED) {
this->closeWindow(this);
}
}

6
src/app/ui/aseprite_update.h
View File

@ -8,7 +8,8 @@
#define APP_UI_ASEPRITE_UPDATE_H_INCLUDED
#pragma once
#include <drm/download_thread.h>
#include "drm/download_thread.h"
#include "drm/installation_thread.h"
#include "aseprite_update.xml.h"
#include "ui/timer.h"
@ -24,10 +25,13 @@ protected:
void onDataReceived(long total, long now);
void onDownloadFailed(drm::LicenseManager::DownloadException& e);
void onDownloadFinished(drm::Package& package);
void onInstallationPhaseChanged(drm::InstallationPhase oldPhase, drm::InstallationPhase phase);
void onInstallationFailed(drm::LicenseManager::InstallationException& e);
void onTimerTick();
private:
drm::DownloadThread m_download;
std::unique_ptr<drm::InstallationThread> m_installation;
ui::Timer m_timer;
bool m_closing = false;