Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-10-26 07:56:07 +01:00
Code Issues Packages Projects Releases Activity

Optimized staged package

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-10-17 19:35:43 -06:00
parent bdc06afea2
commit e88f38bd10
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
system/src/Grav/Common/Upgrade/SafeUpgradeService.php
View File

@@ -168,11 +168,10 @@ class SafeUpgradeService
$packagePath = $stagePath . DIRECTORY_SEPARATOR . 'package';
$backupPath = $this->stagingRoot . DIRECTORY_SEPARATOR . 'snapshot-' . $stageId;
Folder::create($packagePath);
Folder::create(dirname($packagePath));
// Copy extracted package into staging area.
Folder::rcopy($extractedPath, $packagePath, true);
$this->reportProgress('installing', 'Preparing staged package...', null);
$this->stageExtractedPackage($extractedPath, $packagePath);
$this->carryOverRootDotfiles($packagePath);
@@ -197,9 +196,9 @@ class SafeUpgradeService
$this->reportProgress('installing', 'Copying update files...', null);
try {
$this->copyEntries($entries, $packagePath, $this->rootPath);
$this->copyEntries($entries, $packagePath, $this->rootPath, 'installing', 'Deploying');
} catch (Throwable $e) {
$this->copyEntries($entries, $backupPath, $this->rootPath);
$this->copyEntries($entries, $backupPath, $this->rootPath, 'installing', 'Restoring');
$this->syncGitDirectory($backupPath, $this->rootPath);
throw new RuntimeException('Failed to promote staged Grav release.', 0, $e);
}
@@ -230,20 +229,53 @@ class SafeUpgradeService
return $entries;
}
private function stageExtractedPackage(string $sourcePath, string $packagePath): void
{
if (is_dir($packagePath)) {
Folder::delete($packagePath);
}
if (@rename($sourcePath, $packagePath)) {
return;
}
Folder::create($packagePath);
$entries = $this->collectPackageEntries($sourcePath);
$this->copyEntries($entries, $sourcePath, $packagePath, 'installing', 'Staging');
Folder::delete($sourcePath);
}
private function createBackupSnapshot(array $entries, string $backupPath): void
{
Folder::create($backupPath);
$this->copyEntries($entries, $this->rootPath, $backupPath);
$this->copyEntries($entries, $this->rootPath, $backupPath, 'snapshot', 'Snapshotting');
}
private function copyEntries(array $entries, string $sourceBase, string $targetBase): void
private function copyEntries(array $entries, string $sourceBase, string $targetBase, ?string $progressStage = null, ?string $progressPrefix = null): void
{
foreach ($entries as $entry) {
$total = count($entries);
foreach ($entries as $index => $entry) {
$source = $sourceBase . DIRECTORY_SEPARATOR . $entry;
if (!is_file($source) && !is_dir($source) && !is_link($source)) {
continue;
}
if ($progressStage) {
$message = sprintf(
'%s %s (%d/%d)',
$progressPrefix ?? 'Processing',
$entry,
$index + 1,
max($total, 1)
);
$percent = $total > 0 ? (int)floor(($index / $total) * 100) : null;
$this->reportProgress($progressStage, $message, $percent ?: null, [
'entry' => $entry,
'index' => $index + 1,
'total' => $total,
]);
}
$destination = $targetBase . DIRECTORY_SEPARATOR . $entry;
$this->removeEntry($destination);
@@ -322,7 +354,7 @@ class SafeUpgradeService
}
$this->reportProgress('rollback', 'Restoring snapshot...', null);
$this->copyEntries($entries, $backupPath, $this->rootPath);
$this->copyEntries($entries, $backupPath, $this->rootPath, 'rollback', 'Restoring');
$this->syncGitDirectory($backupPath, $this->rootPath);
$this->markRollback($manifest['id']);