From 5b6f0b0fc76b13d364fdc02b27de38d60fb454b0 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 8 Aug 2025 11:03:06 +0200
Subject: [PATCH] wait #7684 @1

---
 app/Fluidbook/Farm.php | 10 +++++++---
 composer.lock          | 30 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 9caa3391b..fa148a738 100644
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -318,7 +318,6 @@ class Farm
         }
 
         $farmer = self::pickOneServer($preferLocal, $params);
-
         $params['toolbox'] = '1';
 
         try {
@@ -340,7 +339,11 @@ class Farm
                 $res = false;
             }
         } else {
-            $res = true;
+            if (file_exists($output)) {
+                $res = $output;
+            } else {
+                $res = true;
+            }
         }
 
 
@@ -433,13 +436,14 @@ class Farm
 
         $lock = 'pdfarea_' . hash('sha256', $file . '_' . $page . '_' . json_encode($rect) . '_' . json_encode($options));
         return static::lock($file, $lock, function () use ($file, $page, $rect, $to, $options, $cache) {
-            return self::_getFile(
+            $res = self::_getFile(
                 ['operation' => 'extractpdfarea',
                     'pdf' => $file,
                     'out' => $cache,
                     'page' => $page,
                     'area' => json_encode($rect),
                     'options' => json_encode($options)], 0, false, true);
+            return $res;
         });
     }
 }
diff --git a/composer.lock b/composer.lock
index d7a3525f8..6f8c706e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2441,13 +2441,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_pdf.git",
-                "reference": "4a0d3364fcb6b1d5a507e0d638681260a2d6a788"
+                "reference": "42c98fa4c8eaed880d39a258612d24d3b4581591"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-e292ef.tar",
-                "reference": "4a0d3364fcb6b1d5a507e0d638681260a2d6a788",
-                "shasum": "3e33cff20c869774d0c15d300a904a339bbb649e"
+                "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-435e99.tar",
+                "reference": "42c98fa4c8eaed880d39a258612d24d3b4581591",
+                "shasum": "0813995f3a2637c307b13f4dab0b98e255524d95"
             },
             "require": {
                 "cubist/util": "dev-master",
@@ -2483,7 +2483,7 @@
                 "cubist",
                 "pdf"
             ],
-            "time": "2025-08-04T14:50:18+00:00"
+            "time": "2025-08-07T13:51:05+00:00"
         },
         {
             "name": "cubist/scorm",
@@ -2528,13 +2528,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "5dccc705639a1cb2725116331e062cb0f0ca3fca"
+                "reference": "4e307c0cc8120d508efcfaf777554ed9bd75755f"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-c849fa.tar",
-                "reference": "5dccc705639a1cb2725116331e062cb0f0ca3fca",
-                "shasum": "d4f86e0829922835a97110ae6c4f9e614b87f14f"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-ed2b8d.tar",
+                "reference": "4e307c0cc8120d508efcfaf777554ed9bd75755f",
+                "shasum": "0efce5771cce8f998c0a60a178bffd5c16c7d4fa"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -2568,7 +2568,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2025-06-12T14:50:04+00:00"
+            "time": "2025-08-07T15:26:43+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
@@ -4137,13 +4137,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "1fce06379d7bd928569b371e1aee8dc78d727de0"
+                "reference": "b2e0e8f5313a053510a64f3fbd73101f38b82c0f"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-a957de.tar",
-                "reference": "1fce06379d7bd928569b371e1aee8dc78d727de0",
-                "shasum": "41cbac451f27c1c67fa42eb9c9615693ff399cd0"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-bef312.tar",
+                "reference": "b2e0e8f5313a053510a64f3fbd73101f38b82c0f",
+                "shasum": "fa89fef484bc1dad8ec4b2b0f8b0e3a262df5576"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "*",
@@ -4179,7 +4179,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2025-08-07T10:47:38+00:00"
+            "time": "2025-08-07T14:13:43+00:00"
         },
         {
             "name": "fpdf/fpdf",
-- 
2.39.5