wip #5453 @1

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php
index d92522e086dc0659731dea79b663df39fb40de29..e8d55b9b52842a556a44d0dd61c17804737d11ff 100644 (file)
--- 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 6e749f929b4304a2a502e0fea61003ad30aaa744..655e7b6255620bff30dc6ccbccd79fbfd4a73920 100644 (file)
--- 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 {