wait #6499 @0:20

diff --git a/app/Jobs/FluidbookDocumentUpload.php b/app/Jobs/FluidbookDocumentUpload.php
index 91a64c42fabfb1d0b84e7830ca1ee2c2f98fbd6c..4e15587f625f38931dda1fe572c1f82ce325b2f1 100644 (file)
--- a/app/Jobs/FluidbookDocumentUpload.php
+++ b/app/Jobs/FluidbookDocumentUpload.php
@@ -45,11 +45,11 @@ class FluidbookDocumentUpload extends Base
     public function handle($sync = false)
     {
         try {
-            FluidbookDocumentUpload::updateProgression($this->uploadID, $this->document->id, __('Début du traitement du document'), 1.25);
+            static::updateProgression($this->uploadID, $this->document->id, __('Début du traitement du document'), 1.25);
             $this->document->processUpload($this->uploadID, $sync);
         } catch (\Throwable $e) {
             Log::error($e);
-            FluidbookDocumentUpload::updateProgression($this->uploadID, $this->document->id, __('Une erreur s\'est produite :error', ['error' => $e->getMessage()]), -1);
+            static::updateProgression($this->uploadID, $this->document->id, __('Une erreur s\'est produite :error', ['error' => $e->getMessage()]), -1);
         }
     }
 

diff --git a/app/Models/FluidbookDocument.php b/app/Models/FluidbookDocument.php
index 3641374f80a29d872dec045771d05ae12f876ba3..e3a257a71f166175d57327a9dcc7d32495209f2e 100644 (file)
--- a/app/Models/FluidbookDocument.php
+++ b/app/Models/FluidbookDocument.php
@@ -512,16 +512,18 @@ class FluidbookDocument extends ToolboxModel
         // Détection des spreads
         $this->autocut = false;
         $this->manualcut = false;
-        if ($pagesInfos->pages <= 2) {
+        if ($pagesInfos->pages < 2) {
             return;
         }
 
         foreach ($pagesInfos->pdf_data['page'] as $page => $infos) {
             if ($page == 1) {
                 $first = $infos['size'];
-            } elseif ($page == $pagesInfos->pages) {
+            }
+            if ($page == $pagesInfos->pages) {
                 $last = $infos['size'];
-            } elseif ($page == 2) {
+            }
+            if ($page == 2) {
                 $second = $infos['size'];
             }
         }
@@ -530,7 +532,7 @@ class FluidbookDocument extends ToolboxModel
         if (self::compareSizes($last, $first) && Math::compare($first[0] * 2, $second[0], 0.9)) {
             $this->autocut = '1-23-4';
         }
-        if (Math::compare($first[0] * 2, $second[0], 0.9) && self::compareSizes($last, $second)) {
+        if (Math::compare($first[0] * 2, $second[0], 0.9) && ($pagesInfos->pages == 2 || self::compareSizes($last, $second))) {
             $this->autocut = '1-23';
         }
     }