Bugfix/video duration validation

lib/Controller/Widget.php

@@ -124,7 +124,7 @@
      *  @SWG\Parameter(
      *      name="type",
      *      in="path",
      *      description="The type of the Widget e.g. text. Media based Widgets like Image are added via POST /playlist/library/assign/{playlistId} call.",
      *      type="string",
      *      required=true
      *   ),
@@ -138,7 +138,7 @@
      *  @SWG\Parameter(
      *      name="displayOrder",
      *      in="formData",
      *      description="Optional integer to say which position this assignment should occupy in the list. If more than one media item is being added, this will be the position of the first one.",
      *      type="integer",
      *      required=false
      *   ),
@@ -398,7 +398,7 @@
 
         // Validate common parameters if we don't have a validator present.
         $widgetValidators = $module->getWidgetValidators();
-        if (count($widgetValidators) <= 0 && $widget->duration < 0) {
+        if (count($widgetValidators) <= 0 && $widget->duration <= 0) {
             throw new InvalidArgumentException(__('Duration needs to be a positive value'), 'duration');
         }
 
@@ -712,7 +712,7 @@
      *  @SWG\Parameter(
      *      name="transitionDirection",
      *      in="formData",
      *      description="The direction for this transition, only appropriate for transitions that move, such as fly. Available options: N, NE, E, SE, S, SW, W, NW",
      *      type="integer",
      *      required=false
      *   ),
@@ -815,7 +815,7 @@
         // Are we allowed to do this?
         if ($widget->type === 'subplaylist') {
             throw new InvalidArgumentException(
                 __('Audio cannot be attached to a Sub-Playlist Widget. Please attach it to the Widgets inside the Playlist'),
                 'type'
             );
         }
@@ -919,7 +919,7 @@
         // Are we allowed to do this?
         if ($widget->type === 'subplaylist') {
             throw new InvalidArgumentException(
                 __('Audio cannot be attached to a Sub-Playlist Widget. Please attach it to the Widgets inside the Playlist'),
                 'type'
             );
         }

lib/Widget/Validator/RemoteUrlsZeroDurationValidator.php

@@ -43,7 +43,7 @@ class RemoteUrlsZeroDurationValidator implements WidgetValidatorInterface
     public function validate(Module $module, Widget $widget, string $stage): void
     {
         $url = urldecode($widget->getOptionValue('uri', ''));
-        if ($widget->useDuration == 1
+        if ($widget->useDuration === 1
             && $widget->duration <= 0
             && !Str::startsWith($url, 'file://')
             && Str::contains($url, '://')
@@ -53,9 +53,12 @@ public function validate(Module $module, Widget $widget, string $stage): void
                 __('The duration needs to be greater than 0 for remote URLs'),
                 'duration'
             );
-        } else if ($widget->duration < 0) {
+        } else if ($widget->useDuration === 1 && $widget->duration <= 0) {
             // Locally stored file, still needs a positive duration.
-            throw new InvalidArgumentException(__('Duration needs to be 0 or above'), 'duration');
+            throw new InvalidArgumentException(
+                __('The duration needs to be above 0 for a locally stored file '),
+                'duration'
+            );
         }
     }
 }

lib/Widget/Validator/ZeroDurationValidator.php

@@ -41,9 +41,12 @@ class ZeroDurationValidator implements WidgetValidatorInterface
      */
     public function validate(Module $module, Widget $widget, string $stage): void
     {
-        // Videos can have 0 durations
-        if ($widget->duration <= 0) {
-            throw new InvalidArgumentException(__('Duration needs to be 0 or above'), 'duration');
+        // Videos can have 0 durations (but not if useDuration is selected)
+        if ($widget->useDuration === 1 && $widget->duration <= 0) {
+            throw new InvalidArgumentException(
+                sprintf(__('Duration needs to be above 0 for %s'), $module->name),
+                'duration'
+            );
         }
     }
-}
+}