From: Vincent Vanwaelscappel Date: Thu, 15 Sep 2022 13:51:07 +0000 (+0200) Subject: wip #5453 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9adae398cfad56955ede3c875eb489def114e68c;p=fluidbook-toolbox.git wip #5453 @1 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php index d92522e08..e8d55b9b5 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php @@ -55,7 +55,6 @@ trait CompositionOperation $document->save(); move_uploaded_file($file->getPathname(), Files::mkdir($document->path()) . 'original.pdf'); FluidbookDocumentUpload::updateProgression($uploadID, __('Mise en file d\'attente du traitement du document'), 1.2); - FluidbookDocumentUpload::dispatch($uploadID, $document, backpack_user()); return response()->json(['uploadID' => $uploadID, 'document' => $document->id]); } diff --git a/app/Models/FluidbookDocument.php b/app/Models/FluidbookDocument.php index 6e749f929..655e7b625 100644 --- a/app/Models/FluidbookDocument.php +++ b/app/Models/FluidbookDocument.php @@ -63,12 +63,19 @@ class FluidbookDocument extends ToolboxModel FluidbookDocumentUpload::updateProgression($uploadID, __('Conversion des pages'), 2); $jobs = []; - $files = [['jpg', 'thumb'], ['jpg', 150]]; + $files = [ + // Thumbnail + ['jpg', 'thumb'], + // Images + ['jpg', 150, false, true], + // Texts + ['svg', 150, true, false], + ]; $nbfiles = count($files); $delay = 0; for ($i = 1; $i <= $this->pages; $i++) { foreach ($files as $file) { - $job = new FluidbookDocumentFileProcess($this, $i, $file[0], $file[1]); + $job = new FluidbookDocumentFileProcess($this, $i, $file[0], $file[1], $file[2], $file[3]); if ($sync) { dispatch_sync($job); } else {