Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-10-28 16:56:36 +01:00
Code Issues Packages Projects Releases Activity

smoother progress

Browse Source
This commit is contained in:
Andy Miller
2025-10-17 14:09:56 -06:00
parent 7e73ba9a61
commit 4aedf58f78
3 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
classes/plugin/SafeUpgradeManager.php
View File

@@ -606,9 +606,8 @@ class SafeUpgradeManager
try {
$file = $this->download($package, $timeout);
$this->setProgress('installing', 'Installing update...', 80);
$this->performInstall($file);
$this->setProgress('installing', 'Preparing promotion...', 92);
$this->setProgress('installing', 'Preparing promotion...', null);
} catch (Throwable $e) {
$this->setProgress('error', $e->getMessage(), null);
@@ -620,14 +619,14 @@ class SafeUpgradeManager
$this->tmp = null;
}
$this->setProgress('finalizing', 'Finalizing upgrade...', 95);
$this->setProgress('finalizing', 'Finalizing upgrade...', null);
$safeUpgrade->clearRecoveryFlag();
if ($this->recovery && method_exists($this->recovery, 'closeUpgradeWindow')) {
$this->recovery->closeUpgradeWindow();
}
$this->ensureExecutablePermissions();
$this->setProgress('finalizing', 'Finalizing upgrade...', 98);
$this->setProgress('finalizing', 'Finalizing upgrade...', null);
$manifest = $this->resolveLatestManifest();
@@ -853,7 +852,7 @@ class SafeUpgradeManager
*/
protected function performInstall(string $zip): void
{
$this->setProgress('installing', 'Unpacking archive...', 82);
$this->setProgress('installing', 'Unpacking update...', null);
$folder = Installer::unZip($zip, $this->tmp . '/zip');
if ($folder === false) {
throw new RuntimeException(Installer::lastErrorMsg());
@@ -870,9 +869,9 @@ class SafeUpgradeManager
}
try {
$this->setProgress('installing', 'Running installer...', 85);
$this->setProgress('installing', 'Running installer...', null);
$install($zip);
$this->setProgress('installing', 'Verifying files...', 88);
$this->setProgress('installing', 'Verifying files...', null);
} catch (Throwable $e) {
throw new RuntimeException($e->getMessage(), 0, $e);
}