Merge branch 'release/1.2.11' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Transcoder Changelog
 
+## 1.2.11 - 2020.03.11
+### Added
+* Transcoder now requires Craft CMS 3.1.0 or later
+* Both aliases and environment variables are now supported where previously only aliases were
+
+### Fixed
+* Only swap in a thumbnail for videos if a thumbnail is successfully returned
+
 ## 1.2.10 - 2020.02.25
 ### Added
 * Added `-vn` flag for audio transcoding to remove video tracks on transcoded audio

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.2.10",
+    "version": "1.2.11",
     "keywords": [
         "craft",
         "cms",
@@ -28,7 +28,7 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0.0",
+        "craftcms/cms": "^3.1.0",
         "mikehaertl/php-shellcommand": "~1.2"
     },
     "autoload": {

src/Transcoder.php

@@ -92,7 +92,7 @@ public function clearAllCaches()
         $transcoderPaths = self::$plugin->getSettings()->transcoderPaths;
 
         foreach ($transcoderPaths as $key => $value) {
-            $dir = Craft::getAlias($value);
+            $dir = Craft::parseEnv($value);
             try {
                 FileHelper::clearDirectory($dir);
                 Craft::info(
@@ -156,7 +156,10 @@ function (AssetThumbEvent $event) {
                 /** @var Asset $asset */
                 $asset = $event->asset;
                 if (AssetsHelper::getFileKindByExtension($asset->filename) === Asset::KIND_VIDEO) {
-                    $event->path = Transcoder::$plugin->transcode->handleGetAssetThumbPath($event);
+                    $path = Transcoder::$plugin->transcode->handleGetAssetThumbPath($event);
+                    if (!empty($path)) {
+                        $event->path = $path;
+                    }
                 }
             }
         );

src/services/Transcode.php

@@ -108,7 +108,7 @@ public function getVideoUrl($filePath, $videoOptions, $generate = true): string
 
         if (!empty($filePath)) {
             $destVideoPath = $settings['transcoderPaths']['video'].$subfolder ?? $settings['transcoderPaths']['default'];
-            $destVideoPath = Craft::getAlias($destVideoPath);
+            $destVideoPath = Craft::parseEnv($destVideoPath);
             $videoOptions = $this->coalesceOptions('defaultVideoOptions', $videoOptions);
 
             // Get the video encoder presets to use
@@ -200,7 +200,7 @@ public function getVideoUrl($filePath, $videoOptions, $generate = true): string
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if (file_exists($destVideoPath) && (@filemtime($destVideoPath) >= @filemtime($filePath))) {
                 $url = $settings['transcoderUrls']['video'].$subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::getAlias($url).$destVideoFile;
+                $result = Craft::parseEnv($url).$destVideoFile;
                 // skip encoding
             } elseif (!$generate) {
                 $result = "";
@@ -243,7 +243,7 @@ public function getVideoThumbnailUrl($filePath, $thumbnailOptions, $generate = t
 
         if (!empty($filePath)) {
             $destThumbnailPath = $settings['transcoderPaths']['thumbnail'].$subfolder ?? $settings['transcoderPaths']['default'];
-            $destThumbnailPath = Craft::getAlias($destThumbnailPath);
+            $destThumbnailPath = Craft::parseEnv($destThumbnailPath);
 
             $thumbnailOptions = $this->coalesceOptions('defaultThumbnailOptions', $thumbnailOptions);
 
@@ -303,7 +303,7 @@ public function getVideoThumbnailUrl($filePath, $thumbnailOptions, $generate = t
                 $result = $destThumbnailPath;
             } else {
                 $url = $settings['transcoderUrls']['thumbnail'].$subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::getAlias($url).$destThumbnailFile;
+                $result = Craft::parseEnv($url).$destThumbnailFile;
             }
         }
 
@@ -334,7 +334,7 @@ public function getAudioUrl($filePath, $audioOptions): string
 
         if (!empty($filePath)) {
             $destAudioPath = $settings['transcoderPaths']['audio'].$subfolder ?? $settings['transcoderPaths']['default'];
-            $destAudioPath = Craft::getAlias($destAudioPath);
+            $destAudioPath = Craft::parseEnv($destAudioPath);
 
             $audioOptions = $this->coalesceOptions('defaultAudioOptions', $audioOptions);
 
@@ -423,15 +423,15 @@ public function getAudioUrl($filePath, $audioOptions): string
             // If the audio file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if (file_exists($destAudioPath) && (@filemtime($destAudioPath) >= @filemtime($filePath))) {
                 $url = $settings['transcoderUrls']['audio'].$subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::getAlias($url).$destAudioFile;
+                $result = Craft::parseEnv($url).$destAudioFile;
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
 
                 if ($synchronous) {
                     Craft::info($ffmpegCmd, __METHOD__);
                     $url = $settings['transcoderUrls']['audio'] . $subfolder ?? $settings['transcoderUrls']['default'];
-                    $result = Craft::getAlias($url).$destAudioFile;
+                    $result = Craft::parseEnv($url).$destAudioFile;
                 } else {
                     Craft::info($ffmpegCmd."\nffmpeg PID: ".$pid, __METHOD__);
                     // Create a lockfile in tmp
@@ -629,7 +629,7 @@ public function getGifUrl($filePath, $gifOptions): string
         if (!empty($filePath)) {
             // Dest path
             $destVideoPath = $settings['transcoderPaths']['gif'].$subfolder ?? $settings['transcoderPaths']['default'];
-            $destVideoPath = Craft::getAlias($destVideoPath);
+            $destVideoPath = Craft::parseEnv($destVideoPath);
 
             // Options
             $gifOptions = $this->coalesceOptions('defaultGifOptions', $gifOptions);
@@ -683,7 +683,7 @@ public function getGifUrl($filePath, $gifOptions): string
             // If the video file already exists and hasn't been modified, return it.  Otherwise, start it transcoding
             if (file_exists($destVideoPath) && (@filemtime($destVideoPath) >= @filemtime($filePath))) {
                 $url = $settings['transcoderUrls']['gif'].$subfolder ?? $settings['transcoderUrls']['default'];
-                $result = Craft::getAlias($url).$destVideoFile;
+                $result = Craft::parseEnv($url).$destVideoFile;
             } else {
                 // Kick off the transcoding
                 $pid = $this->executeShellCommand($ffmpegCmd);
@@ -785,7 +785,7 @@ protected function getAssetPath($filePath): string
             }
         }
 
-        $filePath = Craft::getAlias($filePath);
+        $filePath = Craft::parseEnv($filePath);
 
         // Make sure that $filePath is either an existing file, or a valid URL
         if (!file_exists($filePath)) {