TTK-26797: Show the player of the live channels (#141)

* TTK-26797: Show the player of the live channels * TTK-26797: Fix confcontroller file
teltek · Jan 22, 2024 · 6050758 · 6050758
1 parent 91e7dd7
commit 6050758
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 18 deletions.
diff --git a/Controller/ConfController.php b/Controller/ConfController.php
@@ -49,20 +49,43 @@ public function confAction(Request $request): Response
     {
         $multimediaObject = $this->getMultimediaObject($request->query->get('configID'));
 
-        $jsonData = $this->renderView(
-            '@PumukitPaellaPlayer/Conf/conf.json.twig',
-            [
-                'xapi_endpoint' => $this->paellaXAPIEndpoint,
-                'xapi_auth' => $this->paellaXAPIAuth,
-                'access_control_class' => $this->paellaAccessControlClass,
-                'footprints' => $this->paellaFootPrints,
-                'isMonostream' => !$multimediaObject->isMultistream(),
-                'isMultistream' => $multimediaObject->isMultistream(),
-                'isLive' => $multimediaObject->isLive(),
-                'notLive' => !$multimediaObject->isLive(),
-                'hasCaptions' => $this->captionService->hasCaptions($multimediaObject),
-            ]
-        );
+        if ($multimediaObject instanceof MultimediaObject) {
+            $jsonData = $this->renderView(
+                '@PumukitPaellaPlayer/Conf/conf.json.twig',
+                [
+                    'xapi_endpoint' => $this->paellaXAPIEndpoint,
+                    'xapi_auth' => $this->paellaXAPIAuth,
+                    'access_control_class' => $this->paellaAccessControlClass,
+                    'footprints' => $this->paellaFootPrints,
+                    'isMonostream' => !$multimediaObject->isMultistream(),
+                    'isMultistream' => $multimediaObject->isMultistream(),
+                    'isLive' => $multimediaObject->isLive(),
+                    'notLive' => !$multimediaObject->isLive(),
+                    'hasCaptions' => $this->captionService->hasCaptions($multimediaObject),
+                ]
+            );
+        }
+
+        $live = $this->documentManager->getRepository(Live::class)->findOneBy([
+            '_id' => new ObjectId($request->query->get('configID')),
+        ]);
+
+        if ($live instanceof Live) {
+            $jsonData = $this->renderView(
+                '@PumukitPaellaPlayer/Conf/conf.json.twig',
+                [
+                    'xapi_endpoint' => $this->paellaXAPIEndpoint,
+                    'xapi_auth' => $this->paellaXAPIAuth,
+                    'access_control_class' => $this->paellaAccessControlClass,
+                    'footprints' => $this->paellaFootPrints,
+                    'isMonostream' => true,
+                    'isMultistream' => false,
+                    'isLive' => true,
+                    'notLive' => false,
+                    'hasCaptions' => false,
+                ]
+            );
+        }
 
         return new Response($jsonData, 200, ['Content-Type' => 'application/json']);
     }
@@ -82,7 +105,7 @@ private function getPaellaProfileFolder(Request $request): string
         return self::PAELLA_DEFAULT_CONFIG_FOLDER;
     }
 
-    private function getMultimediaObject(string $objectId): MultimediaObject
+    private function getMultimediaObject(string $objectId)
     {
         try {
             return $this->documentManager->getRepository(MultimediaObject::class)->findOneBy(['_id' => new ObjectId($objectId)]);

diff --git a/Controller/PaellaRepositoryController.php b/Controller/PaellaRepositoryController.php
@@ -91,7 +91,7 @@ public function playlistAction(Request $request, Series $series): Response
         return new Response($response);
     }
 
-    private function getMultimediaObject(string $objectId): MultimediaObject
+    private function getMultimediaObject(string $objectId)
     {
         try {
             return $this->documentManager->getRepository(MultimediaObject::class)->findOneBy(['_id' => new ObjectId($objectId)]);

diff --git a/Resources/config/pumukit_paella_player.yaml b/Resources/config/pumukit_paella_player.yaml
@@ -50,6 +50,8 @@ services:
 
   Pumukit\PaellaPlayerBundle\Services\ChannelManifest:
     class: Pumukit\PaellaPlayerBundle\Services\ChannelManifest
+    arguments:
+      $eventDefaultPic: "%pumukit_new_admin.advance_live_event_create_default_pic%"
 
   Pumukit\PaellaPlayerBundle\Services\PlaylistManifest:
     class: Pumukit\PaellaPlayerBundle\Services\PlaylistManifest

diff --git a/Services/ChannelManifest.php b/Services/ChannelManifest.php
@@ -11,13 +11,16 @@ class ChannelManifest
 {
     protected $liveService;
     protected $streamsManifest;
+    protected $eventDefaultPic;
 
     public function __construct(
         LiveService $liveService,
-        StreamsManifest $streamsManifest
+        StreamsManifest $streamsManifest,
+        string $eventDefaultPic
     ) {
         $this->liveService = $liveService;
         $this->streamsManifest = $streamsManifest;
+        $this->eventDefaultPic = $eventDefaultPic;
     }
 
     public function create(Live $live): array
@@ -36,7 +39,7 @@ private function addMandatoryManifestMetadata(Live $live)
         $data = [];
         $data['id'] = $live->getId();
         $data['title'] = $live->getName();
-        $data['preview'] = '';
+        $data['preview'] = $this->eventDefaultPic;
         $data['duration'] = 0;
 
         return $data;