StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix handling for backups; correctly send along ignored files & directories

Browse source
This commit is contained in:
Dane Everitt 2020-04-18 23:26:59 -07:00
parent b6a0cca0f9
commit 00b0d30c60
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/Services/Backups/InitiateBackupService.php
View file

@ -4,6 +4,7 @@ namespace Pterodactyl\Services\Backups;
use Ramsey\Uuid\Uuid;
use Carbon\CarbonImmutable;
use Webmozart\Assert\Assert;
use Pterodactyl\Models\Backup;
use Pterodactyl\Models\Server;
use Illuminate\Database\ConnectionInterface;
@ -13,7 +14,7 @@ use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
class InitiateBackupService
{
/**
* @var string|null
* @var string[]|null
*/
private $ignoredFiles;
@ -52,12 +53,23 @@ class InitiateBackupService
/**
* Sets the files to be ignored by this backup.
*
* @param string|null $ignored
* @param string[]|null $ignored
* @return $this
*/
public function setIgnoredFiles(?string $ignored)
public function setIgnoredFiles(?array $ignored)
{
$this->ignoredFiles = $ignored;
if (is_array($ignored)) {
foreach ($ignored as $value) {
Assert::string($value);
}
}
// Set the ignored files to be any values that are not empty in the array. Don't use
// the PHP empty function here incase anything that is "empty" by default (0, false, etc.)
// were passed as a file or folder name.
$this->ignoredFiles = is_null($ignored) ? [] : array_filter($ignored, function ($value) {
return strlen($value) > 0;
});
return $this;
}
@ -79,7 +91,7 @@ class InitiateBackupService
'server_id' => $server->id,
'uuid' => Uuid::uuid4()->toString(),
'name' => trim($name) ?: sprintf('Backup at %s', CarbonImmutable::now()->toDateTimeString()),
'ignored_files' => $this->ignoredFiles ?? '',
'ignored_files' => is_array($this->ignoredFiles) ? array_values($this->ignoredFiles) : [],
'disk' => 'local',
], true, true);