Issue #31: Handle missing files better

The slide cache will still emit warnings for missing files that are configured to be there, but the carousel will no longer emit constant warnings for bad slide definitions.
catalyst · Jan 24, 2022 · c63dd3a · c63dd3a
1 parent f14204d
commit c63dd3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/block_carousel.php b/block_carousel.php
@@ -126,7 +126,7 @@ public function get_content() {
         if ($slides > 1) {
             $firstslide = reset($data);
             $height = $firstslide['heightres'];
-            if ($height === 0) {
+            if ($height === 0 || $height === null) {
                 $ratio = 1;
             } else {
                 $ratio = ($firstslide['widthres'] / $firstslide['heightres']);
@@ -143,6 +143,11 @@ public function get_content() {
                 continue;
             }
 
+            // Filter any files that are not present or broken.
+            if ($data->heightres === null && $data->widthres === null && $data->contenttype === 'image') {
+                continue;
+            }
+
             // Check release timing.
             if ((!empty($data->timedstart) && time() < $data->timedstart) ||
                 (!empty($data->timedend) && time() > $data->timedend)) {

diff --git a/classes/cache/slide_cache.php b/classes/cache/slide_cache.php
@@ -141,8 +141,13 @@ public function load_for_cache($key) {
             $data['widthres'] = 0;
         } else if ($record->contenttype === 'image') {
             $imageinfo = $selectedfile->get_imageinfo();
-            $data['heightres'] = $imageinfo['height'];
-            $data['widthres'] = $imageinfo['width'];
+            if (!$imageinfo) {
+                $data['heightres'] = null;
+                $data['widthres'] = null;
+            } else {
+                $data['heightres'] = $imageinfo['height'];
+                $data['widthres'] = $imageinfo['width'];
+            }
         } else {
             // Use FFMpeg to get resolution.
             $path = $selectedfile->copy_content_to_temp();