[DONE] Fix dressing and cutting and add unit tests 3.5.2

pod/completion/models.py

@@ -137,11 +137,13 @@ def verify_not_same_contributor(self):
     def __str__(self):
         return "Video:{0} - Name:{1} - Role:{2}".format(self.video, self.name, self.role)
 
-    def get_base_mail(self):
+    def get_base_mail(self) -> str:
+        """Encode an email as base64 to prevent robots crawling."""
         data = base64.b64encode(self.email_address.encode())
-        return data
+        return data.decode("utf-8")
 
-    def get_noscript_mail(self):
+    def get_noscript_mail(self) -> str:
+        """Replace @ by __AT__ in email adress to prevent robots crawling."""
         return self.email_address.replace("@", "__AT__")
 
 

pod/cut/context_processors.py

@@ -0,0 +1,10 @@
+from django.conf import settings as django_settings
+
+USE_CUT = getattr(django_settings, "USE_CUT", True)
+
+
+def context_settings(request):
+    """Return all context settings for cut app"""
+    new_settings = {}
+    new_settings["USE_CUT"] = USE_CUT
+    return new_settings

pod/cut/forms.py

@@ -14,6 +14,16 @@ class Meta:
         model = CutVideo
         fields = ["video", "start", "end", "duration"]
         widgets = {
-            "start": forms.TimeInput(attrs={"type": "time", "step": "1"}),
-            "end": forms.TimeInput(attrs={"type": "time", "step": "1"}),
+            "start": forms.TimeInput(attrs={
+                "step": "1",
+                "required": "required",
+                "size": "8",
+                "class": "text-center",
+            }),
+            "end": forms.TimeInput(attrs={
+                "step": "1",
+                "required": "required",
+                "size": "8",
+                "class": "text-center",
+            }),
         }

pod/cut/models.py

@@ -30,9 +30,12 @@ def verify_time(self):
                 return False
 
         # Convert start and end to seconds
-        start = time_to_seconds(self.start)
-        end = time_to_seconds(self.end)
-        duration = time_to_seconds(self.duration)
+        try:
+            start = time_to_seconds(self.start)
+            end = time_to_seconds(self.end)
+            duration = time_to_seconds(self.duration)
+        except ValueError:
+            return False
         if start < 0 or start >= end or end is None or start is None or end > duration:
             return False
         else:

pod/cut/templates/video_cut.html

@@ -41,7 +41,7 @@
 
 <div id="wrapper_cut">
   <div id="values_cut" class="bg-primary text-white">
-    <form action="{% url 'video:cut:video_cut' slug=video.slug %}" method="POST" id="time_for_cut" accept-charset="utf-8" enctype="multipart/form-data">
+    <form action="{% url 'cut:video_cut' slug=video.slug %}" method="POST" id="time_for_cut" accept-charset="utf-8" enctype="multipart/form-data">
       {% csrf_token %}
 
       <button id="button_start" class="btn btn-link" title="{% trans 'Get the start time from the video player' %}">

pod/cut/tests/test_views.py

@@ -41,7 +41,7 @@ def setUp(self):
 
     def test_video_cut_owner(self):
         video = Video.objects.get(id=1)
-        url = reverse("video:cut:video_cut", kwargs={"slug": video.slug})
+        url = reverse("cut:video_cut", kwargs={"slug": video.slug})
 
         self.user = User.objects.get(username="test")
         self.client.force_login(self.user)

pod/dressing/context_processors.py

@@ -0,0 +1,12 @@
+"""Esup-Pod dressing context processor."""
+
+from django.conf import settings as django_settings
+
+USE_DRESSING = getattr(django_settings, "USE_DRESSING", True)
+
+
+def context_settings(request):
+    """Return all context settings for dressing app."""
+    new_settings = {}
+    new_settings["USE_DRESSING"] = USE_DRESSING
+    return new_settings

pod/dressing/models.py

@@ -123,10 +123,18 @@ def to_json(self):
             "users": list(self.users.values_list("id", flat=True)),
             "allow_to_groups": list(self.allow_to_groups.values_list("id", flat=True)),
             "watermark": self.watermark.file.url if self.watermark else None,
+            "watermark_path": self.watermark.file.path if self.watermark else "",
             "position": self.get_position_display(),
+            "position_orig": self.position,
             "opacity": self.opacity,
             "opening_credits": (
                 self.opening_credits.slug if self.opening_credits else None
             ),
+            "opening_credits_video": (
+                self.opening_credits.video.name if self.opening_credits else ""
+            ),
             "ending_credits": self.ending_credits.slug if self.ending_credits else None,
+            "ending_credits_video": (
+                self.ending_credits.video.name if self.ending_credits else ""
+            ),
         }

pod/dressing/templates/video_dressing.html

@@ -11,15 +11,15 @@
 {% endblock page_extra_head %}
 
 {% block breadcrumbs %}
-  {{block.super}}
+  {{ block.super }}
 
   <li class="breadcrumb-item">
     <a href="{% url 'video:dashboard' %}">{% trans 'Dashboard' %}</a>
   </li>
 
   <li class="breadcrumb-item">
     <a href="{% url 'video:video' slug=video.slug %}">
-      {{video.title|title|truncatechars:45}}
+      {{ video.title|title|truncatechars:45 }}
     </a>
   </li>
 
@@ -130,7 +130,7 @@
     <div class="card" id="card-managevideo">
       <h2 class="card-header card-title pod-card__title h4"><i class="bi bi-gear" aria-hidden="true"></i>&nbsp;{% trans "Manage video" %}</h2>
       <div class="card-body card-text text-center">
-        {% include "videos/link_video.html" %}
+        {% include "videos/link_video.html" with hide_favorite_link=True %}
       </div>
     </div>
   {% endif %}

pod/dressing/tests/test_models.py

@@ -100,10 +100,18 @@ def test_dressing_to_json(self):
             "owners": [owner.id],
             "users": [owner.id],
             "watermark": dressing.watermark.file.url,
+            "watermark_path": dressing.watermark.file.path,
             "position": dressing.get_position_display(),
+            "position_orig": dressing.position,
             "opacity": 50,
             "opening_credits": video.slug,
+            "opening_credits_video": (
+                dressing.opening_credits.video.name
+            ),
             "ending_credits": video2.slug,
+            "ending_credits_video": (
+                dressing.ending_credits.video.name
+            ),
         }
         self.assertEqual(dressing_json, expected_json)
         print(" ---> test_dressing_to_json: OK! --- DressingModelTest")

pod/dressing/views.py

@@ -25,6 +25,11 @@ def video_dressing(request, slug):
         return redirect(reverse("maintenance"))
 
     video = get_object_or_404(Video, slug=slug, sites=get_current_site(request))
+    if not video.encoded and video.encoding_in_progress is True:
+        messages.add_message(request, messages.ERROR, _(
+            "The video is currently being encoded."))
+        raise PermissionDenied
+
     dressings = get_dressings(request.user, request.user.owner.accessgroup_set.all())
 
     if not (

pod/main/configuration.json

@@ -852,6 +852,68 @@
                         "fr": "Configuration application completion"
                     }
                 },
+                "cut": {
+                    "description": {
+                        "en": [
+                            "Cut application to cut videos.",
+                            "Set `USE_CUT` to True to activate this application."
+                        ],
+                        "fr": [
+                            "Application Cut permettant de découper des vidéos.",
+                            "Mettre `USE_CUT` à True pour activer cette application."
+                        ]
+                    },
+                    "settings": {
+                        "USE_CUT": {
+                            "default_value": true,
+                            "description": {
+                                "en": [
+                                    "Activation of the cut application"
+                                ],
+                                "fr": [
+                                    "Activation de l'application cut"
+                                ]
+                            },
+                            "pod_version_end": "",
+                            "pod_version_init": "3.5.2"
+                        }
+                    },
+                    "title": {
+                        "en": "Cut application configuration",
+                        "fr": "Configuration de l'application cut"
+                    }
+                },
+                "dressing": {
+                    "description": {
+                        "en": [
+                            "Dressing App to customize a video with watermark & credits.",
+                            "Set `USE_DRESSING` to True to activate this application."
+                        ],
+                        "fr": [
+                            "Application Dressing pour customiser une vidéo avec un filigrane et des crédits.",
+                            "Mettre `USE_DRESSING` à True pour activer cette application."
+                        ]
+                    },
+                    "settings": {
+                        "USE_DRESSING": {
+                            "default_value": true,
+                            "description": {
+                                "en": [
+                                    "Activation of dressings. Allows users to customize a video with watermark & credits."
+                                ],
+                                "fr": [
+                                    "Activation des habillages. Permet aux utilisateurs de customiser une vidéo avec un filigrane et des crédits."
+                                ]
+                            },
+                            "pod_version_end": "",
+                            "pod_version_init": "3.5.0"
+                        }
+                    },
+                    "title": {
+                        "en": "Dressing application configuration",
+                        "fr": "Configuration de l'application dressing"
+                    }
+                },
                 "enrichment": {
                     "description": {},
                     "settings": {},

pod/main/static/js/main.js

@@ -1151,10 +1151,7 @@ var restrict_access_to_groups = function () {
     let id_restricted_to_groups = document.getElementById(
       "id_restrict_access_to_groups",
     );
-    let div_restricted = id_restricted_to_groups.closest(
-      "div.restricted_access",
-    );
-    div_restricted.style.display = "block";
+    id_restricted_to_groups.parentElement.classList.remove("d-none");
   } else {
     document
       .querySelectorAll("#id_restrict_access_to_groups select")
@@ -1168,11 +1165,7 @@ var restrict_access_to_groups = function () {
     let id_restricted_to_groups = document.getElementById(
       "id_restrict_access_to_groups",
     );
-    let div_restricted = id_restricted_to_groups.closest(
-      "div.restricted_access",
-    );
-
-    div_restricted.style.display = "none";
+    id_restricted_to_groups.parentElement.classList.add("d-none");
   }
 };
 

pod/main/templates/navbar.html

@@ -268,8 +268,10 @@ <h5 id="pod-navbar__menuuserLabel">{% if user.get_full_name != '' %}{{ user.get_
               {% if request.user.owners_channels.all %}
                 <a class="nav-item nav-link" href="{% url 'channels:my_channels' %}"><i class="bi bi-play-btn pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My channels' %}</a>
               {% endif %}
-              {% if request.user.is_superuser or perms.dressing.video_dressing or request.user.is_staff %}
-                <a class="nav-item nav-link" href="{% url 'dressing:my_dressings' %}"><i class="bi bi-palette pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My dressings' %}</a>
+              {% if USE_DRESSING %}
+                {% if request.user.is_superuser or perms.dressing.video_dressing or request.user.is_staff %}
+                  <a class="nav-item nav-link" href="{% url 'dressing:my_dressings' %}"><i class="bi bi-palette pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My dressings' %}</a>
+                {% endif %}
               {% endif %}
               {% if request.user.is_staff and USE_PODFILE %}
                 <a class="nav-item nav-link" href="{% url 'podfile:home' %}"><i class="bi bi-folder pod-nav-link-icon mx-1" aria-hidden="true"></i>{% trans 'My files' %}</a>

pod/podfile/static/podfile/js/filewidget.js

@@ -766,7 +766,10 @@ if (typeof loaded == "undefined") {
             string_html,
             "text/html"
           ).body.firstChild;
-          document.getElementById("list_folders_sub").appendChild(parsedHTML);
+          const listFoldersSub = document.getElementById("list_folders_sub");
+          if (listFoldersSub) {
+            listFoldersSub.appendChild(parsedHTML);
+          }
         });
         if (nextPage != -1) {
           search = data.search !== "" ? data.search : null;

pod/settings.py

@@ -124,7 +124,9 @@
                 "pod.authentication.context_processors.context_authentication_settings",
                 "pod.recorder.context_processors.context_recorder_settings",
                 "pod.playlist.context_processors.context_settings",
+                "pod.dressing.context_processors.context_settings",
                 "pod.import_video.context_processors.context_settings",
+                "pod.cut.context_processors.context_settings",
             ],
         },
     },

pod/urls.py

@@ -28,6 +28,15 @@
 USE_SHIB = getattr(settings, "USE_SHIB", False)
 USE_OIDC = getattr(settings, "USE_OIDC", False)
 USE_NOTIFICATIONS = getattr(settings, "USE_NOTIFICATIONS", True)
+USE_CUT = getattr(settings, "USE_CUT", True)
+USE_MEETING = getattr(settings, "USE_MEETING", False)
+USE_XAPI = getattr(settings, "USE_XAPI", False)
+USE_BBB = getattr(settings, "USE_BBB", False)
+USE_OPENCAST_STUDIO = getattr(settings, "USE_OPENCAST_STUDIO", False)
+USE_PODFILE = getattr(settings, "USE_PODFILE", False)
+USE_PLAYLIST = getattr(settings, "USE_PLAYLIST", True)
+USE_DRESSING = getattr(settings, "USE_DRESSING", True)
+USE_IMPORT_VIDEO = getattr(settings, "USE_IMPORT_VIDEO", True)
 
 if USE_CAS:
     from cas import views as cas_views
@@ -80,12 +89,8 @@
     url(r"^download/$", download_file, name="download_file"),
     # custom
     url(r"^custom/", include("pod.custom.urls")),
-    # cut
-    url(r"^cut/", include("pod.cut.urls")),
     # pwa
     url("", include("pwa.urls")),
-    # dressing
-    path("dressing/", include("pod.dressing.urls", namespace="dressing")),
 ]
 
 # WEBPUSH
@@ -117,25 +122,30 @@
 ]
 
 # BBB: TODO REPLACE BBB BY MEETING
-if getattr(settings, "USE_MEETING", False):
+if USE_MEETING:
     urlpatterns += [
         url(r"^meeting/", include("pod.meeting.urls")),
     ]
-if getattr(settings, "USE_XAPI", False):
+
+if USE_XAPI:
     urlpatterns += [
         url(r"^xapi/", include("pod.xapi.urls")),
     ]
-if getattr(settings, "USE_BBB", False):
+
+# BBB
+if USE_BBB:
     urlpatterns += [
         url(r"^bbb/", include("pod.bbb.urls")),
     ]
 
-if getattr(settings, "USE_OPENCAST_STUDIO", False):
+# RECORDER
+if USE_OPENCAST_STUDIO:
     urlpatterns += [
         url(r"^studio/", include("pod.recorder.studio_urls")),
     ]
 
-if getattr(settings, "USE_PODFILE", False):
+# PODFILE
+if USE_PODFILE:
     urlpatterns += [
         url(r"^podfile/", include("pod.podfile.urls")),
     ]
@@ -145,14 +155,26 @@
         url(r"^" + apps + "/", include("pod.%s.urls" % apps, namespace=apps)),
     ]
 
+# CUT
+if USE_CUT:
+    urlpatterns += [
+        path("cut/", include("pod.cut.urls", namespace="cut")),
+    ]
+
 # PLAYLIST
-if getattr(settings, "USE_PLAYLIST", True):
+if USE_PLAYLIST:
     urlpatterns += [
         path("playlist/", include("pod.playlist.urls", namespace="playlist")),
     ]
 
+# DRESSING
+if USE_DRESSING:
+    urlpatterns += [
+        path("dressing/", include("pod.dressing.urls", namespace="dressing")),
+    ]
+
 # IMPORT_VIDEO
-if getattr(settings, "USE_IMPORT_VIDEO", True):
+if USE_IMPORT_VIDEO:
     urlpatterns += [
         url(
             r"^import_video/", include("pod.import_video.urls", namespace="import_video")