mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 08:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: AutoUpdateManager: Separate save/run installer

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-04-23 15:44:45 +03:00
parent 0dd76cb897
commit a545d1ba71
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ui/manager/autoupdatemanager.cpp
View File

@ -50,7 +50,7 @@ void AutoUpdateManager::setupDownloader()
void AutoUpdateManager::downloadFinished(bool success)
{
if (success) {
success = runInstaller();
success = saveInstaller();
}
finish(success);
@ -65,7 +65,10 @@ void AutoUpdateManager::checkAutoUpdate()
if (!confManager->conf()->ini().updaterAutoUpdate())
return;
if (m_taskInfo->isNewVersion() && !m_taskInfo->downloadUrl().isEmpty()) {
const QString downloadUrl = m_taskInfo->downloadUrl();
if (!downloadUrl.isEmpty() && m_taskInfo->isNewVersion()) {
m_fileName = QUrl(downloadUrl).fileName();
run();
}
}
@ -75,29 +78,19 @@ void AutoUpdateManager::clearUpdateDir()
FileUtil::removePath(m_updatePath);
}
bool AutoUpdateManager::runInstaller()
bool AutoUpdateManager::saveInstaller()
{
const QByteArray fileData = downloader()->takeBuffer();
if (fileData.size() != m_taskInfo->downloadSize())
return false;
const QString fileName = QUrl(downloader()->url()).fileName();
const QString exePath = m_updatePath + fileName;
if (!FileUtil::writeFileData(exePath, fileData))
return false;
QStringList args;
prepareInstaller(args);
if (!QProcess::startDetached(exePath, args))
return false;
return true;
return FileUtil::writeFileData(installerPath(), fileData);
}
void AutoUpdateManager::prepareInstaller(QStringList &args) const
bool AutoUpdateManager::runInstaller()
{
QStringList args;
auto settings = IoC<FortSettings>();
if (!settings->isPortable()) {
@ -106,5 +99,9 @@ void AutoUpdateManager::prepareInstaller(QStringList &args) const
if (!settings->hasService()) {
args << "/AUTORUN";
} else if (settings->isService()) {
emit restartClients();
}
return QProcess::startDetached(installerPath(), args);
}

8
src/ui/manager/autoupdatemanager.h
View File

@ -21,6 +21,9 @@ public:
signals:
void restartClients();
public slots:
bool runInstaller();
protected:
void setupTaskInfo();
@ -33,8 +36,9 @@ protected slots:
void clearUpdateDir();
bool runInstaller();
void prepareInstaller(QStringList &args) const;
bool saveInstaller();
QString installerPath() const { return m_updatePath + m_fileName; }
private:
static QString getDownloadUrl();