Merge branch 'main' into issue-1374

Author: ferishili

bootstrap.php

@@ -3,7 +3,6 @@
 StudipAutoloader::addAutoloadPath(__DIR__ . '/lib', 'Opencast');
 
 // adding observer
-NotificationCenter::addObserver('Opencast\Models\Videos', 'addToCoursePlaylist', 'OpencastCourseSync');
 NotificationCenter::addObserver('Opencast\Models\Videos', 'parseEvent', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\Videos', 'checkEventACL', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\VideosUserPerms', 'setPermissions', 'OpencastVideoSync');

bootstrap_migrations.php

@@ -3,7 +3,6 @@
 StudipAutoloader::addAutoloadPath(__DIR__ . '/lib', 'Opencast');
 
 // adding observer
-NotificationCenter::addObserver('Opencast\Models\Videos', 'addToCoursePlaylist', 'OpencastCourseSync');
 NotificationCenter::addObserver('Opencast\Models\Videos', 'parseEvent', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\Videos', 'checkEventACL', 'OpencastVideoSync');
 NotificationCenter::addObserver('Opencast\Models\VideosUserPerms', 'setPermissions', 'OpencastVideoSync');

cronjobs/opencast_discover_videos.php

@@ -137,7 +137,10 @@ public function execute($last_result, $parameters = array())
                         $video = Videos::findOneBySql("episode = ?", [$current_event->identifier]);
                         $is_livestream = (bool) $video->is_livestream ?? false;
 
+                        // Set a flag to determine a new state of the video!
+                        $is_new = false;
                         if (!$video) {
+                            $is_new = true;
                             $video = new Videos;
                         }
 
@@ -155,6 +158,11 @@ public function execute($last_result, $parameters = array())
 
                         self::parseEvent($current_event, $video);
 
+                        // Make sure the new videos are only get processed by the add to course playlist.
+                        if ($is_new) {
+                            Videos::addToCoursePlaylist($current_event, $video);
+                        }
+
                         // remove video from checklist for playlist videos (if even present)
                         unset($playlist_videos[$current_event->identifier]);
                     }

lib/Models/Videos.php

@@ -1195,18 +1195,15 @@ public function reportVideo($description)
     }
 
 
-     /**
+    /**
      * Assigns a video to the seminar if the video belongs to the seminar' series
      *
-     * @Notification OpencastVideoSync
-     *
-     * @param string                $eventType
-     * @param object                $episode
-     * @param Opencast\Models\Video $video
+     * @param object $episode the opencast episode object
+     * @param Opencast\Models\Video $video the Stud.IP video record
      *
      * @return void
      */
-    public static function addToCoursePlaylist($eventType, $episode, $video)
+    public static function addToCoursePlaylist($episode, $video)
     {
         // check if a series is assigned to this event
         if (!isset($episode->is_part_of) || empty($episode)) {

lib/Routes/Playlist/PlaylistAddVideos.php

@@ -25,7 +25,7 @@ public function __invoke(Request $request, Response $response, $args)
 
         $data = $this->getRequestData($request);
         $video_tokens = $data['videos'];
-        $course_id    = $data['course_id'];
+        $course_id    = $data['course_id'] ?? null;
 
         $videos = array_map(function ($token) {
             return Videos::findOneByToken($token);
@@ -64,4 +64,4 @@ public function __invoke(Request $request, Response $response, $args)
 
         return $response->withStatus(204);
     }
-}
+}