From 3c615e69e9d4900dfd2023fdc04689f87205ebfe Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 21 Nov 2023 15:50:44 +0100 Subject: [PATCH] wait #6499 @0:20 --- app/Jobs/FluidbookDocumentUpload.php | 4 ++-- app/Models/FluidbookDocument.php | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Jobs/FluidbookDocumentUpload.php b/app/Jobs/FluidbookDocumentUpload.php index 91a64c42f..4e15587f6 100644 --- 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 3641374f8..e3a257a71 100644 --- 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'; } } -- 2.39.5