webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00
Code Activity

ZIP Import: Added upload handling

Browse Source 
Split attachment service storage work out so it can be shared.
This commit is contained in:
Dan Brown
2024-11-02 20:48:21 +00:00
parent 74fce9640e
commit 8ea3855e02
5 changed files with 195 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/Exports/Controllers/ImportController.php
View File

@@ -2,16 +2,17 @@
namespace BookStack\Exports\Controllers;
use BookStack\Exports\Import;
use BookStack\Exports\ZipExports\ZipExportReader;
use BookStack\Exports\ZipExports\ZipExportValidator;
use BookStack\Exceptions\ZipValidationException;
use BookStack\Exports\ImportRepo;
use BookStack\Http\Controller;
use BookStack\Uploads\AttachmentService;
use Illuminate\Http\Request;
class ImportController extends Controller
{
public function __construct()
{
public function __construct(
protected ImportRepo $imports,
) {
$this->middleware('can:content-import');
}
@@ -27,35 +28,17 @@ class ImportController extends Controller
public function upload(Request $request)
{
$this->validate($request, [
'file' => ['required', 'file']
'file' => ['required', ...AttachmentService::getFileValidationRules()]
]);
$file = $request->file('file');
$zipPath = $file->getRealPath();
$errors = (new ZipExportValidator($zipPath))->validate();
if ($errors) {
session()->flash('validation_errors', $errors);
try {
$import = $this->imports->storeFromUpload($file);
} catch (ZipValidationException $exception) {
session()->flash('validation_errors', $exception->errors);
return redirect('/import');
}
$zipEntityInfo = (new ZipExportReader($zipPath))->getEntityInfo();
$import = new Import();
$import->name = $zipEntityInfo['name'];
$import->book_count = $zipEntityInfo['book_count'];
$import->chapter_count = $zipEntityInfo['chapter_count'];
$import->page_count = $zipEntityInfo['page_count'];
$import->created_by = user()->id;
$import->size = filesize($zipPath);
// TODO - Set path
// TODO - Save
// TODO - Split out attachment service to separate out core filesystem/disk stuff
// To reuse for import handling
dd('passed');
// TODO - Upload to storage
// TODO - Store info/results for display:
// TODO - Send user to next import stage
return redirect("imports/{$import->id}");
}
}

48
app/Exports/ImportRepo.php Normal file
View File

@@ -0,0 +1,48 @@
<?php
namespace BookStack\Exports;
use BookStack\Exceptions\ZipValidationException;
use BookStack\Exports\ZipExports\ZipExportReader;
use BookStack\Exports\ZipExports\ZipExportValidator;
use BookStack\Uploads\FileStorage;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class ImportRepo
{
public function __construct(
protected FileStorage $storage,
) {
}
public function storeFromUpload(UploadedFile $file): Import
{
$zipPath = $file->getRealPath();
$errors = (new ZipExportValidator($zipPath))->validate();
if ($errors) {
throw new ZipValidationException($errors);
}
$zipEntityInfo = (new ZipExportReader($zipPath))->getEntityInfo();
$import = new Import();
$import->name = $zipEntityInfo['name'];
$import->book_count = $zipEntityInfo['book_count'];
$import->chapter_count = $zipEntityInfo['chapter_count'];
$import->page_count = $zipEntityInfo['page_count'];
$import->created_by = user()->id;
$import->size = filesize($zipPath);
$path = $this->storage->uploadFile(
$file,
'uploads/files/imports/',
'',
'zip'
);
$import->path = $path;
$import->save();
return $import;
}
}