Add new settings + validation rules

Signed-off-by: Andrew Welch <andrew@nystudio107.com>

Author: khalwat

src/models/Settings.php

@@ -22,54 +22,30 @@
  */
 class Settings extends Model
 {
-
     // Static Methods
     // =========================================================================
 
-    /**
-     * @inheritdoc
-     */
-    public function __construct(array $config = [])
-    {
-        // Unset any deprecated properties
-        if (!empty($config)) {
-            // If the old properties are set, remap them to the default
-            if (isset($config['transcoderPath'])) {
-                $config['transcoderPaths']['default'] = $config['transcoderPath'];
-                unset($config['transcoderPath']);
-            }
-            if (isset($config['transcoderUrl'])) {
-                $config['$transcoderUrls']['default'] = $config['transcoderUrl'];
-                unset($config['transcoderUrl']);
-            }
-        }
-        parent::__construct($config);
-    }
-
-    // Public Properties
-    // =========================================================================
-
     /**
      * The path to the ffmpeg binary
      *
      * @var string
      */
     public $ffmpegPath = '/usr/bin/ffmpeg';
 
+    // Public Properties
+    // =========================================================================
     /**
      * The path to the ffprobe binary
      *
      * @var string
      */
     public $ffprobePath = '/usr/bin/ffprobe';
-
     /**
      * The options to use for ffprobe
      *
      * @var string
      */
     public $ffprobeOptions = '-v quiet -print_format json -show_format -show_streams';
-
     /**
      * The path where the transcoded videos are stored; must have a trailing /
      * Yii2 aliases are supported here
@@ -83,7 +59,6 @@ public function __construct(array $config = [])
         'thumbnail' => '@webroot/transcoder/',
         'gif' => '@webroot/transcoder/',
     ];
-
     /**
      * The URL where the transcoded videos are stored; must have a trailing /
      * Yii2 aliases are supported here
@@ -97,14 +72,25 @@ public function __construct(array $config = [])
         'thumbnail' => '@web/transcoder/',
         'gif' => '@web/transcoder/',
     ];
-
     /**
      * Use a md5 hash for the filenames instead of parameterized naming
      *
      * @var bool
      */
     public $useHashedNames = false;
-
+    /**
+     * if a upload location has a subfolder defined, add this to the transcoder
+     * paths too
+     *
+     * @var bool
+     */
+    public $createSubfolders = true;
+    /**
+     * clear caches when somebody clears all caches from the CP?
+     *
+     * @var bool
+     */
+    public $clearCaches = false;
     /**
      * Preset video encoders
      *
@@ -137,7 +123,6 @@ public function __construct(array $config = [])
             'threads' => '0',
         ],
     ];
-
     /**
      * Preset audio encoders
      *
@@ -167,7 +152,6 @@ public function __construct(array $config = [])
             'threads' => '0',
         ],
     ];
-
     /**
      * Default options for encoded videos
      *
@@ -190,7 +174,6 @@ public function __construct(array $config = [])
         'aspectRatio' => 'letterbox',
         'letterboxColor' => '',
     ];
-
     /**
      * Default options for video thumbnails
      *
@@ -206,7 +189,6 @@ public function __construct(array $config = [])
         'aspectRatio' => 'letterbox',
         'letterboxColor' => '',
     ];
-
     /**
      * Default options for encoded videos
      *
@@ -218,7 +200,6 @@ public function __construct(array $config = [])
         'audioSampleRate' => '44100',
         'audioChannels' => '2',
     ];
-
     /**
      * Default options for encoded GIF
      *
@@ -232,6 +213,26 @@ public function __construct(array $config = [])
         'videoCodecOptions' => '',
     ];
 
+    /**
+     * @inheritdoc
+     */
+    public function __construct(array $config = [])
+    {
+        // Unset any deprecated properties
+        if (!empty($config)) {
+            // If the old properties are set, remap them to the default
+            if (isset($config['transcoderPath'])) {
+                $config['transcoderPaths']['default'] = $config['transcoderPath'];
+                unset($config['transcoderPath']);
+            }
+            if (isset($config['transcoderUrl'])) {
+                $config['$transcoderUrls']['default'] = $config['transcoderUrl'];
+                unset($config['transcoderUrl']);
+            }
+        }
+        parent::__construct($config);
+    }
+
     // Public Methods
     // =========================================================================
 
@@ -260,9 +261,9 @@ public function rules()
             ['transcoderPaths', ArrayValidator::class],
             ['transcoderPaths', 'required'],
             ['transcoderUrls', ArrayValidator::class],
-            ['transcoderUrls', 'required'],
             ['useHashedNames', 'boolean'],
-            ['useHashedNames', 'default', 'value' => false],
+            ['createSubfolders', 'boolean'],
+            ['clearCaches', 'boolean'],
             ['videoEncoders', 'required'],
             ['audioEncoders', 'required'],
             ['defaultVideoOptions', 'required'],