[WIP] Ptitloup/feature video p2p

pod/chapter/static/js/videojs-chapters.js

@@ -54,15 +54,28 @@
      * Initialize the plugin.
      */
     var Plugin = videojs.getPlugin("plugin");
+
+    /**
+     * Custom Video.js plugin for handling chapters in a video player.
+     *
+     * @class podVideoJsChapters
+     * @extends {Plugin}
+     * @param {Object} player - The Video.js player instance.
+     * @param {Object} options - Configuration options for the plugin.
+     */
     class podVideoJsChapters extends Plugin {
       constructor(player, options) {
         super(player, options);
-        var settings = videojs.mergeOptions(defaults, options),
+        var settings = videojs.obj.merge(defaults, options),
           chapters = {},
           currentChapter = document.createElement("li");
 
         /**
-         * Create the list of chapters
+         * Create the list of chapters.
+         *
+         * @memberof podVideoJsChapters
+         * @param {Array} data - Chapter data to be displayed.
+         * @returns {boolean} - Returns false if no chapter data is provided.
          */
         player.createChapters = function (data) {
           if (!data) {
@@ -95,20 +108,14 @@
               false,
             );
           }
-          /* What is the purpose of this code ??
-          var oldList = document.getElementById("chapters");
-          var newList = document.getElementsByClassName(
-            "chapters-list inactive"
-          );
-          oldList.parentNode.removeChild(oldList);
-
-          let podPlayer = document.getElementById(player.id());
-          podPlayer.append(newList);
-          **/
         };
 
         /**
-         * Return a list of chapters useable by other functions
+         * Return a list of chapters usable by other functions.
+         *
+         * @memberof podVideoJsChapters
+         * @param {Array} data - Chapter data to be grouped.
+         * @returns {Object} - Object containing arrays of chapter information.
          */
         function groupedChapters(data) {
           var chapters = {
@@ -124,10 +131,23 @@
           return chapters;
         }
 
+        /**
+         * Get the grouped chapters.
+         *
+         * @memberof podVideoJsChapters
+         * @returns {Object} - Object containing arrays of chapter information.
+         */
         player.getGroupedChapters = function () {
           return this.chapters;
         };
 
+        /**
+         * Update the current chapter based on the current time.
+         *
+         * @memberof podVideoJsChapters
+         * @param {number} time - Current time in seconds.
+         * @param {Object} chapters - Object containing arrays of chapter information.
+         */
         player.getCurrentChapter = function (time, chapters) {
           const currentTime = Math.floor(time);
 
@@ -145,6 +165,11 @@
           }
         };
 
+        /**
+         * Main function for initializing the plugin.
+         *
+         * @memberof podVideoJsChapters
+         */
         player.main = function () {
           var data = document.querySelectorAll("#chapters li");
           if (

pod/chapter/templates/video_chapter.html

@@ -5,7 +5,6 @@
 {% block page_title %}{% trans 'Chapter video' %} "{{video.title}}" {% endblock page_title %}
 {% block page_extra_head %}
   {% include 'videos/video-header.html' %}
-  <script src="{% static 'js/chapters.js' %}?ver={{VERSION}}"></script>
   <script>
     const video_duration = {{ video.duration }};
   </script>

pod/enrichment/static/js/videojs-slides.js

@@ -476,7 +476,7 @@ const onPlayerReady = function (player, options) {
  */
 const slides = function (options) {
   this.ready(function () {
-    onPlayerReady(this, videojs.mergeOptions(slides_defaults, options));
+    onPlayerReady(this, videojs.obj.merge(slides_defaults, options));
   });
 };
 

pod/live/models.py

@@ -556,8 +556,13 @@ def is_past(self):
         else:
             return False
 
-    def is_coming(self):
-        """Test if event will happen in future."""
+    def is_coming(self) -> bool:
+        """
+        Chack if event will happen in future.
+
+        Returns:
+            bool: `True` if the event is scheduled to happen in the future, otherwise `False`.
+        """
         if self.start_date:
             return timezone.localtime(timezone.now()) < self.start_date
         else:

pod/live/static/js/viewcounter.js

@@ -132,7 +132,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
     // Initialize the plugin
     videoJsViewerCount = function (options) {
-      const settings = videojs.mergeOptions(defaults, options),
+      const settings = videojs.obj.merge(defaults, options),
         player = this;
       player.ready(function () {
         if (settings.ui) {

pod/live/templates/live/direct.html

@@ -188,7 +188,7 @@ <h2 class="card-title pod-card__title h4">
   }
 
   // Management of the end of the stream (for Firefox, Chrome... not working for Edge, Safari)
-  videojs.Hls.xhr.beforeRequest = function(options) {
+  videojs.Hls.xhr.onRequest = function(options) {
     // Reset counter if video state is ok
     if (started && player.readyState() > 2) { nbLoop = 0; }
     if (started && player.readyState() <= 2) {

pod/live/templates/live/event-iframe.html

@@ -140,7 +140,6 @@ <h2 class="video-title">{{ event.title }}</h2>
 
         {# affichage du bouton d'info sur le player #}
         {% if event.is_coming and event.video_on_hold.is_video or event.is_current  %}
-
             <script>
                 {% if event.is_coming and event.video_on_hold.is_video %}
                     iframeplayer = videojs("podvideoonholdplayer");