Merge branch 'release/1.2.3' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Transcoder Changelog
 
+## 1.2.3 - 2019.03.20
+### Changed
+* Allow setting threads in config
+* Added a "generate" (bool) parameter to `getVideoUrl()`, just like `getVideoThumbnailUrl()`, to optionally skip encoding
+* Added return value false to `getVideoThumbnailUrl()` when `ffmpeg` is executed which prevents a URL is always returned, also in case of `ffmpeg` fails te run/create the thumbnail
+* Added new config parameter "createSubfolder" (boolean) to create the same subfolders that are defined in the upload target paths of the asset.
+* Added config option to prevent cache clearing
+* Fixed an issue where `getFileInfo()` would throw an error if `null` was returned
+* Fixed an error where certain types of video streams would cause the encoder to throw an exception
+
 ## 1.2.2 - 2018.10.05
 ### Changed
 * Updated build process
@@ -14,7 +24,7 @@
 * Added multiple output paths and URLs for different media types
 
 ### Changed
-* Moved to a modern webpack build config for the AdminCP
+* Moved to a modern webpack build config for the Control Panel
 * Added install confetti
 
 ## 1.1.3 - 2018.03.02
@@ -33,7 +43,7 @@
 ## 1.1.0 - 2018.02.02
 ### Added
 * Transcoder now supports the transcoding of remote video & audio files
-* Added the ability to generate a thumbnail for videos in the AdminCP Assets index
+* Added the ability to generate a thumbnail for videos in the Control Panel Assets index
 
 ### Changed
 * Cleaned up the exception handling

README.md

@@ -4,7 +4,7 @@
 
 Transcode video & audio files to various formats, and provide video thumbnails
 
-![Screenshot](resources/img/plugin-logo.png)
+![Screenshot](resources/img/plugin-banner.jpg)
 
 Related: [Transcoder for Craft 2.x](https://github.com/nystudio107/transcoder)
 
@@ -21,7 +21,7 @@ To install Transcoder, follow these steps:
 1. Install with Composer via `composer require nystudio107/craft-transcoder` from your project directory
 2. Install plugin in the Craft Control Panel under Settings > Plugins
 
-You can also install Transcoder via the **Plugin Store** in the Craft AdminCP.
+You can also install Transcoder via the **Plugin Store** in the Craft Control Panel.
 
 Transcoder works on Craft 3.x.
 
@@ -40,7 +40,7 @@ The Transcoder plugin allows you to transcode any video or animated gif (local o
 
 It can also transcode audio files to any bitrate & sample rate, to a variety of file formats. It can even extract audio tracks from video files.
 
-Transcoder also allows you to get a thumbnail of a video in any size and at any timecode, and can extract information about audio/video files such. It also automatically adds video thumbnails in the Assets index in the AdminCP.
+Transcoder also allows you to get a thumbnail of a video in any size and at any timecode, and can extract information about audio/video files such. It also automatically adds video thumbnails in the Assets index in the Control Panel.
 
 Finally, it lets you download an arbitrary file (such as the transcoded video) via a special download link.
 
@@ -127,7 +127,7 @@ The file format setting `videoEncoder` is preset to what you'll need to generate
 
 ![Screenshot](resources/screenshots/admin-cp-video-thumbnails.png)
 
-Transcoder will also automatically add video thumbnails in the AdminCP Asset index.
+Transcoder will also automatically add video thumbnails in the Control Panel Asset index.
 
 ### Generating a Transcoded Audio File
 
@@ -256,7 +256,7 @@ The file format setting `videoEncoder` is preset to what you'll need to generate
 
 ![Screenshot](resources/screenshots/admin-cp-video-thumbnails.png)
 
-Transcoder will also automatically add video thumbnails in the AdminCP Asset index.
+Transcoder will also automatically add video thumbnails in the Control Panel Asset index.
 
 ### Getting Transcoding Progress
 

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.2",
+    "version": "1.2.3",
     "keywords": [
         "craft",
         "cms",

resources/img/plugin-banner.jpg

@@ -43,6 +43,8 @@
  * @since     1.0.0
  *
  * @property  Transcode $transcode
+ * @property Settings   $settings
+ * @method   Settings   getSettings()
  */
 class Transcoder extends Plugin
 {
@@ -89,6 +91,7 @@ public function init()
     public function clearAllCaches()
     {
         $transcoderPaths = Transcoder::$plugin->getSettings()->transcoderPaths;
+
         foreach ($transcoderPaths as $key => $value) {
             $dir = Craft::getAlias($value);
             try {
@@ -141,6 +144,7 @@ function (Event $event) {
      */
     protected function installEventHandlers()
     {
+        $settings = $this->getSettings();
         // Handler: Assets::EVENT_GET_THUMB_PATH
         Event::on(
             Assets::class,
@@ -157,18 +161,20 @@ function (AssetThumbEvent $event) {
                 }
             }
         );
-        // Add the Transcode path to the list of things the Clear Caches tool can delete.
-        Event::on(
-            ClearCaches::class,
-            ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
-                $event->options[] = [
-                    'key' => 'transcoder',
-                    'label' => Craft::t('transcoder', 'Transcoder caches'),
-                    'action' => [$this, 'clearAllCaches']
-                ];
-            }
-        );
+        if ($settings->clearCaches) {
+            // Add the Transcode path to the list of things the Clear Caches tool can delete.
+            Event::on(
+                ClearCaches::class,
+                ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
+                function (RegisterCacheOptionsEvent $event) {
+                    $event->options[] = [
+                        'key' => 'transcoder',
+                        'label' => Craft::t('transcoder', 'Transcoder caches'),
+                        'action' => [$this, 'clearAllCaches'],
+                    ];
+                }
+            );
+        }
         // Handler: Plugins::EVENT_AFTER_INSTALL_PLUGIN
         Event::on(
             Plugins::class,
@@ -203,7 +209,7 @@ function (RegisterUrlRulesEvent $event) {
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__
                 );
-                // Register our AdminCP routes
+                // Register our Control Panel routes
                 $event->rules = array_merge(
                     $event->rules,
                     $this->customFrontendRoutes()

src/Transcoder.php

@@ -13,7 +13,7 @@
  * https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css
  */
 /**
- * We don't want these in the AdminCP
+ * We don't want these in the Control Panel
  * @import "tailwindcss/preflight";
  */
 

src/assetbundles/transcoder/dist/css/styles.ff7dcd9158e0d5435c51.css.map

@@ -57,6 +57,12 @@
     // Use a md5 hash for the filenames instead of parameterized naming
     'useHashedNames' => false,
 
+    // if a upload location has a subfolder defined, add this to the transcoder paths too
+    'createSubfolders' => true,
+
+    // Add the Clear Caches utility to the CP?
+    'clearCaches' => false,
+
     // Preset video encoders
     'videoEncoders' => [
         'h264' => [
@@ -66,6 +72,7 @@
             'videoCodecOptions' => '-vprofile high -preset slow -crf 22',
             'audioCodec' => 'libfdk_aac',
             'audioCodecOptions' => '-async 1000',
+            'threads' => '0',
         ],
         'webm' => [
             'fileSuffix' => '.webm',
@@ -74,12 +81,14 @@
             'videoCodecOptions' => '-quality good -cpu-used 0',
             'audioCodec' => 'libvorbis',
             'audioCodecOptions' => '-async 1000',
+            'threads' => '0',
         ],
         'gif' => [
             'fileSuffix' => '.mp4',
             'fileFormat' => 'mp4',
             'videoCodec' => 'libx264',
             'videoCodecOptions' => '-pix_fmt yuv420p -movflags +faststart -filter:v crop=\'floor(in_w/2)*2:floor(in_h/2)*2\' ',
+            'threads' => '0',
         ],
     ],
 
@@ -90,19 +99,22 @@
             'fileFormat' => 'mp3',
             'audioCodec' => 'libmp3lame',
             'audioCodecOptions' => '',
+            'threads' => '0',
         ],
         'aac' => [
             'fileSuffix' => '.m4a',
             'fileFormat' => 'aac',
             'audioCodec' => 'libfdk_aac',
             'audioCodecOptions' => '',
+            'threads' => '0',
 
         ],
         'ogg' => [
             'fileSuffix' => '.ogg',
             'fileFormat' => 'ogg',
             'audioCodec' => 'libvorbis',
             'audioCodecOptions' => '',
+            'threads' => '0',
         ],
     ],