Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/react-admin

Browse source
This commit is contained in:
Matthew Penner 2021-07-13 15:21:16 -06:00
commit ea4bcf0b9c
23 changed files with 1073 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
View file

@ -8,26 +8,22 @@ use Illuminate\Http\Response;
use Pterodactyl\Models\Backup;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\AuditLog;
use Illuminate\Http\JsonResponse;
use League\Flysystem\AwsS3v3\AwsS3Adapter;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Extensions\Backups\BackupManager;
use Pterodactyl\Repositories\Eloquent\BackupRepository;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Pterodactyl\Http\Requests\Api\Remote\ReportBackupCompleteRequest;
class BackupStatusController extends Controller
{
private BackupRepository $repository;
private BackupManager $backupManager;
/**
* BackupStatusController constructor.
*/
public function __construct(BackupRepository $repository, BackupManager $backupManager)
public function __construct(BackupManager $backupManager)
{
$this->repository = $repository;
$this->backupManager = $backupManager;
}
@ -56,6 +52,10 @@ class BackupStatusController extends Controller
$successful = $request->input('successful') ? true : false;
$model->fill([
'is_successful' => $successful,
// Change the lock state to unlocked if this was a failed backup so that it can be
// deleted easily. Also does not make sense to have a locked backup on the system
// that is failed.
'is_locked' => $successful && $model->is_locked,
'checksum' => $successful ? ($request->input('checksum_type') . ':' . $request->input('checksum')) : null,
'bytes' => $successful ? $request->input('size') : 0,
'completed_at' => CarbonImmutable::now(),