Merge

.gitignore

@@ -2,3 +2,4 @@
 *.swp
 \#*\#
 .php-cs-fixer.cache
+node_modules

.php-cs-fixer.dist.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
     ->exclude('var')

CHANGELOG.md

@@ -1,71 +1,14 @@
 # CHANGELOG
 
-To get the diff for a specific change, go to https://github.com/teltek/PuMuKIT2-paella-player-bundle/commit/XXX where XXX is the change hash
-To get the diff between two versions, go to https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/2.0.0...2.1.0-rc1
+To get the diff for a specific change, go to https://github.com/teltek/PumukitPaellaPlayerBundle/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/teltek/PumukitPaellaPlayerBundle/compare/2.3.x...3.0.x
 
+## [3.0.0](https://github.com/teltek/PumukitPaellaPlayerBundle/tree/3.0.x) - (Coming soon)
 
-## [1.5.0][1.5.0] (2019-02-08)
-- Raw mode for HTML5 base player enabled
-- Created a new UX with audio controls improvements
-- Segments now can be obtained from Pumukit's DB 
-- Bugfixing and performance improvements
+#### Added
+- Update Paella Player version to Paella 7 [More info](https://paellaplayer.upv.es/#/doc/paella_player_7_presentation.md)
 
-## [1.4.0][1.4.0] (2018-10-10)
-- Update paella to paella 5.3
-- xAPI support
-- Enabled MMO property to force custom paella layout 
-- Custom layouts for PR recordings added
-- Added OCR plugin for Opencast videos 
-- Added Footprints plugin for Opencast videos 
-- Custom css URL added 
-- Configuration for accessControlClass added 
-- Bugfixing and performance improvements 
+Other changelog versions
 
-## [1.2.4][1.2.4] (2017-10-19)
-- Update paella to paella 5.2.4
-- Add OCR plugin for Opencast videos
-- Add Footprints plugin for Opencast videos
-
-## [1.2.3][1.2.3] (2017-02-30)
-- Update paella to paella 5.2.1
-
-## [1.2.2][1.2.2] (2017-06-30)
-- Update paella to paella 5.1.12
-- Add a custom css url
-- Force a paella layout from a object property
-
-## [1.2.1][1.2.1] (2017-06-15)
-- Update paella to paella 5.1.6
-- Bug fixed
-
-## [1.2.0][1.2.0] (2017-02-09)
-- Update paella to paella 5.1-rc1
-- Use PumukitCoreBundle filters.
-- Add support for playlist.
-
-## [1.0.4][1.0.4] (2016-05-28)
-- Bug fixed with DFXP captions
-
-## [1.0.3][1.0.3] (2016-05-18)
-- Bug fixed with track resolution
-
-## [1.0.2][1.0.2] (2016-04-28)
-- Bug fixed with magic URLs and Opencast player
-
-## [1.0.1][1.0.1] (2016-03-09)
-- Bugs fixed with select a track
-
-## 1.0.0 (2016-03-03)
-- Initial version
-
-[1.5.0]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.4.0...1.5.0
-[1.4.0]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.2.0...1.4.0
-[1.2.4]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.2.3...1.2.4
-[1.2.3]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.2.2...1.2.3
-[1.2.2]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.2.1...1.2.2
-[1.2.1]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.2.0...1.2.1
-[1.2.0]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.0.4...1.2.0
-[1.0.4]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.0.3...1.0.4
-[1.0.3]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.0.2...1.0.3
-[1.0.2]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.0.1...1.0.2
-[1.0.1]:https://github.com/teltek/PuMuKIT2-paella-player-bundle/compare/1.0.0...1.0.1
+## Other changelog versions
+Show old changelog version on [Paella Player 5](https://github.com/teltek/PumukitPaellaPlayerBundle/blob/2.3.x/CHANGELOG.md)

Controller/BaseLivePlayerController.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pumukit\PaellaPlayerBundle\Controller;
+
+use Pumukit\SchemaBundle\Document\Live;
+use Pumukit\SchemaBundle\Document\MultimediaObject;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
+
+class BaseLivePlayerController extends AbstractController
+{
+    /**
+     * @Route("/livevideoplayer/{id}", name="pumukit_livevideoplayer_index")
+     *
+     * @Template("@PumukitPaellaPlayer/PaellaPlayer/player.html.twig")
+     */
+    public function indexAction(Request $request, MultimediaObject $multimediaObject)
+    {
+        return [
+            'multimediaObject' => $multimediaObject,
+            'object' => $multimediaObject,
+            'event' => $multimediaObject->getEmbeddedEvent(),
+        ];
+    }
+
+    /**
+     * @Route("/live/channel/videoplayer/{id}", name="pumukit_live_channel_videoplayer")
+     *
+     * @Template("@PumukitPaellaPlayer/PaellaPlayer/player.html.twig")
+     */
+    public function fromLiveAction(Request $request, Live $live)
+    {
+        return [
+            'live' => $live,
+            'object' => $live,
+        ];
+    }
+}

Controller/BasePlayerController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Pumukit\PaellaPlayerBundle\Controller;
 
 use Pumukit\BasePlayerBundle\Controller\BasePlayerController as BasePlayerAbstractController;
@@ -48,6 +50,7 @@ public function __construct(
     /**
      * @Route("/videoplayer/{id}", name="pumukit_videoplayer_index")
      * @Route("/videoplayer/opencast/{id}", name="pumukit_videoplayer_opencast")
+     *
      * @Template("@PumukitPaellaPlayer/PaellaPlayer/player.html.twig")
      */
     public function indexAction(Request $request, MultimediaObject $multimediaObject)
@@ -57,12 +60,21 @@ public function indexAction(Request $request, MultimediaObject $multimediaObject
 
     /**
      * @Route("/videoplayer/magic/{secret}", name="pumukit_videoplayer_magicindex")
+     *
      * @Template("@PumukitPaellaPlayer/PaellaPlayer/player.html.twig")
      */
     public function magicAction(Request $request, MultimediaObject $multimediaObject)
     {
         if (!$request->query->has('secret')) {
-            return $this->redirect($this->generateUrl('pumukit_videoplayer_magicindex', ['id' => $multimediaObject->getId(), 'secret' => $multimediaObject->getSecret()]).'&secret='.$multimediaObject->getSecret());
+            return $this->redirect(
+                $this->generateUrl(
+                    'pumukit_videoplayer_magicindex',
+                    [
+                        'id' => $multimediaObject->getId(),
+                        'secret' => $multimediaObject->getSecret(),
+                    ]
+                ).'&secret='.$multimediaObject->getSecret()
+            );
         }
 
         return $this->doRender($request, $multimediaObject);
@@ -79,10 +91,6 @@ private function doRender(Request $request, MultimediaObject $multimediaObject)
             return $track;
         }
 
-        if ($request->query->has('raw')) {
-            return $this->generateBasePlayerRaw($request, $multimediaObject, $track);
-        }
-
         $tracks = $this->getMultimediaObjectMultiStreamTracks($multimediaObject, $track);
 
         return $this->getParametersForPlayer($request, $multimediaObject, $tracks);

Controller/BasePlaylistController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Pumukit\PaellaPlayerBundle\Controller;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
@@ -50,6 +52,7 @@ public function indexAction(Request $request, Series $series)
 
     /**
      * @Route("/playlist", name="pumukit_playlistplayer_paellaindex", defaults={"no_channels": true} )
+     *
      * @Template("@PumukitPaellaPlayer/PaellaPlayer/player.html.twig")
      */
     public function paellaIndexAction(Request $request)
@@ -62,7 +65,7 @@ public function paellaIndexAction(Request $request)
         }
 
         if (!$mmobjId) {
-            //If the player has no mmobjId, we should provide it ourselves.
+            // If the player has no mmobjId, we should provide it ourselves.
             return $this->redirectWithMmobj($series, $request);
         }
 

Controller/ConfController.php

@@ -1,14 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Pumukit\PaellaPlayerBundle\Controller;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
 use MongoDB\BSON\ObjectId;
+use Pumukit\SchemaBundle\Document\Live;
 use Pumukit\SchemaBundle\Document\MultimediaObject;
+use Pumukit\SchemaBundle\Services\CaptionService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 
 class ConfController extends AbstractController
@@ -22,15 +25,18 @@ class ConfController extends AbstractController
     private $paellaXAPIAuth;
     private $paellaAccessControlClass;
     private $paellaFootPrints;
+    private $captionService;
 
     public function __construct(
         DocumentManager $documentManager,
+        CaptionService $captionService,
         $paellaXAPIEndpoint,
         $paellaXAPIAuth,
         $paellaAccessControlClass,
         $paellaFootPrints
     ) {
         $this->documentManager = $documentManager;
+        $this->captionService = $captionService;
         $this->paellaXAPIEndpoint = $paellaXAPIEndpoint;
         $this->paellaXAPIAuth = $paellaXAPIAuth;
         $this->paellaAccessControlClass = $paellaAccessControlClass;
@@ -40,34 +46,57 @@ public function __construct(
     /**
      * @Route("/paella/config.json", name="paella_player_config")
      */
-    public function confAction(Request $request)
+    public function confAction(Request $request): Response
     {
-        $id = $request->get('id');
-        if (!$id || !preg_match('/^[0-9a-z]{24}$/', $id)) {
-            throw new NotFoundHttpException('Multimedia Object not found with id '.$id);
+        $multimediaObject = $this->getMultimediaObject($request->query->get('configID'));
+        $jsonData = '';
+
+        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),
+                ]
+            );
+
+            return new Response($jsonData, 200, ['Content-Type' => 'application/json']);
         }
 
-        $folders_profiles = $this->getPaellaProfileFolder($request);
+        $live = $this->documentManager->getRepository(Live::class)->findOneBy([
+            '_id' => new ObjectId($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,
-                'folders_profiles' => $folders_profiles,
-            ]
-        );
+        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']);
     }
 
     private function getPaellaProfileFolder(Request $request): string
     {
-        $multimediaObject = $this->documentManager->getRepository(MultimediaObject::class)->findOneBy(
-            ['_id' => new ObjectId($request->get('id'))]
-        );
+        $multimediaObject = $this->getMultimediaObject($request->get('id'));
 
         if (strpos($request->headers->get('referer'), 'advanced')) {
             return self::PAELLA_ADVANCE_CONFIG_FOLDER;
@@ -79,4 +108,13 @@ private function getPaellaProfileFolder(Request $request): string
 
         return self::PAELLA_DEFAULT_CONFIG_FOLDER;
     }
+
+    private function getMultimediaObject(string $objectId)
+    {
+        try {
+            return $this->documentManager->getRepository(MultimediaObject::class)->findOneBy(['_id' => new ObjectId($objectId)]);
+        } catch (\Exception $exception) {
+            return $this->documentManager->getRepository(MultimediaObject::class)->findOneBy(['secret' => $objectId]);
+        }
+    }
 }