Merge branch 'release/1.1.1' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Transcoder Changelog
 
+## 1.1.1 - 2018.02.03
+### Changed
+* Only generate a thumbnail when we're actually asked to do so via `$generate1`
+
 ## 1.1.0 - 2018.02.02
 ### Added
 * Transcoder now supports the transcoding of remote video & audio files

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-transcoder",
     "description": "Transcode video & audio files to various formats, and provide video thumbnails",
     "type": "craft-plugin",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "keywords": [
         "craft",
         "cms",

src/services/Transcode.php

@@ -200,12 +200,14 @@ public function getVideoUrl($filePath, $videoOptions): string
     /**
      * Returns a URL to a video thumbnail
      *
-     * @param $filePath         string  path to the original video or an Asset
-     * @param $thumbnailOptions array   of options for the thumbnail
+     * @param string $filePath         path to the original video or an Asset
+     * @param array  $thumbnailOptions of options for the thumbnail
+     * @param bool   $generate         whether the thumbnail should be
+     *                                 generated if it doesn't exists
      *
-     * @return string           URL of the video thumbnail
+     * @return string URL of the video thumbnail
      */
-    public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
+    public function getVideoThumbnailUrl($filePath, $thumbnailOptions, $generate = true): string
     {
 
         $result = "";
@@ -248,8 +250,14 @@ public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
 
             // If the thumbnail file already exists, return it.  Otherwise, generate it and return it
             if (!file_exists($destThumbnailPath)) {
-                $shellOutput = $this->executeShellCommand($ffmpegCmd);
-                Craft::info($ffmpegCmd, __METHOD__);
+                if ($generate) {
+                    $shellOutput = $this->executeShellCommand($ffmpegCmd);
+                    Craft::info($ffmpegCmd, __METHOD__);
+                } else {
+                    Craft::info('Thumbnail does not exist, but not asked to generate it: ' . $filePath, __METHOD__);
+                    // The file doesn't exist, and we weren't asked to generate it
+                    return '';
+                }
             }
             $result = Craft::getAlias($settings['transcoderUrl']) . $destThumbnailFile;
         }
@@ -481,10 +489,10 @@ public function getAudioFilename($filePath, $audioOptions): string
     public function handleGetAssetThumbUrl(GetAssetThumbUrlEvent $event)
     {
         $options = [
-            "width" => $event->width,
+            "width"  => $event->width,
             "height" => $event->height,
         ];
-        $thumbUrl = $this->getVideoThumbnailUrl($event->asset, $options);
+        $thumbUrl = $this->getVideoThumbnailUrl($event->asset, $options, $event->generate);
 
         return empty($thumbUrl) ? null : $thumbUrl;
     }