DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14296 from snipe/fixes/return_download_for_backup_api

Browse source 
Better handle large downloads on backup API
This commit is contained in:
snipe 2024-02-19 12:22:49 +00:00 committed by GitHub
parent aef45a90b2 9847934de9
commit 7c346d977a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/SettingsController.php
View file

@ -249,6 +249,7 @@ class SettingsController extends Controller
'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])), 'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
'modified_value' => $file_timestamp, 'modified_value' => $file_timestamp,
'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp), 'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp),
'backup_url' => config('app.url').'/settings/backups/download/'.basename($backup_files[$f]),
]; ];
$count++; $count++;
@ -269,7 +270,7 @@ class SettingsController extends Controller
$path = 'app/backups'; $path = 'app/backups';
if (Storage::exists($path.'/'.$file)) { if (Storage::exists($path.'/'.$file)) {
$headers = ['ContentType' => 'application/zip']; $headers = ['ContentType' => 'application/zip'];
return Storage::download($path.'/'.$file, $file, $headers); return response()->download($path.'/'.$file, $file, $headers);
} else { } else {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found'))); return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_not_found')));
} }