Merge pull request #2621 from nextcloud/enh/noid/rework-getbackupvolumes

rework getbackupvolumes and getallbackupvolumes to be a bit more easy…
This commit is contained in:
Simon L 2023-05-30 15:02:59 +02:00 committed by GitHub
commit 28b1e249a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -514,29 +514,24 @@ class DockerActionManager
}
}
private function getBackupVolumes(string $id) : array
private function getBackupVolumes(string $id) : string
{
$container = $this->containerDefinitionFetcher->GetContainerById($id);
$backupVolumes = $container->GetBackupVolumes();
$backupVolumes = '';
foreach ($container->GetBackupVolumes() as $backupVolume) {
$backupVolumes .= $backupVolume . ' ';
}
foreach ($container->GetDependsOn() as $dependency) {
$backupVolumes[] = $this->getBackupVolumes($dependency);
$backupVolumes .= $this->getBackupVolumes($dependency);
}
return $backupVolumes;
}
private function getAllBackupVolumes() : array {
$id = 'nextcloud-aio-apache';
$backupVolumesArray = $this->getBackupVolumes($id);
// Flatten array
$backupVolumesArrayFlat = iterator_to_array(
new \RecursiveIteratorIterator(
new \RecursiveArrayIterator($backupVolumesArray)
),
$use_keys = false
);
return array_unique($backupVolumesArrayFlat);
$backupVolumesArray = explode(' ', $this->getBackupVolumes($id));
return array_unique($backupVolumesArray);
}
private function GetNextcloudExecCommands(string $id) : string