wait #6780 @0.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index eb1901718d178fcf25d8a1f378dd6d779b1ba103..fb89dbcac53927f35ce2900a2fde18b10a16a59e 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -96,7 +96,7 @@ services:
       - '/home/toolbox/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
       # External volume
       - 'sshfsusstorage:/application/usstorage:ro'
-      - 'docs:/application/protected/fluidbookpublication/docs:ro'
+      - 'docs1:/application/protected/fluidbookpublication/docs:ro'
     ports:
       - '37126:80'
     environment:
@@ -181,7 +181,7 @@ volumes:
       allow_other: ""
       password: "Qu2E9uq48bBzsqGiZA"
 
-  docs:
+  docs1:
     driver: ucphhpc/sshfs:latest
     driver_opts:
       sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"

diff --git a/.docker/update.sh b/.docker/update.sh
index 3ed3bc307eda48e0a92b3c19449176d5856f9228..cc1b6ac054866b65947c1420aa20f8d61c016fef 100644 (file)
--- a/.docker/update.sh
+++ b/.docker/update.sh
@@ -6,7 +6,7 @@ chown root:root /home/toolbox/www/.docker/config/sudoers
 docker network create fluidbook-toolbox
 docker compose down
 docker volume rm fluidbook-toolbox_sshfsusstorage
-docker volume rm fluidbook-toolbox_docs
+docker volume rm fluidbook-toolbox_docs1
 docker compose up -d
 docker exec -it fluidbook-toolbox /application/scripts/update.sh
 /home/toolbox/www/scripts/fixrights.sh

diff --git a/app/Models/FluidbookHealthIssues.php b/app/Models/FluidbookHealthIssues.php
index fcccec5a05dc34163c871ff8d98581d4adb5fbcd..aca33791d3ac0207f6e15a37d79180bfb04e3c50 100644 (file)
--- a/app/Models/FluidbookHealthIssues.php
+++ b/app/Models/FluidbookHealthIssues.php
@@ -18,6 +18,7 @@ class FluidbookHealthIssues extends ToolboxModel
     const TYPE_COMPILE_FILES = 5;
     const TYPE_CHAPTER_PAGE_NOT_EXIST = 6;
     const TYPE_TABS_MISSING_TAB_ID = 7;
+    const TYPE_THUMBS_PDF_MISSING = 8;
 
     const CRIT_ERROR = 5;
     const CRIT_WARNING = 3;
@@ -72,6 +73,8 @@ class FluidbookHealthIssues extends ToolboxModel
          * __('La voix d\'audiodescription :voice est invalide')
          * __('L\'erreur suivante s\'est produite lors de la compilation du fluidbook : :error')
          * __('Page introuvable pour le chapitre intitulé :chapter (Page :page). L\'élement ne sera pas affiché dans la publication')
+         * __('Le SVG des onglets devraient contenir des calques portant les identifiants suivants : :missing_tabs.')
+         * __('Le fichier PDF de génération des miniatures est introuvable : :path. Les vignettes seront générées à partir du PDF principal.')
          *
  */
         return [
@@ -125,7 +128,14 @@ class FluidbookHealthIssues extends ToolboxModel
                     'text' => 'Le SVG des onglets devraient contenir des calques portant les identifiants suivants : :missing_tabs.',
                     'fixText' => __('Lire la documentation'),
                     'fixURL' => 'https://docs.google.com/document/d/1iq4o9V3h74QCMxAymGbSmCkYZWjzK81FskDWKTxejFg/edit',
-                ]
+                ],
+            static::TYPE_THUMBS_PDF_MISSING => [
+                'summary' => __('PDF des miniatures introuvable'),
+                'criticality' => self::CRIT_WARNING,
+                'text' => 'Le fichier PDF de génération des miniatures est introuvable : :path. Les vignettes seront générées à partir du PDF principal.',
+                'fixText' => __('Corriger le paramètre'),
+                'fixURL' => route('fluidbook-publication.edit', ['id' => $fluidbookId]) . '#s_section_index',
+            ],
         ];
     }
 

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 90e0904858850d0ed6c42f7d508b1a6bbb1fcd7b..b3e6e62b6f82627b0cefac647cb164539c66f924 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -469,7 +469,7 @@ class FluidbookPublication extends ToolboxStatusModel
                     throw new \Exception('Unable to generate thumbnails file from custom PDF "' . $this->pdfThumbnails . '" (original message : ' . $e->getMessage() . ')');
                 }
             } else {
-                Log::warning('Thumbnails file ' . $thumbpdf . ' not found. Generating file from standard PDF');
+                FluidbookHealthIssues::addIssue($this->id, FluidbookHealthIssues::TYPE_THUMBS_PDF_MISSING, ['path' => $this->pdfThumbnails]);
             }
         }
         return $this->getFile($page, $format, $resolution, $withText, $withGraphics, $version, $force);