From 13e1f0a56190cb6c602c2cbced06b706f07006de Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 21 Jul 2016 00:24:05 +0200 Subject: [PATCH] VideoThumbnails shouldn't have to recreate the thumbnail all the time --- plugins/VideoThumbnails/VideoThumbnailsPlugin.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php index fc3925375f..30b62677ee 100644 --- a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php +++ b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php @@ -55,6 +55,21 @@ class VideoThumbnailsPlugin extends Plugin return true; } + try { + // Exception thrown if no thumbnail found + $thumb = File_thumbnail::byFile($file, false); + // If getPath doesn't throw an exception, we have a working locally stored thumbnail + return $thumb->getPath(); + } catch (NoResultException $e) { + // Alright, no thumbnail found, so let's create one. + } catch (InvalidFilenameException $e) { + // I guess this means $thumb->filename is null? Shouldn't happen because $file->filename is not null, so delete it + $thumb->delete(); + } catch (FileNotFoundException $e) { + // Thumb file was not found, let's delete it. + $thumb->delete(); + } + // Let's save our frame to a temporary file. If we fail, remove it. $tmp_imgPath = tempnam(sys_get_temp_dir(), 'socialthumb-'); -- 2.39.5