diff --git a/pod/favorite/admin.py b/pod/favorite/admin.py deleted file mode 100644 index 3d9c11705d..0000000000 --- a/pod/favorite/admin.py +++ /dev/null @@ -1,19 +0,0 @@ -"""Esup-Pod Favorite video admin.""" -from django.contrib import admin -from .models import Favorite - - -@admin.register(Favorite) -class FavoriteAdmin(admin.ModelAdmin): - """Favorite video admin page.""" - - date_hierarchy = "date_added" - list_display = ( - "id", - "video", - "owner", - "date_added", - "rank", - ) - list_filter = ("owner", "date_added", "rank") - search_fields = ("video__title", "owner__username") diff --git a/pod/favorite/apps.py b/pod/favorite/apps.py deleted file mode 100644 index 14f97fa906..0000000000 --- a/pod/favorite/apps.py +++ /dev/null @@ -1,11 +0,0 @@ -"""Esup-Pod Favorite video app.""" -from django.apps import AppConfig -from django.utils.translation import gettext_lazy as _ - - -class FavoriteConfig(AppConfig): - """Favorite configuration app.""" - - name = "pod.favorite" - default_auto_field = "django.db.models.BigAutoField" - verbose_name = _("Favorite videos") diff --git a/pod/favorite/context_processors.py b/pod/favorite/context_processors.py deleted file mode 100644 index d7cc26d5c9..0000000000 --- a/pod/favorite/context_processors.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.conf import settings as django_settings - -USE_FAVORITES = getattr(django_settings, "USE_FAVORITES", True) - - -def context_settings(request): - """Return all context settings for favorite app""" - new_settings = {} - new_settings["USE_FAVORITES"] = USE_FAVORITES - return new_settings diff --git a/pod/favorite/models.py b/pod/favorite/models.py deleted file mode 100644 index 50f4045728..0000000000 --- a/pod/favorite/models.py +++ /dev/null @@ -1,42 +0,0 @@ -"""Esup-Pod favorite video model.""" -from django.contrib.auth.models import User -from django.db import models -from django.utils import timezone -from django.utils.translation import ugettext as _ - -from pod.video.models import Video - - -class Favorite(models.Model): - """Favorite video model.""" - - video = models.ForeignKey(Video, verbose_name=_("Video"), on_delete=models.CASCADE) - owner = models.ForeignKey(User, verbose_name=_("User"), on_delete=models.CASCADE) - date_added = models.DateTimeField( - verbose_name=_("Date added"), default=timezone.now, editable=False - ) - rank = models.IntegerField(verbose_name=_("Rank"), editable=False) - - class Meta: - """Metadata for favorite video Model.""" - - constraints = [ - # A video can only be favorited once per owner - models.UniqueConstraint( - fields=["video", "owner"], name="unique_favorite_video_owner" - ), - # There mustn't be duplicated ranks for one owner - models.UniqueConstraint( - fields=["owner", "rank"], name="unique_favorite_owner_rank" - ), - ] - # Default ordering for Favorites items (not for Favorite video list) - ordering = ["owner", "rank"] - # Latest by ascending rank. - get_latest_by = "rank" - verbose_name = _("Favorite video") - verbose_name_plural = _("Favorite videos") - - def __str__(self) -> str: - """Display a favorite object as string.""" - return f"{self.owner} - favorite {self.rank} - {self.video}" diff --git a/pod/favorite/static/css/favorites-list.css b/pod/favorite/static/css/favorites-list.css deleted file mode 100644 index df865ed661..0000000000 --- a/pod/favorite/static/css/favorites-list.css +++ /dev/null @@ -1,59 +0,0 @@ -.shake-effect { - animation: shake 2.3s ease-in-out; - animation-iteration-count: infinite; - cursor: grab; -} - -.shake-effect .badge{ - display: block; -} - - -.shake-effect-active { - cursor: grabbing; -} - -@keyframes shake { - 0% { transform: translate(1px, 1px) rotate(0deg); } - 10% { transform: translate(-1px, -2px) rotate(-1deg); } - 20% { transform: translate(-3px, 0px) rotate(1deg); } - 30% { transform: translate(3px, 2px) rotate(0deg); } - 40% { transform: translate(1px, -1px) rotate(1deg); } - 50% { transform: translate(-1px, 2px) rotate(-1deg); } - 60% { transform: translate(-3px, 1px) rotate(0deg); } - 70% { transform: translate(3px, 1px) rotate(-1deg); } - 80% { transform: translate(-1px, -1px) rotate(1deg); } - 90% { transform: translate(1px, 2px) rotate(0deg); } - 100% { transform: translate(1px, 2px) rotate(0deg); } -} - -.no-click { - pointer-events: none; -} - -#sortForm.no-click, #collapse-button.no-click { - opacity: 0; - transition: opacity .9s ease; -} - -.card-hidden { - display: none; -} - -.card-footer, -.draggable-container .badge { - transition: opacity 0.9s ease; -} - -.shake-effect .card-footer, -.draggable-container .badge { - opacity: 0; -} - -.shake-effect .badge { - opacity: 1; -} - -.dropzone-hover { - border: .2rem solid #1F7C85; -} diff --git a/pod/favorite/static/js/video-favorites-card-delete.js b/pod/favorite/static/js/video-favorites-card-delete.js deleted file mode 100644 index 245182cf96..0000000000 --- a/pod/favorite/static/js/video-favorites-card-delete.js +++ /dev/null @@ -1,29 +0,0 @@ -document.addEventListener("DOMContentLoaded", function () { - const cards = document.getElementsByClassName("draggable-container"); - const title = document.getElementById("video_count"); - for (let card of cards) { - const form = card.querySelector(".favorite-button-form-card"); - form.addEventListener("submit", function (e) { - e.preventDefault(); - const formData = new FormData(form); - fetch(form.action, { - method: form.method, - body: formData, - }) - .then((response) => response.text()) // We take the HTML content of the response - .then((data) => { - const parser = new DOMParser(); - const html = parser.parseFromString(data, "text/html"); - card.remove(); - const title = document.getElementById("video_count"); - title.replaceWith(html.getElementById("video_count")); - document.title = html.title; - addEventForReorganizedButton(); - }) - .catch((error) => { - if (!(error instanceof TypeError)) - alert(gettext("The video could not be removed from favorites...")); - }); - }); - } -}); diff --git a/pod/favorite/static/js/video-favorites-card-list.js b/pod/favorite/static/js/video-favorites-card-list.js deleted file mode 100644 index 805b676e1e..0000000000 --- a/pod/favorite/static/js/video-favorites-card-list.js +++ /dev/null @@ -1,27 +0,0 @@ -document.addEventListener("DOMContentLoaded", function () { - const forms = document.getElementsByClassName("favorite-button-form-card"); - for (let form of forms) { - form.addEventListener("submit", function (e) { - e.preventDefault(); - const formData = new FormData(form); - fetch(form.action, { - method: form.method, - body: formData, - }) - .then((response) => { - response.text(); // We take the HTML content of the response - const button = form.querySelector(".star_btn > i"); - button.classList.toggle("bi-star-fill"); - button.classList.toggle("bi-star"); - if (button.classList.contains("bi-star-fill")) { - button.title = gettext("Remove from favorite"); - } else { - button.title = gettext("Add in favorite"); - } - }) - .catch((error) => { - alert(gettext("The deletion couldn't be completed...")); - }); - }); - } -}); diff --git a/pod/favorite/static/js/video-favorites.js b/pod/favorite/static/js/video-favorites.js deleted file mode 100644 index c3049662ca..0000000000 --- a/pod/favorite/static/js/video-favorites.js +++ /dev/null @@ -1,25 +0,0 @@ -document.addEventListener("DOMContentLoaded", function () { - const form = document.getElementById("favorite-button-form"); - if (form !== null) { - form.addEventListener("submit", function (e) { - e.preventDefault(); - const formData = new FormData(form); - fetch(form.action, { - method: form.method, - body: formData, - }) - .then((response) => response.text()) // We take the HTML content of the response - .then((data) => { - const parser = new DOMParser(); - const html = parser.parseFromString(data, "text/html"); - const updatedButton = html.querySelector(".star_btn"); - const button = document.querySelector(".star_btn"); - button.replaceWith(updatedButton); - }) - .catch((error) => { - console.log(error); - alert(gettext("The favorite couldn’t be completed…")); - }); - }); - } -}); diff --git a/pod/favorite/templates/favorite/favorite_video_list.html b/pod/favorite/templates/favorite/favorite_video_list.html deleted file mode 100644 index b69c7c53af..0000000000 --- a/pod/favorite/templates/favorite/favorite_video_list.html +++ /dev/null @@ -1,32 +0,0 @@ -{% load i18n %} -{% load static %} -{% spaceless %} -
- {% for video in videos %} -
-
- {% include "videos/card.html" %} -
{{ video.rank }}
-
-
- {% empty %} -
-

{% trans "Sorry, no video found." %}

-
- {% endfor %} -
-{% if videos.has_next %} - -{% endif %} - -{% endspaceless %} -{% block more_script %} - -{% endblock %} diff --git a/pod/favorite/templates/favorite/favorite_videos.html b/pod/favorite/templates/favorite/favorite_videos.html deleted file mode 100644 index 494c0f2c1a..0000000000 --- a/pod/favorite/templates/favorite/favorite_videos.html +++ /dev/null @@ -1,80 +0,0 @@ -{% extends 'base.html' %} -{% load i18n %} -{% load static %} - -{% block opengraph %}{% load video_filters %} - - - - - - - - -{% endblock %} - -{% block page_extra_head %} - -{% endblock page_extra_head %} - -{% block breadcrumbs %}{{ block.super }}
  • {% trans "My favorite videos" %}
    • {% endblock %} - -{% block page_content %} -
    -

    {% blocktrans count counter=count_videos %}{{ counter }} video found{% plural %}{{ counter }} videos found{% endblocktrans %}

    - {% if count_videos > 1 %} -
    -
    - {% csrf_token %} - - - -  {% trans "Cancel" %} - -
    -
    -
    - {% include "videos/video_sort_select.html" with favorite=True %} -
    - {% endif %} -
    - {% include 'loader.html' %} - {% include "favorite/favorite_video_list.html" %} -{% endblock page_content %} - -{% block page_aside %} - {% include 'videos/filter_aside.html' %} -
    -

    {% trans "Help - Drag & Drop" %}

    -
    -
      -
    1. {% trans "Select the video to move by clicking and holding." %}
      2. -
    2. {% trans "While holding down the video, drag it to the desired location." %}
      3. -
    3. {% trans "Drop the video on another to swap their position." %}
      4. -
    -
    -
    -{% endblock page_aside %} - - -{% block more_script %} - - - - - - -{% endblock more_script %} diff --git a/pod/favorite/templatetags/favorite_info.py b/pod/favorite/templatetags/favorite_info.py deleted file mode 100644 index c9ac9e50d5..0000000000 --- a/pod/favorite/templatetags/favorite_info.py +++ /dev/null @@ -1,39 +0,0 @@ -from django.template import Library - -from pod.video.models import Video - -from ..utils import user_has_favorite_video, get_number_favorites - -register = Library() - - -@register.simple_tag(takes_context=True, name="is_favorite") -def is_favorite(context: dict, video: Video) -> bool: - """ - Template tag to check if the user has this video as favorite. - - Args: - context (dict): The template context dictionary - video (:class:`pod.video.models.Video`): The video entity to check - - Returns: - bool: True if the user has the video as favorite, False otherwise - """ - request = context["request"] - if not request.user.is_authenticated: - return False - return user_has_favorite_video(request.user, video) - - -@register.simple_tag(name="number_favorites") -def number_favorites(video: Video) -> int: - """ - Template tag to get the favorite number. - - Args: - video (:class:`pod.video.models.Video`): The video entity - - Returns: - int: The video favorite number - """ - return get_number_favorites(video) diff --git a/pod/favorite/tests/__init__.py b/pod/favorite/tests/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pod/favorite/tests/test_models.py b/pod/favorite/tests/test_models.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pod/favorite/tests/test_utils.py b/pod/favorite/tests/test_utils.py deleted file mode 100644 index 7bd446cc4e..0000000000 --- a/pod/favorite/tests/test_utils.py +++ /dev/null @@ -1,174 +0,0 @@ -"""Unit tests for Esup-Pod favorite video utilities.""" - -from django.contrib.auth.models import User -from django.http import HttpRequest -from django.test import TestCase - -from pod.favorite.models import Favorite -from pod.favorite.utils import get_next_rank, user_add_or_remove_favorite_video -from pod.favorite.utils import user_has_favorite_video, get_number_favorites -from pod.favorite.utils import get_all_favorite_videos_for_user -from pod.video.utils import sort_videos_list -from pod.video.models import Type, Video - - -class FavoriteTestUtils(TestCase): - """TestCase for Esup-Pod favorite video utilities.""" - - fixtures = ["initial_data.json"] - - def setUp(self) -> None: - """Set up required objects for next tests.""" - self.user = User.objects.create(username="pod", password="pod1234pod") - self.user2 = User.objects.create(username="pod2", password="pod1234pod2") - self.video = Video.objects.create( - title="Video1", - owner=self.user, - video="test.mp4", - is_draft=False, - type=Type.objects.get(id=1), - ) - self.video2 = Video.objects.create( - title="Video2", - owner=self.user, - video="test2.mp4", - is_draft=False, - type=Type.objects.get(id=1), - ) - self.video3 = Video.objects.create( - title="Video3", - owner=self.user2, - video="test3.mp4", - is_draft=False, - type=Type.objects.get(id=1), - ) - - def test_next_rank(self) -> None: - """Test if get_next_rank works correctly""" - Favorite.objects.create( - owner=self.user, - video=self.video, - rank=1, - ) - self.assertEqual( - 2, - get_next_rank(self.user), - "Test if user with favorite can generate the next rank", - ) - self.assertEqual( - 1, - get_next_rank(self.user2), - "Test if user without favorite can generate the next rank", - ) - print(" ---> test_next_rank ok") - - def test_user_add_or_remove_favorite_video(self) -> None: - """Test if test_user_add_or_remove_favorite_video works correctly""" - user_add_or_remove_favorite_video(self.user, self.video) - favorite_tuple_exists = Favorite.objects.filter( - owner=self.user, video=self.video - ).exists() - self.assertTrue( - favorite_tuple_exists, - "Test if tuple has been correctly inserted", - ) - user_add_or_remove_favorite_video(self.user, self.video) - favorite_tuple_not_exists = Favorite.objects.filter( - owner=self.user, video=self.video - ).exists() - self.assertFalse( - favorite_tuple_not_exists, - "Test if tuple has been correctly deleted", - ) - print(" ---> test_user_add_or_remove_favorite_video ok") - - def test_user_has_favorite_video(self) -> None: - """Test if test_user_has_favorite_video works correctly""" - Favorite.objects.create( - owner=self.user, - video=self.video, - rank=1, - ) - self.assertTrue( - user_has_favorite_video(self.user, self.video), - "Test if user has a favorite video", - ) - self.assertFalse( - user_has_favorite_video(self.user2, self.video), - "Test if user hasn't a favorite video", - ) - print(" ---> test_user_has_favorite_video ok") - - def test_get_number_favorites(self) -> None: - """Test if test_get_number_favorites works correctly""" - self.assertEqual( - get_number_favorites(self.video), - 0, - "Test if there's no favorites in the video", - ) - Favorite.objects.create( - owner=self.user, - video=self.video, - rank=1, - ) - Favorite.objects.create( - owner=self.user2, - video=self.video, - rank=1, - ) - self.assertEqual( - get_number_favorites(self.video), - 2, - "Test if there is 2 favorites in the video", - ) - - print(" ---> test_get_number_favorites ok") - - def test_get_all_favorite_videos_for_user(self) -> None: - """Test if get_all_favorite_videos_for_user works correctly.""" - Favorite.objects.create( - owner=self.user, - video=self.video, - rank=1, - ) - video_list = get_all_favorite_videos_for_user(self.user) - self.assertEqual(video_list.count(), 1) - self.assertEqual(video_list.first(), self.video) - print(" ---> get_all_favorite_videos_for_user ok") - - def test_sort_videos_list_1(self) -> None: - """Test if sort_videos_list works correctly.""" - request = HttpRequest() - Favorite.objects.create( - owner=self.user, - video=self.video, - rank=1, - ) - Favorite.objects.create( - owner=self.user, - video=self.video2, - rank=2, - ) - Favorite.objects.create( - owner=self.user, - video=self.video3, - rank=3, - ) - - sorted_videos = [self.video3, self.video2, self.video] - test_sorted_videos = sort_videos_list( - get_all_favorite_videos_for_user(self.user), request.GET.get("sort", "rank") - ) - self.assertEqual(list(test_sorted_videos), sorted_videos) - - request.GET["sort"] = "rank" - request.GET["sort_direction"] = "on" - sorted_videos = [self.video, self.video2, self.video3] - test_sorted_videos = sort_videos_list( - get_all_favorite_videos_for_user(self.user), - request.GET.get("sort", "rank"), - request.GET.get("sort_direction"), - ) - self.assertEqual(list(test_sorted_videos), sorted_videos) - - print(" ---> sort_videos_list ok") diff --git a/pod/favorite/tests/test_views.py b/pod/favorite/tests/test_views.py deleted file mode 100644 index cba7713bea..0000000000 --- a/pod/favorite/tests/test_views.py +++ /dev/null @@ -1,268 +0,0 @@ -"""Esup-Pod favorite views tests. - -* run with 'python manage.py test pod.favorite.tests.test_views' -""" -from django.test import override_settings, TestCase -from django.contrib.auth.models import User -from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ - -from pod.favorite import context_processors -from pod.favorite.models import Favorite -from pod.video.models import Type, Video - -import importlib - - -class TestShowStarTestCase(TestCase): - """Favorite star icon test case.""" - - fixtures = ["initial_data.json"] - - def setUp(self) -> None: - """Set up required objects for next tests.""" - self.user_with_favorite = User.objects.create( - username="pod", password="pod1234pod" - ) - self.user_without_favorite = User.objects.create( - username="pod2", password="pod1234pod2" - ) - self.video = Video.objects.create( - title="Video1", - owner=self.user_without_favorite, - video="test.mp4", - is_draft=False, - type=Type.objects.get(id=1), - ) - Favorite.objects.create( - owner=self.user_with_favorite, - video=self.video, - rank=1, - ) - self.url = reverse("video:video", args=[self.video.slug]) - - @override_settings(USE_FAVORITES=True) - def test_show_star_unfill(self) -> None: - """Test if the star is unfill when the video isn't favorite.""" - importlib.reload(context_processors) - self.client.force_login(self.user_without_favorite) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when the video isn't favorite", - ) - self.assertTrue( - "bi-star" in response.content.decode(), - "Test if the star is correctly present when the video isn't favorite", - ) - self.client.logout() - print(" ---> test_show_star_unfill ok") - - @override_settings(USE_FAVORITES=True) - def test_show_star_fill(self) -> None: - """Test if the star is filled when the video is favorite.""" - importlib.reload(context_processors) - self.client.force_login(self.user_with_favorite) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when the video is favorite", - ) - self.assertTrue( - "bi-star-fill" in response.content.decode(), - "Test if the star is correctly present when the video is favorite", - ) - self.client.logout() - print(" ---> test_show_star_fill ok") - - @override_settings(USE_FAVORITES=True) - def test_favorite_star_hidden(self) -> None: - """Test if the favorite star is hidden when the user is disconnected.""" - importlib.reload(context_processors) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when the user is disconnected", - ) - self.assertFalse( - 'class="btn btn-lg btn-link p-1 star_btn"' in response.content.decode(), - "Test if the star does not appear when the user is disconnected", - ) - print(" ---> test_favorite_star_hidden ok") - - def test_show_star_404_error(self) -> None: - """Test if we can't navigate in the `favorite/` route with GET method.""" - importlib.reload(context_processors) - response = self.client.get(reverse("favorite:add-or-remove")) - self.assertEqual( - response.status_code, - 404, - """ - Test if status code equal 404 when we try to navigate in - the `favorite/` route with GET method - """, - ) - print(" ---> test_show_star_404_error ok") - - @override_settings(USE_FAVORITES=False) - def test_show_star_when_use_favorites_equal_false(self) -> None: - """Test if the star isn't present when USE_FAVORITES equal False.""" - importlib.reload(context_processors) - self.client.force_login(self.user_without_favorite) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when USE_FAVORITES equal False", - ) - self.assertFalse( - "bi-star" in response.content.decode(), - "Test if the star isn't present when USE_FAVORITES equal False", - ) - self.client.logout() - print(" ---> test_show_star_when_use_favorites_equal_false ok") - - -class TestFavoriteVideoListTestCase(TestCase): - """Favorite video list test case.""" - - fixtures = ["initial_data.json"] - - def setUp(self) -> None: - """Set up required objects for next tests.""" - self.user_with_favorite = User.objects.create( - username="pod", password="pod1234pod" - ) - self.user_without_favorite = User.objects.create( - username="pod2", password="pod1234pod2" - ) - self.video = Video.objects.create( - title="Video1", - owner=self.user_without_favorite, - video="test.mp4", - is_draft=False, - type=Type.objects.get(id=1), - ) - Favorite.objects.create( - owner=self.user_with_favorite, - video=self.video, - rank=1, - ) - self.url = reverse("favorite:list") - - @override_settings(USE_FAVORITES=True) - def test_favorite_video_list_not_empty(self) -> None: - """Test if the favorite video list isn't empty when the user has favorites.""" - importlib.reload(context_processors) - self.client.force_login(self.user_with_favorite) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when the favorite video list isn't empty", - ) - self.assertTrue( - 'data-countvideos="1"' in response.content.decode(), - "Test if the favorite video list isn't correctly empty", - ) - self.client.logout() - print(" ---> test_favorite_video_list_not_empty ok") - - @override_settings(USE_FAVORITES=True) - def test_favorite_video_list_empty(self) -> None: - """Test if the favorite video list is empty when the user has favorites.""" - importlib.reload(context_processors) - self.client.force_login(self.user_without_favorite) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when the favorite video list isn't empty", - ) - self.assertTrue( - 'data-countvideos="0"' in response.content.decode(), - "Test if the favorite video list is correctly empty", - ) - self.client.logout() - print(" ---> test_favorite_video_list_empty ok") - - @override_settings(USE_FAVORITES=True) - def test_favorite_video_list_link_in_navbar(self) -> None: - """Test if the favorite video list link is present in the navbar.""" - importlib.reload(context_processors) - self.client.force_login(self.user_with_favorite) - response = self.client.get("/") - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 in test_favorite_video_list_link_in_navbar", - ) - self.assertTrue( - str(_("My favorite videos")) in response.content.decode(), - "Test if the favorite video list link is present in the navbar", - ) - self.client.logout() - print(" ---> test_favorite_video_list_link_in_navbar ok") - - @override_settings(USE_FAVORITES=False) - def test_favorite_video_list_link_in_navbar_when_use_favorites_is_false(self) -> None: - """Test if the favorite video list link is present in the navbar.""" - importlib.reload(context_processors) - self.client.force_login(self.user_with_favorite) - response = self.client.get("/") - self.assertEqual( - response.status_code, - 200, - """ - Test if status code equal 200 in - test_favorite_video_list_link_in_navbar_when_use_favorites_equal_false - """, - ) - self.assertFalse( - str(_("My favorite videos")) in response.content.decode(), - "Test if the favorite video list link is present in the navbar", - ) - self.client.logout() - print( - """ - ---> test_favorite_video_list_link_in_navbar_when_use_favorites_equal_false - ok - """ - ) - - -class TestShowStarInfoTestCase(TestCase): - """Favorite star info test case.""" - - fixtures = ["initial_data.json"] - - def setUp(self) -> None: - """Set up required objects for next tests.""" - self.user = User.objects.create(username="pod", password="pod1234pod") - self.video = Video.objects.create( - title="Video1", - owner=self.user, - video="test.mp4", - is_draft=False, - type=Type.objects.get(id=1), - ) - self.url = reverse("video:video", args=[self.video.slug]) - - @override_settings(USE_FAVORITES=True) - def test_favorites_count(self) -> None: - """Test favorite count.""" - importlib.reload(context_processors) - response = self.client.get(self.url) - self.assertEqual( - response.status_code, - 200, - "Test if status code equal 200 when the user is disconnected", - ) - self.assertTrue( - str(_("Number of favorites")) in response.content.decode(), - "Test if the counter is in video_info", - ) - print(" ---> test_favorites_count ok") diff --git a/pod/favorite/urls.py b/pod/favorite/urls.py deleted file mode 100644 index d8459b8135..0000000000 --- a/pod/favorite/urls.py +++ /dev/null @@ -1,14 +0,0 @@ -from django.urls import path - -from .views import favorite_button_in_video_info, favorite_list -from .views import favorites_save_reorganisation - -app_name = "favorite" - -urlpatterns = [ - path("", favorite_button_in_video_info, name="add-or-remove"), - path("list/", favorite_list, name="list"), - path( - "save-reorganisation/", favorites_save_reorganisation, name="save-reorganisation" - ), -] diff --git a/pod/favorite/utils.py b/pod/favorite/utils.py deleted file mode 100644 index 301b27de8c..0000000000 --- a/pod/favorite/utils.py +++ /dev/null @@ -1,76 +0,0 @@ -"""Esup-Pod favorite video utilities.""" -from django.contrib.auth.models import User -from django.db.models import Max - -from .models import Favorite -from pod.video.models import Video - - -def user_has_favorite_video(user: User, video: Video) -> bool: - """ - Know if user has the video in favorite. - - Args: - user (:class:`django.contrib.auth.models.User`): The user entity - video (:class:`pod.video.models.Video`): The video entity - - Returns: - bool: True if user has the video in favorite, False otherwise - """ - return Favorite.objects.filter(owner=user, video=video).exists() - - -def user_add_or_remove_favorite_video(user: User, video: Video): - """ - Add or remove the video in favorite list of the user. - - Args: - user (:class:`django.contrib.auth.models.User`): The user entity - video (:class:`pod.video.models.Video`): The video entity - """ - if user_has_favorite_video(user, video): - Favorite.objects.filter(owner=user, video=video).delete() - else: - Favorite.objects.create(owner=user, video=video, rank=get_next_rank(user)) - - -def get_next_rank(user: User) -> int: - """ - Get the next favorite rank for the user. - - Args: - user (:class:`django.contrib.auth.models.User`): The user entity - - Returns: - int: The next rank - """ - last_rank = Favorite.objects.filter(owner=user).aggregate(Max("rank"))["rank__max"] - return last_rank + 1 if last_rank is not None else 1 - - -def get_number_favorites(video: Video): - """Return how much a video has been favorited.""" - return Favorite.objects.filter(video=video).count() - - -def get_all_favorite_videos_for_user(user: User) -> list: - """ - Get all favorite videos for a specific user. - - Args: - user (:class:`django.contrib.auth.models.User`): The user entity - - Returns: - list(:class:`pod.video.models.Video`): The video list - """ - favorite_id = Favorite.objects.filter(owner=user).values_list("video_id", flat=True) - video_list = Video.objects.filter(id__in=favorite_id).extra( - select={"rank": "favorite_favorite.rank"}, - tables=["favorite_favorite"], - where=[ - "favorite_favorite.video_id=video_video.id", - "favorite_favorite.owner_id=%s", - ], - params=[user.id], - ) - return video_list diff --git a/pod/favorite/views.py b/pod/favorite/views.py deleted file mode 100644 index d9c08906d2..0000000000 --- a/pod/favorite/views.py +++ /dev/null @@ -1,121 +0,0 @@ -"""Esup-Pod favorite video Views.""" -from django.contrib.sites.shortcuts import get_current_site -from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator -from django.db import transaction -from django.http import Http404, HttpResponseBadRequest -from django.shortcuts import get_object_or_404, redirect, render -from django.views.decorators.csrf import csrf_protect -from django.contrib.auth.decorators import login_required -from django.utils.translation import ugettext_lazy as _ - -from pod.favorite.models import Favorite -from pod.main.utils import is_ajax -from pod.video.models import Video -from pod.video.views import CURSUS_CODES, get_owners_has_instances -from pod.video.utils import sort_videos_list - -from .utils import user_add_or_remove_favorite_video -from .utils import get_all_favorite_videos_for_user - -import json - - -@csrf_protect -def favorite_button_in_video_info(request): - """Add or remove favorite video when the user click on star button.""" - if request.method == "POST": - video = get_object_or_404( - Video, pk=request.POST.get("video"), sites=get_current_site(request) - ) - if video.is_draft: - return False - user_add_or_remove_favorite_video(request.user, video) - return redirect(request.META["HTTP_REFERER"]) - else: - raise Http404() - - -@login_required(redirect_field_name="referrer") -def favorite_list(request): - """Render the main list of favorite videos.""" - sort_field = request.GET.get("sort", "rank") - sort_direction = request.GET.get("sort_direction") - videos_list = sort_videos_list( - get_all_favorite_videos_for_user(request.user), sort_field, sort_direction - ) - count_videos = len(videos_list) - - page = request.GET.get("page", 1) - full_path = "" - if page: - full_path = ( - request.get_full_path() - .replace("?page=%s" % page, "") - .replace("&page=%s" % page, "") - ) - - paginator = Paginator(videos_list, 12) - try: - videos = paginator.page(page) - except PageNotAnInteger: - videos = paginator.page(1) - except EmptyPage: - videos = paginator.page(paginator.num_pages) - - ownersInstances = get_owners_has_instances(request.GET.getlist("owner")) - - if is_ajax(request): - return render( - request, - "favorite/favorite_video_list.html", - {"videos": videos, "full_path": full_path, "count_videos": count_videos}, - ) - - return render( - request, - "favorite/favorite_videos.html", - { - "page_title": _("My favorite videos"), - "videos": videos, - "count_videos": count_videos, - "types": request.GET.getlist("type"), - "owners": request.GET.getlist("owner"), - "disciplines": request.GET.getlist("discipline"), - "tags_slug": request.GET.getlist("tag"), - "cursus_selected": request.GET.getlist("cursus"), - "full_path": full_path, - "ownersInstances": ownersInstances, - "cursus_list": CURSUS_CODES, - "sort_field": sort_field, - "sort_direction": sort_direction, - }, - ) - - -@csrf_protect -def favorites_save_reorganisation(request): - """Save reorganization when the user click on save button.""" - if request.method == "POST": - json_data = request.POST.get("json-data") - try: - dict_data = json.loads(json_data) - except json.JSONDecodeError: - return HttpResponseBadRequest("JSON au mauvais format") - with transaction.atomic(): - for videos_tuple in dict_data.values(): - fav_video_1 = Favorite.objects.filter( - owner_id=request.user.id, - video_id=Video.objects.only("id").get(slug=videos_tuple[0]).id, - ) - fav_video_2 = Favorite.objects.filter( - owner_id=request.user.id, - video_id=Video.objects.only("id").get(slug=videos_tuple[1]).id, - ) - video_1_rank = fav_video_1[0].rank - video_2_rank = fav_video_2[0].rank - fav_video_1.update(rank=video_2_rank) - fav_video_2.update(rank=video_1_rank) - - return redirect(request.META["HTTP_REFERER"]) - else: - raise Http404() diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index 2503a5d8e6..e925ca5ecd 100644 Binary files a/pod/locale/fr/LC_MESSAGES/django.mo and b/pod/locale/fr/LC_MESSAGES/django.mo differ diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index 81c0f70069..3c9a9e4510 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-05 15:50+0200\n" +"POT-Creation-Date: 2023-08-21 08:32+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: Pod Team pod@esup-portail.org\n" @@ -101,8 +101,6 @@ msgid "Picture" msgstr "Image" #: pod/authentication/models.py pod/live/models.py pod/meeting/models.py -#: pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_element_list.html #: pod/podfile/models.py pod/video/admin.py pod/video/models.py #: pod/video_search/templates/search/search.html msgid "Owner" @@ -184,8 +182,7 @@ msgstr "Changer votre image de profil" #: pod/main/templates/navbar.html pod/main/templates/navbar_collapse.html #: pod/meeting/templates/meeting/add_or_edit.html #: pod/meeting/templates/meeting/my_meetings.html -#: pod/playlist/templates/playlist/playlist_video_list.html -#: pod/playlist/templates/playlist_player-iframe.html +#: pod/playlist/templates/playlist/playlist-list-modal.html #: pod/podfile/templates/podfile/customfilewidget.html #: pod/podfile/templates/podfile/home_content.html #: pod/podfile/templates/podfile/userfolder.html @@ -214,6 +211,9 @@ msgstr "Fermer" #: pod/meeting/templates/meeting/delete.html #: pod/meeting/templates/meeting/invite.html #: pod/meeting/templates/meeting/join.html pod/meeting/views.py +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/delete.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/playlist/views.py pod/recorder/templates/recorder/add_recording.html #: pod/recorder/templates/recorder/record_delete.html pod/recorder/views.py #: pod/video/templates/channel/channel_edit.html @@ -242,7 +242,9 @@ msgstr "Une ou plusieurs erreurs ont été trouvées dans le formulaire." #: pod/meeting/templates/meeting/delete.html #: pod/meeting/templates/meeting/invite.html #: pod/meeting/templates/meeting/join.html -#: pod/playlist/templates/playlist/playlist_video_list.html +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/delete.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/recorder/templates/recorder/add_recording.html #: pod/recorder/templates/recorder/record_delete.html #: pod/video/templates/channel/channel_edit.html @@ -358,8 +360,8 @@ msgid "URL of the recording thumbnail of the BBB presentation." msgstr "" "URL de la vignette correspondant à l’enregistrement de la présentation BBB." -#: pod/bbb/models.py pod/favorite/models.py pod/import_video/models.py -#: pod/meeting/models.py pod/recorder/models.py +#: pod/bbb/models.py pod/import_video/models.py pod/meeting/models.py +#: pod/playlist/models.py pod/recorder/models.py msgid "User" msgstr "Utilisateur" @@ -380,6 +382,7 @@ msgid "Meeting" msgstr "Session" #: pod/bbb/models.py pod/meeting/apps.py +#: pod/stats/templates/stats/meeting-stats-view.html msgid "Meetings" msgstr "Sessions" @@ -424,7 +427,7 @@ msgstr "Participants" #: pod/bbb/models.py pod/import_video/models.py pod/live/forms.py #: pod/live/models.py pod/meeting/forms.py pod/meeting/models.py -#: pod/video_search/forms.py +#: pod/stats/templates/stats/utils/video-stats.html pod/video_search/forms.py msgid "Start date" msgstr "Date de début" @@ -433,7 +436,7 @@ msgid "Start date of the live." msgstr "Date de début du direct." #: pod/bbb/models.py pod/live/forms.py pod/live/models.py -#: pod/video_search/forms.py +#: pod/stats/templates/stats/utils/video-stats.html pod/video_search/forms.py msgid "End date" msgstr "Date de fin" @@ -744,8 +747,7 @@ msgstr "Désolé, aucune session BigBlueButton en cours n’a été trouvée" #: pod/bbb/templates/bbb/live_record_list.html #: pod/bbb/templates/bbb/record_list.html -#: pod/favorite/templates/favorite/favorite_video_list.html -#: pod/playlist/templates/playlist/playlist_list.html +#: pod/playlist/templates/playlist/playlist-videos-list.html #: pod/recorder/templates/recorder/record_list.html #: pod/video/templates/videos/video_list.html msgid "More" @@ -753,9 +755,8 @@ msgstr "Plus" #: pod/bbb/templates/bbb/live_record_list.html #: pod/bbb/templates/bbb/record_list.html -#: pod/favorite/templates/favorite/favorite_video_list.html #: pod/live/templates/live/events_list.html pod/main/templates/loader.html -#: pod/playlist/templates/playlist/playlist_list.html +#: pod/playlist/templates/playlist/playlist-videos-list.html #: pod/podfile/templates/podfile/home_content.html #: pod/podfile/templates/podfile/list_folder_files.html #: pod/recorder/templates/recorder/record_list.html @@ -816,7 +817,8 @@ msgid "File to import" msgstr "Fichier à importer" #: pod/chapter/models.py pod/completion/models.py pod/enrichment/models.py -#: pod/video/models.py pod/video_encode_transcript/utils.py +#: pod/playlist/templates/playlist/playlist_card.html pod/video/models.py +#: pod/video_encode_transcript/utils.py msgid "video" msgstr "vidéo" @@ -825,7 +827,8 @@ msgstr "vidéo" msgid "title" msgstr "titre" -#: pod/chapter/models.py pod/enrichment/models.py pod/video/models.py +#: pod/chapter/models.py pod/enrichment/models.py pod/playlist/models.py +#: pod/video/models.py msgid "slug" msgstr "titre court" @@ -892,7 +895,7 @@ msgstr "Une ou plusieurs erreurs ont été trouvées dans le formulaire :" #: pod/enrichment/templates/enrichment/group_enrichment.html #: pod/import_video/templates/import_video/add_or_edit.html #: pod/meeting/templates/meeting/add_or_edit.html -#: pod/playlist/templates/playlist.html +#: pod/playlist/templates/playlist/add_or_edit.html #: pod/recorder/templates/recorder/add_recording.html #: pod/video/templates/channel/channel_edit.html #: pod/video/templates/channel/form_theme.html @@ -908,7 +911,7 @@ msgstr "Sauvegarder" #: pod/completion/templates/overlay/form_overlay.html #: pod/completion/templates/track/form_track.html #: pod/enrichment/templates/enrichment/form_enrichment.html -#: pod/favorite/templates/favorite/favorite_videos.html +#: pod/playlist/templates/playlist/playlist.html #: pod/video/templates/channel/form_theme.html #: pod/video/templates/videos/category_modal.html #: pod/video/templates/videos/video_note_comments_display.html @@ -934,7 +937,6 @@ msgstr "Liste des chapitres" #: pod/completion/templates/overlay/list_overlay.html #: pod/enrichment/templates/enrichment/list_enrichment.html pod/live/models.py #: pod/main/models.py pod/main/views.py pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_element_list.html #: pod/video/models.py pod/video/templates/channel/list_theme.html #: pod/video/templates/videos/video_sort_select.html msgid "Title" @@ -946,7 +948,6 @@ msgstr "Titre" #: pod/completion/templates/overlay/list_overlay.html #: pod/completion/templates/track/list_track.html #: pod/enrichment/templates/enrichment/list_enrichment.html -#: pod/playlist/templates/playlist/playlist_element_list.html #: pod/video/templates/channel/list_theme.html msgid "Actions" msgstr "Actions" @@ -977,7 +978,7 @@ msgstr "Supprimer le chapitre" #: pod/enrichment/templates/enrichment/list_enrichment.html #: pod/live/templates/live/event_delete.html #: pod/meeting/templates/meeting/delete.html -#: pod/playlist/templates/playlist.html +#: pod/playlist/templates/playlist/delete.html #: pod/recorder/templates/recorder/record_delete.html #: pod/video/templates/channel/list_theme.html #: pod/video/templates/videos/category_modal.html @@ -1181,9 +1182,9 @@ msgstr "" "Il existe déjà un contributeur avec le même nom et le même rôle dans cette " "liste." -#: pod/completion/models.py pod/enrichment/models.py pod/favorite/models.py -#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py -#: pod/video_encode_transcript/models.py +#: pod/completion/models.py pod/enrichment/models.py pod/playlist/models.py +#: pod/recorder/models.py pod/video/models.py +#: pod/video/templates/videos/video.html pod/video_encode_transcript/models.py msgid "Video" msgstr "Vidéo" @@ -1191,7 +1192,7 @@ msgstr "Vidéo" #: pod/completion/templates/document/list_document.html #: pod/enrichment/models.py #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html pod/podfile/models.py +#: pod/podfile/models.py msgid "Document" msgstr "Document" @@ -1317,8 +1318,7 @@ msgstr "bas à gauche" msgid "left" msgstr "gauche" -#: pod/completion/models.py pod/live/models.py pod/playlist/models.py -#: pod/video/models.py +#: pod/completion/models.py pod/live/models.py pod/video/models.py msgid "Slug" msgstr "Titre court" @@ -1339,8 +1339,6 @@ msgid "Content" msgstr "Contenu" #: pod/completion/models.py pod/completion/templates/overlay/list_overlay.html -#: pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_element_list.html msgid "Position" msgstr "Position" @@ -1484,7 +1482,6 @@ msgid "Remove the subtitle or caption files" msgstr "Supprimer les fichiers de sous-titres ou de légendes" #: pod/completion/templates/track/list_track.html -#: pod/playlist/templates/playlist/playlist_element_list.html msgid "Remove" msgstr "Retirer" @@ -1716,8 +1713,8 @@ msgstr "" #: pod/completion/templates/video_completion.html msgid "Subtitles and/or caption(s) files must be in \".vtt\" format." msgstr "" -"Les fichiers de sous-titres et/ou de légendes doivent être au format \"." -"vtt\"." +"Les fichiers de sous-titres et/ou de légendes doivent être au format \".vtt" +"\"." #: pod/completion/templates/video_completion.html msgid "You can use" @@ -1822,6 +1819,7 @@ msgid "Total video duration" msgstr "Durée totale de la vidéo" #: pod/cut/templates/video_cut.html +#: pod/playlist/templates/playlist/filter_aside.html #: pod/video/templates/videos/filter_aside.html msgid "Reset" msgstr "Réinitialiser" @@ -1950,7 +1948,7 @@ msgstr "Type" #: pod/enrichment/models.py #: pod/enrichment/templates/enrichment/video_enrichment.html pod/main/models.py -#: pod/playlist/templates/playlist_player.html pod/podfile/models.py +#: pod/podfile/models.py msgid "Image" msgstr "Image" @@ -1960,7 +1958,6 @@ msgstr "Intégrer un document (PDF, texte, html)" #: pod/enrichment/models.py #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Richtext" msgstr "Texte riche" @@ -2074,8 +2071,8 @@ msgid "" msgstr "" "Les champs \"Début\" et \"Fin\" doivent contenir des valeurs en secondes. " "Lancez la lecture de la vidéo, mettez sur pause et cliquez sur \"Récupérer " -"le temps depuis le lecteur\" pour renseigner automatiquement le champ " -"\"Début\". Vous pouvez le faire également pour remplir le champ \"Fin\"." +"le temps depuis le lecteur\" pour renseigner automatiquement le champ \"Début" +"\". Vous pouvez le faire également pour remplir le champ \"Fin\"." #: pod/enrichment/templates/enrichment/edit_enrichment.html msgid "You cannot overlap enrichments." @@ -2107,8 +2104,6 @@ msgstr "Supprimer l’enrichissement" #: pod/enrichment/templates/enrichment/video_enrichment-iframe.html #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player-iframe.html -#: pod/playlist/templates/playlist_player.html msgid "Enriched" msgstr "Enrichi" @@ -2118,29 +2113,24 @@ msgid "Added by" msgstr "Ajouté par" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Informations" msgstr "Informations" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "To help you, the different types of enrichments have specific colors:" msgstr "" "Pour vous aider, les différents types d’enrichissements ont des couleurs " "spécifiques :" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Weblink" msgstr "Lien web" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Embed" msgstr "Intégrer" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "They are visible on the video playback bar." msgstr "Ils sont visibles sur la barre de lecture de la vidéo." @@ -2148,85 +2138,6 @@ msgstr "Ils sont visibles sur la barre de lecture de la vidéo." msgid "You cannot enrich this video." msgstr "Vous ne pouvez pas enrichir cette vidéo." -#: pod/favorite/apps.py pod/favorite/models.py -msgid "Favorite videos" -msgstr "Vidéos favorites" - -#: pod/favorite/models.py pod/recorder/models.py pod/video/models.py -#: pod/video/templates/videos/video_sort_select.html -msgid "Date added" -msgstr "Date d’ajout" - -#: pod/favorite/models.py pod/video/templates/videos/video_sort_select.html -msgid "Rank" -msgstr "Rang" - -#: pod/favorite/models.py -msgid "Favorite video" -msgstr "Vidéo favorite" - -#: pod/favorite/templates/favorite/favorite_video_list.html -#: pod/video/templates/videos/video_list.html -msgid "Sorry, no video found." -msgstr "Désolé, aucune vidéo trouvée." - -#: pod/favorite/templates/favorite/favorite_videos.html -#: pod/video/templates/channel/channel.html -#: pod/video/templates/videos/my_videos.html -#: pod/video/templates/videos/videos.html -#: pod/video_search/templates/search/search.html -#, python-format -msgid "%(counter)s video found" -msgid_plural "%(counter)s videos found" -msgstr[0] "%(counter)s vidéo trouvée" -msgstr[1] "%(counter)s vidéos trouvées" - -#: pod/favorite/templates/favorite/favorite_videos.html -#: pod/favorite/tests/test_views.py pod/favorite/views.py -#: pod/main/templates/navbar.html -msgid "My favorite videos" -msgstr "Mes vidéos favorites" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Reorganize your favorite videos" -msgstr "Réorganiser vos vidéos favorites" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Reorganize" -msgstr "Réorganiser" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Sort by descending rank before you can rearrange" -msgstr "Trier par ordre décroissant avant de pouvoir réorganiser" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Sort by descending rank" -msgstr "Trier par ordre décroissant" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Help - Drag & Drop" -msgstr "Aide - Glisser & Déposer" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Select the video to move by clicking and holding." -msgstr "" -"Sélectionnez la vidéo que vous souhaitez en cliquant et maintenant le bouton " -"de la souris." - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "While holding down the video, drag it to the desired location." -msgstr "" -"Tout en maintenant le bouton de la souris enfoncé, faites-la glisser à " -"l’endroit que vous souhaitez." - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Drop the video on another to swap their position." -msgstr "Déposez la vidéo sur une autre pour échanger leur position." - -#: pod/favorite/tests/test_views.py pod/video/templates/videos/video-info.html -msgid "Number of favorites" -msgstr "Nombre de favoris" - #: pod/import_video/apps.py msgid "Import External Video" msgstr "Importer une vidéo externe" @@ -2448,6 +2359,7 @@ msgstr "Conditions d’utilisation de YouTube" #: pod/live/templates/live/filter_aside.html #: pod/meeting/templates/meeting/filter_aside.html #: pod/meeting/templates/meeting/filter_aside_recording.html +#: pod/playlist/templates/playlist/filter_aside.html #: pod/video/templates/videos/filter_aside.html msgid "Filters" msgstr "Filtres" @@ -2501,6 +2413,7 @@ msgstr "" #: pod/import_video/templates/import_video/list.html pod/main/forms.py #: pod/meeting/forms.py pod/meeting/templates/meeting/internal_recordings.html +#: pod/playlist/templates/playlist/playlist_sort_select.html #: pod/podfile/models.py pod/podfile/templates/podfile/home_content.html #: pod/video_encode_transcript/models.py msgid "Name" @@ -2639,8 +2552,8 @@ msgid "" "This video was uploaded to Pod; its origin is %(type)s : %(url)s" msgstr "" -"Cette vidéo a été téléversée sur Pod; son origine est %(type)s : %(url)s" +"Cette vidéo a été téléversée sur Pod; son origine est %(type)s : %(url)s" #: pod/import_video/views.py pod/meeting/views.py msgid "Try changing the record type or address for this recording." @@ -2651,8 +2564,8 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" +"This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" msgstr "" "Cette vidéo « %(name)s » a été téléversée sur Pod; son origine est Youtube : " "%(url)s" @@ -2810,7 +2723,8 @@ msgstr "Erreur de planification." msgid "An event is already planned at these dates" msgstr "Un évenement est déjà planifié à cette date" -#: pod/live/forms.py pod/meeting/forms.py pod/video/forms.py +#: pod/live/forms.py pod/meeting/forms.py pod/playlist/forms.py +#: pod/playlist/models.py pod/video/forms.py msgid "Password" msgstr "Mot de passe" @@ -2826,8 +2740,8 @@ msgstr "Bâtiment" msgid "Broadcaster device" msgstr "Matériel de captation" -#: pod/live/forms.py pod/meeting/forms.py pod/recorder/forms.py -#: pod/video/forms.py +#: pod/live/forms.py pod/meeting/forms.py pod/playlist/forms.py +#: pod/recorder/forms.py pod/video/forms.py msgid "I agree" msgstr "J’accepte" @@ -2965,7 +2879,9 @@ msgstr "" "informations nécessaires, et mettre en forme le résultat en utilisant la " "barre d’outils." -#: pod/live/models.py pod/meeting/models.py pod/video/forms.py +#: pod/live/models.py pod/meeting/models.py pod/playlist/models.py +#: pod/playlist/templates/playlist/playlist-informations-card.html +#: pod/stats/templates/stats/playlist-stats-view.html pod/video/forms.py #: pod/video/models.py msgid "Additional owners" msgstr "Propriétaires additionnels" @@ -3169,8 +3085,7 @@ msgstr "Prochains évènements" msgid "Manage broadcaster" msgstr "Gérer le diffuseur" -#: pod/live/templates/live/direct.html pod/playlist/templates/playlist.html -#: pod/playlist/templates/playlist/playlist_list.html +#: pod/live/templates/live/direct.html #: pod/video/templates/videos/video_edit.html msgid "Edit" msgstr "Éditer" @@ -3244,10 +3159,11 @@ msgstr "Intégrer/Partager" #: pod/live/templates/live/event-form.html msgid "This event is protected by password, please fill in and click send." msgstr "" -"Cet évènement est protégée par un mot de passe, veuillez remplir le " +"Cet évènement est protégé par un mot de passe, veuillez remplir le " "formulaire et cliquez sur envoyer." #: pod/live/templates/live/event-form.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/video/templates/videos/video-form.html msgid "Password required" msgstr "Mot de passe requis" @@ -3258,6 +3174,7 @@ msgstr "Mot de passe requis" #: pod/live/templates/live/filter_aside.html pod/main/templates/contact_us.html #: pod/meeting/templates/meeting/invite.html #: pod/meeting/templates/meeting/join.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/video/templates/videos/video-form.html #: pod/video_search/templates/search/search.html msgid "Send" @@ -3456,9 +3373,7 @@ msgstr "Éditer l’évènement" msgid "Delete the event" msgstr "Supprimer l’évènement" -#: pod/live/templates/live/event_card.html -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html +#: pod/live/templates/live/event_card.html pod/video/templates/videos/card.html msgid "This content is in draft." msgstr "Ce contenu est en mode brouillon." @@ -3499,6 +3414,7 @@ msgstr "Pour supprimer l’évènement, veuillez cocher et cliquer sur envoyer." #: pod/live/templates/live/event_delete.html #: pod/meeting/templates/meeting/delete.html +#: pod/playlist/templates/playlist/delete.html #: pod/recorder/templates/recorder/record_delete.html #: pod/video/templates/videos/video_delete.html msgid "Agree required" @@ -3679,8 +3595,7 @@ msgstr "Vous ne pouvez pas accèder à cette page." msgid "You cannot watch this event." msgstr "Vous ne pouvez pas accèder à cet évènement en direct." -#: pod/live/views.py pod/playlist/templates/playlist/playlist_video_list.html -#: pod/video/views.py +#: pod/live/views.py pod/playlist/views.py pod/video/views.py msgid "The password is incorrect." msgstr "Le mot de passe est incorrect." @@ -4496,7 +4411,7 @@ msgstr "Afficher/masquer le menu latéral" msgid "Breadcrumb" msgstr "Fil d’Ariane" -#: pod/main/templates/base.html pod/playlist/templates/playlist_player.html +#: pod/main/templates/base.html msgid "Home" msgstr "Accueil" @@ -4557,6 +4472,10 @@ msgstr "Version" msgid "videos availables" msgstr "vidéos disponibles" +#: pod/main/templates/footer.html +msgid "See more statistics" +msgstr "Voir plus de statistiques" + #: pod/main/templates/mail/mail.html pod/main/templates/mail/mail_sender.html msgid "Hello" msgstr "Bonjour" @@ -4606,11 +4525,16 @@ msgstr "Contactez nous" msgid "Toggle navigation" msgstr "Basculer le menu" -#: pod/main/templates/navbar.html pod/recorder/models.py pod/video/forms.py +#: pod/main/templates/navbar.html pod/recorder/models.py +#: pod/stats/templates/stats/channel-stats-view.html pod/video/forms.py #: pod/video/models.py msgid "Channels" msgstr "Chaînes" +#: pod/main/templates/navbar.html +msgid "Promoted playlists" +msgstr "Listes de lecture promues" + #: pod/main/templates/navbar.html msgid "Some features are unavailable" msgstr "Certaines fonctionnalités sont indisponibles" @@ -4661,6 +4585,14 @@ msgstr "Police ‘Open Dyslexic’" msgid "Add your picture" msgstr "Ajouter votre image de profil" +#: pod/main/templates/navbar.html +msgid "My playlists" +msgstr "Mes listes de lecture" + +#: pod/main/templates/navbar.html pod/playlist/tests/test_views.py +msgid "My favorite videos" +msgstr "Mes vidéos favorites" + #: pod/main/templates/navbar.html msgid "Video Record" msgstr "Enregistreur" @@ -4675,11 +4607,6 @@ msgstr "Importer une vidéo externe" msgid "My channels" msgstr "Mes chaînes" -#: pod/main/templates/navbar.html pod/playlist/templates/my_playlists.html -#: pod/playlist/templates/playlist.html pod/playlist/views.py -msgid "My playlists" -msgstr "Mes listes de lecture" - #: pod/main/templates/navbar.html pod/podfile/templates/podfile/home.html #: pod/podfile/views.py msgid "My files" @@ -4695,6 +4622,29 @@ msgstr "Revendiquer un enregistrement" msgid "Log out" msgstr "Déconnexion" +#: pod/main/templates/navbar.html +msgid "Your statistics" +msgstr "Vos statistiques" + +#: pod/main/templates/navbar.html +#: pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Number of videos" +msgstr "Nombre de vidéos" + +#: pod/main/templates/navbar.html +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of playlists" +msgstr "Nombre de listes de lecture" + +#: pod/main/templates/navbar.html +msgid "See more" +msgstr "En savoir plus" + #: pod/main/templates/navbar_collapse.html #, python-format msgid "%(counter)s Channel" @@ -4710,8 +4660,6 @@ msgstr[0] "%(counter)s Thème" msgstr[1] "%(counter)s Thèmes" #: pod/main/templates/navbar_collapse.html -#: pod/playlist/templates/playlist/playlist_list.html -#: pod/playlist/templates/playlist/playlist_video_list.html #: pod/video/templates/channel/channel.html #, python-format msgid "%(counter)s video" @@ -4755,9 +4703,7 @@ msgstr "rejoindre" msgid "Recurring" msgstr "Récurrence" -#: pod/meeting/forms.py -#: pod/playlist/templates/playlist/playlist_element_list.html -#: pod/video/feeds.py pod/video/models.py +#: pod/meeting/forms.py pod/video/feeds.py pod/video/models.py #: pod/video/templates/videos/video_sort_select.html msgid "Duration" msgstr "Durée" @@ -4811,7 +4757,7 @@ msgstr "Récurrence" msgid "Record session" msgstr "Enregistrement" -#: pod/meeting/forms.py pod/video/forms.py +#: pod/meeting/forms.py pod/playlist/forms.py pod/video/forms.py msgid "Owner of the video cannot be an additional owner too" msgstr "" "Le propriétaire de la video ne peut pas être propriétaire additionnel en " @@ -5280,7 +5226,7 @@ msgid "Delete the meeting" msgstr "Supprimer la réunion" #: pod/meeting/templates/meeting/meeting_card.html -msgid "Acces to this meeting is restricted" +msgid "Access to this meeting is restricted" msgstr "L’accès à cette réunion est restreint" #: pod/meeting/templates/meeting/meeting_card.html @@ -5444,16 +5390,16 @@ msgid "" msgstr "" "\n" "

    Bonjour,\n" -"

    %(owner)s vous invite à une réunion récurrente " -"%(meeting_title)s.

    \n" +"

    %(owner)s vous invite à une réunion récurrente " +"%(meeting_title)s.

    \n" "

    Date de début : %(start_date_time)s

    \n" "

    Récurrent jusqu’à la date : %(end_date)s

    \n" "

    La réunion se tiendra tou(te)s les %(frequency)s %(recurrence)s \n" "

    Voici le lien pour rejoindre la réunion :\n" " %(join_link)s

    \n" -"

    Vous avez besoin de ce mot de passe pour entrer : " -"%(password)s

    \n" +"

    Vous avez besoin de ce mot de passe pour entrer : " +"%(password)s

    \n" "

    Cordialement

    \n" " " @@ -5479,8 +5425,8 @@ msgstr "" "

    Date de fin : %(end_date)s

    \n" "

    Voici le lien pour rejoindre la réunion :\n" " %(join_link)s

    \n" -"

    Vous avez besoin de ce mot de passe pour entrer : " -"%(password)s

    \n" +"

    Vous avez besoin de ce mot de passe pour entrer : " +"%(password)s

    \n" "

    Cordialement

    \n" " " @@ -5502,215 +5448,425 @@ msgid "Impossible to create the internal recording" msgstr "Impossible de créer l’enregistrement" #: pod/playlist/apps.py pod/playlist/models.py +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/delete.html +#: pod/playlist/templates/playlist/playlist.html +#: pod/playlist/templates/playlist/playlists.html +#: pod/playlist/templates/playlist/protected-playlist-form.html +#: pod/playlist/views.py pod/stats/templates/stats/playlist-stats-view.html msgid "Playlists" msgstr "Listes de lecture" -#: pod/playlist/models.py -msgid "Short description of the playlist." -msgstr "Courte description de la liste de lecture." +#: pod/playlist/apps.py pod/playlist/signals.py +msgid "Your favorites videos." +msgstr "Vos vidéos favorites." -#: pod/playlist/models.py pod/video/models.py -msgid "Visible" -msgstr "Visible" +#: pod/playlist/forms.py +msgid "General informations" +msgstr "Informations générales" + +#: pod/playlist/forms.py +msgid "Security informations" +msgstr "Informations de sécurité" + +#: pod/playlist/forms.py pod/playlist/models.py +msgid "Please choose a password if this playlist is password-protected." +msgstr "" +"Veuillez choisir un mot de passe si cette playlist est protégée par un mot " +"de passe." + +#: pod/playlist/forms.py pod/playlist/models.py +msgid "Promoted" +msgstr "Promue" + +#: pod/playlist/forms.py pod/playlist/models.py +msgid "" +"Selecting this setting causes your playlist to be promoted on the page " +"listing promoted public playlists. However, if this setting is deactivated, " +"your playlist will still be accessible to everyone.
    For general use, we " +"recommend that you leave this setting disabled." +msgstr "" +"En sélectionnant ce paramètre, votre liste de lecture sera mise en avant " +"dans la page listant les listes de lecture publiques promues. En revanche, " +"si ce paramètre est désactivé, votre liste de lecture restera tout de même " +"accessible par tous.
    Pour une utilisation générale, il est conseillé de " +"laisser ce paramètre désactivé." + +#: pod/playlist/forms.py +#, fuzzy, python-brace-format +#| msgid "You cannot create a playlist named \"{FAVORITE_PLAYLIST_NAME}\"" +msgid "You cannot create a playlist named \"{FAVORITE_PLAYLIST_NAME}\"" +msgstr "Vous ne pouvez créer une liste de lecture nommée \"Favoris\"" + +#: pod/playlist/forms.py +msgid "Remove playlist cannot be undone" +msgstr "La suppression de réunion est définitive" + +#: pod/playlist/models.py +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +#: pod/playlist/utils.py pod/video/models.py +#: pod/video/templates/videos/video_note_comments_display.html +#: pod/video/templates/videos/video_note_display.html +msgid "Public" +msgstr "Public" #: pod/playlist/models.py -msgid "If checked, the playlist can be visible to users other than the owner." -msgstr "Si coché, cette liste de lecture sera visible aux autres utilisateurs." +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +#: pod/playlist/utils.py +msgid "Password-protected" +msgstr "Protégé par un mot de passe" #: pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_video_list.html -#: pod/playlist/templates/playlist_player.html +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +#: pod/playlist/utils.py +msgid "Private" +msgstr "Privé" + +#: pod/playlist/models.py pod/playlist/tests/test_models.py +#: pod/playlist/views.py pod/video/templates/videos/video.html msgid "Playlist" msgstr "Liste de lecture" #: pod/playlist/models.py -msgid "Position of the video in a playlist." -msgstr "Position de la vidéo dans la liste de lecture." +msgid "Please choose a name between 1 and 250 characters." +msgstr "Veuillez entrer un nom entre 2 et 200 caractères." + +#: pod/playlist/models.py +msgid "Please choose a description. This description is empty by default." +msgstr "Veuillez choisir une description. Celle-ci est vide par défaut." + +#: pod/playlist/models.py pod/playlist/templates/playlist/filter_aside.html +#: pod/playlist/templates/playlist/playlist-informations-card.html +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Right of access" +msgstr "Droit d'accès" + +#: pod/playlist/models.py +msgid "" +"\n" +" Please chosse a right of access among 'public', 'password-" +"protected', 'private'.\n" +" " +msgstr "" +"\n" +" Veuillez choisir un droit d'accès entre 'public', 'protégée par " +"un mot de passe', 'privée'.\n" +" " + +#: pod/playlist/models.py pod/video/templates/videos/video-info.html +msgid "Autoplay" +msgstr "Lecture automatique" + +#: pod/playlist/models.py +msgid "Please choose if this playlist is an autoplay playlist or not." +msgstr "Veuillez choisir si cette playlist est en lecture automatique ou non." + +#: pod/playlist/models.py +msgid "Editable" +msgstr "Éditable" + +#: pod/playlist/models.py +msgid "Please choose if this playlist is editable or not." +msgstr "Veuillez choisir si cette playlist est éditable ou non." + +#: pod/playlist/models.py +msgid "You can add additional owners to the playlist." +msgstr "Vous pouvez ajouter des propriétaires additionnels à la playlist." + +#: pod/playlist/models.py +msgid "Date created" +msgstr "Date de création" + +#: pod/playlist/models.py +msgid "Date updated" +msgstr "Date de mise à jour" + +#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py +#: pod/video/templates/videos/video_sort_select.html +msgid "Date added" +msgstr "Date d’ajout" + +#: pod/playlist/models.py pod/video/templates/videos/video_sort_select.html +msgid "Rank" +msgstr "Rang" #: pod/playlist/models.py -msgid "Playlist element" +msgid "Playlist content" msgstr "Élément de liste de lecture" #: pod/playlist/models.py -msgid "Playlist elements" +msgid "Playlist contents" msgstr "Éléments de liste de lecture" -#: pod/playlist/models.py pod/playlist/views.py -msgid "A video in draft mode cannot be added to a playlist." -msgstr "" -"Une vidéo en mode brouillon ne peut être ajoutée à une liste de lecture." +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/playlist_link.html +#: pod/playlist/tests/test_views.py pod/playlist/views.py +msgid "Edit the playlist" +msgstr "Éditer la liste de lecture" -#: pod/playlist/models.py pod/playlist/views.py -msgid "A video with a password cannot be added to a playlist." -msgstr "" -"Une vidéo avec mot de passe ne peut être ajoutée à une liste de lecture." +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/playlists.html +#: pod/playlist/tests/test_views.py pod/playlist/views.py +msgid "Add a playlist" +msgstr "Ajouter une liste de lecture" + +#: pod/playlist/templates/playlist/button_start_playlist.html +msgid "Start the playlist" +msgstr "Démarrer la liste de lecture" -#: pod/playlist/templates/my_playlists.html +#: pod/playlist/templates/playlist/delete.html #, python-format -msgid "%(counter)s playlist found" -msgid_plural "%(counter)s playlists found" -msgstr[0] "%(counter)s liste de lecture trouvée" -msgstr[1] "%(counter)s listes de lecture trouvées" +msgid "Delete the playlist %(name)s" +msgstr "Supprimer la liste de lecture %(name)s" -#: pod/playlist/templates/my_playlists.html -msgid "No playlist found" -msgstr "Aucune liste de lecture trouvée" +#: pod/playlist/templates/playlist/delete.html +msgid "Back to my playlists" +msgstr "Retour à mes listes de lecture" -#: pod/playlist/templates/my_playlists.html -msgid "" -"You have not created any playlists yet, please use the \"Add a new " -"playlist\" button to add one." +#: pod/playlist/templates/playlist/delete.html +msgid "To delete the playlist, please check the box in and click delete." msgstr "" -"Vous n’avez pas encore créé de liste de lecture, veuillez cliquer sur le " -"bouton « Ajouter une nouvelle liste de lecture » pour en ajouter une." +"Pour supprimer la liste de lecture, veuillez cocher la case et cliquer sur " +"supprimer." -#: pod/playlist/templates/my_playlists.html -#: pod/playlist/templates/playlist.html -#: pod/playlist/templates/playlist/playlist_list.html -#: pod/playlist/tests/test_views.py -msgid "Add a new playlist" -msgstr "Ajouter une nouvelle liste de lecture" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my private playlists" +msgstr "Voir mes listes de lecture privées" -#: pod/playlist/templates/my_playlists.html -msgid "" -"This is the page of your playlists. Here you can create, edit or delete them." -msgstr "" -"C’est la page de vos listes de lecture. Ici vous pouvez les créer, les " -"éditer ou les supprimer." +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my password-protected playlists" +msgstr "Voir mes listes de lecture protégées par un mot de passe" -#: pod/playlist/templates/my_playlists.html -msgid "" -"A playlist with the eye symbol means that this playlist is visible to all " -"users when they view this page." -msgstr "" -"Une liste de lecture avec un symbole œil signifie que cette liste est " -"visible à tous les utilisateurs qui visiteront cette page." +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my public playlists" +msgstr "Voir mes listes de lecture publiques" -#: pod/playlist/templates/playlist.html pod/playlist/tests/test_views.py -msgid "Editing the playlist" -msgstr "Éditer la liste de lecture" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my playlists" +msgstr "Voir mes listes de lecture" -#: pod/playlist/templates/playlist.html -msgid "This playlist has no videos yet." -msgstr "Cette liste de lecture ne dispose pas encore de vidéos." +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See playlists I can contribute" +msgstr "Voir les listes de lecture additionnelles" -#: pod/playlist/templates/playlist.html -msgid "Back to my playlists" -msgstr "Retour à mes listes de lecture" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See all public playlists" +msgstr "Voir toutes les listes de lecture publiques" -#: pod/playlist/templates/playlist/player_controls.html -msgid "Repeat the playlist" -msgstr "Répéter la liste de lecture" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See all promoted playlists" +msgstr "Voir toutes les listes de lecture promues" -#: pod/playlist/templates/playlist/player_controls.html -msgid "Switch to next video automatically" -msgstr "Passer automatiquement à la prochaine vidéo" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See all playlists" +msgstr "Voir toutes les listes de lecture" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "List of videos" -msgstr "Liste des vidéos" +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Informations about the playlist" +msgstr "Informations de la liste de lecture." -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Thumbnail" -msgstr "Vignette" +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Last updated on" +msgstr "Mis à jour le" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Video thumbnail" -msgstr "Vignette de la vidéo" +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "at" +msgstr "à" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Move up" -msgstr "Déplacer vers le haut" +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Playlist owner" +msgstr "Propriétaire de la liste de lecture" + +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Show statistics for the playlist" +msgstr "Afficher les statistiques de la liste de lecture" + +#: pod/playlist/templates/playlist/playlist-informations-card.html +#: pod/stats/apps.py pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/meeting-stats-view.html +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Statistics" +msgstr "Statistiques" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Move down" -msgstr "Déplacer vers le bas" +#: pod/playlist/templates/playlist/playlist-list-modal.html +msgid "Your playlists" +msgstr "Vos listes de lecture" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Save position" -msgstr "Enregistrer les positions" +#: pod/playlist/templates/playlist/playlist-list-modal.html +msgid "Add the video in a new playlist" +msgstr "Ajouter une vidéo à une nouvelle liste de lecture" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "This playlist is visible to all users." -msgstr "Cette liste de lecture est visible à d’autres utilisateurs." +#: pod/playlist/templates/playlist/playlist-management-card.html +msgid "Manage playlist" +msgstr "Gérer la liste de lecture" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "This playlist is only visible by you." -msgstr "Vous seul pouvez voir cette liste de lecture." +#: pod/playlist/templates/playlist/playlist-videos-list.html +#: pod/video/templates/videos/video_list.html +msgid "Sorry, no video found." +msgstr "Désolé, aucune vidéo trouvée." -#: pod/playlist/templates/playlist/playlist_list.html -msgid "Launch" -msgstr "Lancer" +#: pod/playlist/templates/playlist/playlist.html +#: pod/playlist/templates/playlist/playlist_content.html +#: pod/video/templates/channel/channel.html +#: pod/video/templates/videos/my_videos.html +#: pod/video/templates/videos/videos.html +#: pod/video_search/templates/search/search.html +#, python-format +msgid "%(counter)s video found" +msgid_plural "%(counter)s videos found" +msgstr[0] "%(counter)s vidéo trouvée" +msgstr[1] "%(counter)s vidéos trouvées" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "Sorry, no playlist found" -msgstr "Désolé, aucune liste de lecture trouvée" +#: pod/playlist/templates/playlist/playlist.html +#: pod/playlist/templates/playlist/playlist_content.html +msgid "Playlist videos" +msgstr "Vidéos de la playlist" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -msgid "This content is password protected." -msgstr "Ce contenu est protégé par un mot de passe." +#: pod/playlist/templates/playlist/playlist.html +msgid "Reorganize your favorite videos" +msgstr "Réorganiser vos vidéos favorites" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -msgid "This content is chaptered." -msgstr "Ce contenu est chapitré." +#: pod/playlist/templates/playlist/playlist.html +msgid "Reorganize" +msgstr "Réorganiser" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -#: pod/video/templates/videos/category_modal_card.html -msgid "Video content." -msgstr "Contenu vidéo." +#: pod/playlist/templates/playlist/playlist.html +msgid "Help - Drag & Drop" +msgstr "Aide - Glisser & Déposer" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -#: pod/video/templates/videos/category_modal_card.html -msgid "Audio content." -msgstr "Contenu audio." +#: pod/playlist/templates/playlist/playlist.html +msgid "Select the video to move by clicking and holding." +msgstr "" +"Sélectionnez la vidéo que vous souhaitez en cliquant et maintenant le bouton " +"de la souris." -#: pod/playlist/views.py -msgid "You cannot edit this playlist." -msgstr "Vous ne pouvez éditer cette liste de lecture." +#: pod/playlist/templates/playlist/playlist.html +msgid "While holding down the video, drag it to the desired location." +msgstr "" +"Tout en maintenant le bouton de la souris enfoncé, faites-la glisser à " +"l’endroit que vous souhaitez." -#: pod/playlist/views.py -msgid "You don't have access to this playlist." -msgstr "Vous n’avez pas les droits d’accès à cette liste de lecture." +#: pod/playlist/templates/playlist/playlist.html +msgid "Drop the video on another to swap their position." +msgstr "Déposez la vidéo sur une autre pour échanger leur position." -#: pod/playlist/views.py +#: pod/playlist/templates/playlist/playlist_card.html pod/video/models.py +msgid "videos" +msgstr "vidéos" + +#: pod/playlist/templates/playlist/playlist_card.html +#: pod/playlist/templates/playlist/playlist_player.html +msgid "Playlist image" +msgstr "Image de la playlist" + +#: pod/playlist/templates/playlist/playlist_link.html +msgid "Remove the playlist" +msgstr "Supprimer la liste de lecture" + +#: pod/playlist/templates/playlist/playlist_player.html +msgid "Playlist:" +msgstr "Liste de lecture :" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Sort" +msgstr "Tri" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Ascending sort" +msgstr "Tri ascendant" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Descending sort" +msgstr "Tri descendant" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Sort Direction" +msgstr "Direction de tri" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +msgid "Modification date" +msgstr "Date de modification" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +msgid "Creation date" +msgstr "Date de création" + +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +msgid "Public and promoted" +msgstr "Public et promu" + +#: pod/playlist/templates/playlist/playlists.html #, python-format -msgid "%(title)s (%(count)d video)" -msgid_plural "%(title)s (%(count)d videos)" -msgstr[0] "%(title)s (%(count)d vidéo)" -msgstr[1] "%(title)s (%(count)d vidéos)" +msgid "%(counter)s playlist found" +msgid_plural "%(counter)s playlists found" +msgstr[0] "%(counter)s liste de lecture trouvée" +msgstr[1] "%(counter)s listes de lecture trouvées" -#: pod/playlist/views.py -msgid "The playlist has been saved!" -msgstr "La liste de lecture a été sauvegardée !" +#: pod/playlist/templates/playlist/playlists.html +msgid "No playlists found" +msgstr "Aucune liste de lecture trouvée" -#: pod/playlist/views.py -msgid "The request is wrong. No video given." -msgstr "La requête est erronée. Aucune vidéo envoyée." +#: pod/playlist/templates/playlist/playlists.html +#, fuzzy +#| msgid "" +#| "You have not created any playlists yet, please use the \"Add a new " +#| "playlist\" button to add one." +msgid "" +"You haven't got any playlist yet, please use the \"Add a playlist\" button " +"to add one." +msgstr "" +"Vous n’avez pas encore créé de liste de lecture, veuillez cliquer sur le " +"bouton « Ajouter une nouvelle liste de lecture » pour en ajouter une." -#: pod/playlist/views.py -msgid "Only ajax request are accepted for this action." -msgstr "Uniquement les requêtes ajax sont autorisées pour cette action." +#: pod/playlist/templates/playlist/protected-playlist-form.html +msgid "Protected playlist form" +msgstr "Formulaire de liste de lecture protégée" -#: pod/playlist/views.py -msgid "This video has been removed from your playlist." -msgstr "Cette vidéo a été retirée de votre liste de lecture." +#: pod/playlist/templates/playlist/protected-playlist-form.html +msgid "This playlist is protected by password, please fill in and click send." +msgstr "" +"Cet évènement est protégée par un mot de passe, veuillez remplir le " +"formulaire et cliquez sur envoyer." -#: pod/playlist/views.py -msgid "The playlist have been saved." -msgstr "La liste de lecture a été sauvegardée." +#: pod/playlist/templates/playlist/protected-playlist-form.html +#: pod/video/templates/videos/video-form.html +msgid "If you do not have the password for this content, please" +msgstr "Si vous n’avez pas le mot de passe pour ce contenu, veuillez" -#: pod/playlist/views.py -msgid "The video has been added to your playlist." -msgstr "La vidéo a été ajoutée à votre liste de lecture." +#: pod/playlist/templates/playlist/protected-playlist-form.html +#: pod/video/templates/videos/video-form.html +msgid "contact its owner" +msgstr "contacter son propriétaire" + +#: pod/playlist/templatetags/favorites_playlist.py +msgid "Favorites" +msgstr "Favoris" + +#: pod/playlist/tests/test_forms.py +#, fuzzy +#| msgid "Title field is required" +msgid "This field is required." +msgstr "Champ de titre est requis" + +#: pod/playlist/tests/test_forms.py +msgid "You cannot create a playlist named \"Favorites\"" +msgstr "Vous ne pouvez créer une liste de lecture nommé \"Favoris\"" #: pod/playlist/views.py -msgid "This playlist has been deleted." +msgid "The playlist has been deleted." msgstr "Cette liste de lecture a été supprimée." +#: pod/playlist/views.py +msgid "The playlist has been created and the video has been added in it." +msgstr "La liste de lecture a été créée et la vidéo a été ajoutée dedans." + #: pod/podfile/apps.py msgid "Pod files" msgstr "Fichiers Pod" @@ -5798,7 +5954,7 @@ msgstr "Partager avec quelqu’un" #: pod/podfile/templates/podfile/home_content.html msgid "Already shared with:" -msgstr "Déjà partagé avec :" +msgstr "Déjà partagé avec :" #: pod/podfile/templates/podfile/home_content.html msgid "Username" @@ -6181,8 +6337,8 @@ msgstr "Prévisualisation d’enregistrement" #: pod/video/templates/videos/video-element.html msgid "" "To view this video please enable JavaScript, and consider upgrading to a web " -"browser that supports HTML5 video" +"browser that supports HTML5 video" msgstr "" "Pour visionner cette vidéo, veuillez activer JavaScript et envisager de " "passer à un navigateur Web qui un nouvel enregistrement a été ajouté sur la plateforme " "%(title_site)s à partir de l’enregistreur \"%(recorder)s\".
    Pour " -"l’ajouter, cliquez sur le lien ci dessous.

    %(link_url)s
    Si le lien n’est pas actif, il " -"faut le copier-coller dans la barre d’adresse de votre navigateur.

    Cordialement

    " +"l’ajouter, cliquez sur le lien ci dessous.

    " +"%(link_url)s
    Si le lien n’est pas actif, il faut le copier-coller " +"dans la barre d’adresse de votre navigateur.

    Cordialement

    " #: pod/recorder/views.py msgid "New recording added." @@ -6278,6 +6433,246 @@ msgstr "L’enregistrement a été supprimé." msgid "Recorder for Studio not found." msgstr "Enregistreur studio non trouvé." +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Number of themes" +msgstr "Nombre de thèmes" + +#: pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of channels" +msgstr "Nombre de chaînes" + +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Graph of video evolution for the channel " +msgstr "Graphique de l'évolution des vidéos de la chaîne " + +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Breakdown of video status for the channel " +msgstr "Répartition des statuts des vidéos pour la chaîne " + +#: pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/playlist-stats-view.html pod/stats/views.py +msgid "Statistics for playlists" +msgstr "Statistiques des listes de lecture" + +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Breakdown of channels visibility status " +msgstr "Répartition des statuts de visibilité des chaînes " + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Duration time of videos" +msgstr "Durée des vidéos" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Most popular discipline" +msgstr "Discipline la plus populaire" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "No popular discipline" +msgstr "Aucune discipline populaire" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Most popular video type" +msgstr "Type de vidéo le plus populaire" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "No popular video type" +msgstr "Aucun type de vidéo populaire" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Number of users" +msgstr "Nombre d'utilisateurs" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Statistics of videos" +msgstr "Statistiques des videos" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Graph of video evolution for " +msgstr "Graphique de l'évolution de " + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Breakdown of video status for " +msgstr "Répartition des statuts des vidéos de " + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Playlist playback time" +msgstr "Temps de lecture de la liste de lecture" + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Playlist video statistics" +msgstr "Statistiques des vidéos de la liste de lecture" + +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Graph of video evolution " +msgstr "Graphique de l'évolution des vidéos " + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Breakdown of video status for the playlist " +msgstr "Répartition des statuts des vidéos pour la liste de lecture " + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Breakdown of playlists visibilities for " +msgstr "Répartition des statuts de visibilité pour la liste de lecture " + +#: pod/stats/templates/stats/user-stats-view.html +msgid "My statistics" +msgstr "Mes statistiques" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of files" +msgstr "Nombre de fichiers" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of videos added in favorites" +msgstr "Nombre de vidéos ajoutées en favoris" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of meetings" +msgstr "Nombre de réunions" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Prefered discipline" +msgstr "Discipline préférée" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "No prefered discipline" +msgstr "Pas de discipline préférée" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Prefered type" +msgstr "Type préféré" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "No prefered type" +msgstr "Pas de type préféré" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Statistics of your videos" +msgstr "Statistiques de vos vidéos" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Graph of video evolution for the user " +msgstr "Graphique de l'évolution des vidéos de l'utilisateur " + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Breakdown of video status for the user " +msgstr "Répartition des statuts des vidéos pour l'utilisateur " + +#: pod/stats/templates/stats/utils/pie-chart.html +#: pod/stats/templates/stats/utils/video-stats.html +#: pod/stats/templates/stats/utils/years-video-stats.html +msgid "Export to CSV" +msgstr "Exporter au format CSV" + +#: pod/stats/templates/stats/utils/years-video-stats.html +msgid "Start year" +msgstr "Année de début" + +#: pod/stats/templates/stats/utils/years-video-stats.html +msgid "End year" +msgstr "Année de fin" + +#: pod/stats/templates/stats/video-stats-view.html pod/video/apps.py +#: pod/video/models.py pod/video/templates/videos/videos.html +msgid "Videos" +msgstr "Vidéos" + +#: pod/stats/templates/stats/video-stats-view.html +#: pod/video/templates/videos/video-info.html +msgid "Number of favorites" +msgstr "Nombre de favoris" + +#: pod/stats/templates/stats/video-stats-view.html +#: pod/video/templates/videos/video-info.html +msgid "Addition in a playlist" +msgstr "Nombre d'ajouts dans une liste de lecture" + +#: pod/stats/templates/stats/video-stats-view.html +#: pod/video/templates/videos/video-info.html +msgid "Number of views" +msgstr "Nombre de vues" + +#: pod/stats/templates/stats/video-stats-view.html +msgid "Graphics of videos" +msgstr "Graphiques des vidéos" + +#: pod/stats/templates/stats/video-stats-view.html +msgid "Graph of video evolution of " +msgstr "Graphique de l'évolution des vidéos de " + +#: pod/stats/templates/stats/video-stats-view.html +msgid "Breakdown of video status " +msgstr "Répartition des statuts des vidéos " + +#: pod/stats/views.py +#, python-format +msgid "Video statistics: %s" +msgstr "Statistiques des vidéos : %s" + +#: pod/stats/views.py +msgid "Site video statistics" +msgstr "Statistiques des vidéo du site" + +#: pod/stats/views.py +#, python-format +msgid "Video statistics for the theme %s" +msgstr "Statistiques des vidéos du thème %s" + +#: pod/stats/views.py +#, python-format +msgid "Video statistics for the channel %s" +msgstr "Statistiques des vidéos de la chaîne %s" + +#: pod/stats/views.py +msgid "Statistics for channels" +msgstr "Statistiques des chaînes" + +#: pod/stats/views.py +#, python-format +msgid "Statistics for user %s" +msgstr "Statistiques de l'utilisateur %s" + +#: pod/stats/views.py +msgid "Site statistics" +msgstr "Statistiques du site" + +#: pod/stats/views.py +#, python-format +msgid "Statistics for the playlist %s" +msgstr "Statistiques de la liste de lecture %s" + +#: pod/stats/views.py pod/video/templates/videos/videos.html +msgid "Video statistics" +msgstr "Statistiques des vidéos" + +#: pod/stats/views.py +#, python-format +msgid "The following video does not exist: %s" +msgstr "La video suivante n’existe pas : %s" + +#: pod/stats/views.py +#, fuzzy, python-format +#| msgid "You do not have access rights to this video: %s " +msgid "You do not have access rights to this video: %s" +msgstr "Vous n’avez pas les droits d’accès à cette vidéo : %s " + +#: pod/stats/views.py +#, python-format +msgid "Statistics for the meeting %s" +msgstr "Statistiques de la réunion %s" + +#: pod/stats/views.py +msgid "Statistics for meetings" +msgstr "Statistiques des réunions" + #: pod/urls.py msgid "Pod Administration" msgstr "Administration de Pod" @@ -6294,11 +6689,6 @@ msgstr "Définir comme brouillon" msgid "Transcript selected" msgstr "Transcription selectionnée" -#: pod/video/apps.py pod/video/models.py pod/video/templates/videos/video.html -#: pod/video/templates/videos/videos.html -msgid "Videos" -msgstr "Vidéos" - #: pod/video/forms.py msgid "File field" msgstr "Fichier" @@ -6597,8 +6987,8 @@ msgid "" "%(url)s

    \n" msgstr "" "vous pouvez changer la date de suppression en éditant votre vidéo :

    \n" -"

    %(scheme)s:%(url)s

    \n" +"

    " +"%(scheme)s:%(url)s

    \n" "\n" #: pod/video/management/commands/check_obsolete_videos.py @@ -6726,12 +7116,6 @@ msgstr "Privé (moi seulement)" msgid "Shared with video owner" msgstr "Partagé avec le propriétaire de la vidéo" -#: pod/video/models.py -#: pod/video/templates/videos/video_note_comments_display.html -#: pod/video/templates/videos/video_note_display.html -msgid "Public" -msgstr "Public" - #: pod/video/models.py #, python-format msgid "%(app)s version" @@ -6758,6 +7142,10 @@ msgstr "" msgid "The style will be added to your channel to show it" msgstr "Le style sera ajouté à votre chaîne" +#: pod/video/models.py +msgid "Visible" +msgstr "Visible" + #: pod/video/models.py msgid "" "If checked, the channel appear in a list of available channels on the " @@ -6836,10 +7224,6 @@ msgstr "Est une vidéo" msgid "Date to delete" msgstr "Date de suppression" -#: pod/video/models.py -msgid "videos" -msgstr "vidéos" - #: pod/video/models.py msgid "Sum of view" msgstr "Somme des vues" @@ -6979,9 +7363,12 @@ msgid "Show view statistics for all videos in this theme" msgstr "Afficher les statistiques de vue pour toutes les vidéos de ce thème" #: pod/video/templates/channel/channel.html -#: pod/video/templates/videos/videos.html -msgid "Statistics views" -msgstr "Statistiques de vues" +msgid "Theme statistics" +msgstr "Statistiques du thème" + +#: pod/video/templates/channel/channel.html +msgid "Channel statistics" +msgstr "Statistiques de la chaîne" #: pod/video/templates/channel/channel.html #: pod/video/templates/videos/videos.html @@ -7174,6 +7561,24 @@ msgstr "" msgid "Help for form fields" msgstr "Aide pour les champs de formulaire" +#: pod/video/templates/videos/card.html +msgid "This content is password protected." +msgstr "Ce contenu est protégé par un mot de passe." + +#: pod/video/templates/videos/card.html +msgid "This content is chaptered." +msgstr "Ce contenu est chapitré." + +#: pod/video/templates/videos/card.html +#: pod/video/templates/videos/category_modal_card.html +msgid "Video content." +msgstr "Contenu vidéo." + +#: pod/video/templates/videos/card.html +#: pod/video/templates/videos/category_modal_card.html +msgid "Audio content." +msgstr "Contenu audio." + #: pod/video/templates/videos/category_modal.html msgid "category title" msgstr "titre catégorie" @@ -7265,6 +7670,10 @@ msgstr "Dernières vidéos" msgid "Show all videos" msgstr "Afficher toutes les vidéos" +#: pod/video/templates/videos/link_video.html +msgid "Remove from playlist" +msgstr "Retirer de la liste de lecture" + #: pod/video/templates/videos/link_video.html #: pod/video/templates/videos/video-info.html msgid "Remove from favorite" @@ -7326,21 +7735,13 @@ msgid "" "This video is chaptered. Click the chapter button on the video player to view them." msgstr "" -"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre sur le lecteur vidéo pour les voir." +"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre sur le lecteur vidéo pour les voir." #: pod/video/templates/videos/video-all-info.html msgid "Other versions" msgstr "Autre version" -#: pod/video/templates/videos/video-all-info.html -msgid "Add the video to a playlist" -msgstr "Ajouter une vidéo à une liste de lecture" - -#: pod/video/templates/videos/video-all-info.html -msgid "Add current video to this playlist" -msgstr "Ajouter la vidéo à cette liste de lecture" - #: pod/video/templates/videos/video-comment.html msgid "Comments have been disabled for this video." msgstr "Les commentaires ont été désactivés pour cette vidéo." @@ -7381,26 +7782,18 @@ msgstr "" "Cette vidéo est protégée par un mot de passe, veuillez le fournir et cliquez " "sur envoyer." -#: pod/video/templates/videos/video-form.html -msgid "If you do not have the password for this content, please" -msgstr "Si vous n’avez pas le mot de passe pour ce contenu, veuillez" - -#: pod/video/templates/videos/video-form.html -msgid "contact its owner" -msgstr "contacter son propriétaire" - #: pod/video/templates/videos/video-info.html msgid "Duration:" msgstr "Durée :" -#: pod/video/templates/videos/video-info.html -msgid "Number of views" -msgstr "Nombre de vues" - #: pod/video/templates/videos/video-info.html msgid "Show details of view statistics" msgstr "Afficher les details des statistiques de visualisation" +#: pod/video/templates/videos/video-info.html +msgid "Add the video to a playlist" +msgstr "Ajouter une vidéo à une liste de lecture" + #: pod/video/templates/videos/video-info.html msgid "Downloads" msgstr "Téléchargements" @@ -7493,10 +7886,6 @@ msgstr "" msgid "Options" msgstr "Options" -#: pod/video/templates/videos/video-info.html -msgid "Autoplay" -msgstr "Lecture automatique" - #: pod/video/templates/videos/video-info.html msgid "Check the box to autoplay the video." msgstr "Cocher cette case pour lancer la lecture automatiquement." @@ -7713,29 +8102,9 @@ msgstr "Télécharger les notes" msgid "New note" msgstr "Nouvelle note" -#: pod/video/templates/videos/video_sort_select.html -msgid "Sort" -msgstr "Tri" - -#: pod/video/templates/videos/video_sort_select.html -msgid "Ascending sort" -msgstr "Tri ascendant" - -#: pod/video/templates/videos/video_sort_select.html -msgid "Descending sort" -msgstr "Tri descendant" - -#: pod/video/templates/videos/video_sort_select.html -msgid "Sort Direction" -msgstr "Direction de tri" - -#: pod/video/templates/videos/video_stats_view.html -msgid "Change the date" -msgstr "Modifier la période de visualisation" - #: pod/video/templates/videos/videos.html -msgid "Show view statistics for all videos" -msgstr "Afficher les statistiques de visualisation de toutes les vidéos" +msgid "Show general statistics" +msgstr "Afficher les statistiques générales" #: pod/video/templatetags/video_tags.py #, python-format @@ -7916,35 +8285,6 @@ msgstr "Horodatage de la note" msgid "You cannot access to this view." msgstr "Vous ne pouvez pas accéder à cette vue." -#: pod/video/views.py -msgid "Pod video viewing statistics" -msgstr "Statistiques de visualisation des vidéos" - -#: pod/video/views.py -#, python-format -msgid "Video viewing statistics for %s" -msgstr "Statistiques de visualisation de la vidéo %s" - -#: pod/video/views.py -#, python-format -msgid "Video viewing statistics for the channel %s" -msgstr "Statistiques de visualisation des vidéos de la chaîne %s" - -#: pod/video/views.py -#, python-format -msgid "Video viewing statistics for the theme %s" -msgstr "Statistiques de visualisation des vidéos du thème %s" - -#: pod/video/views.py -#, python-format -msgid "You do not have access rights to this video: %s " -msgstr "Vous n’avez pas les droits d’accès à cette vidéo : %s " - -#: pod/video/views.py -#, python-format -msgid "The following video does not exist: %s" -msgstr "La video suivante n’existe pas : %s" - #: pod/video/views.py msgid "Media upload" msgstr "Téléverser un média" @@ -8142,7 +8482,7 @@ msgstr "Vous la/le retrouverez ici :" #: pod/video_encode_transcript/utils.py msgid "the:" -msgstr "le :" +msgstr "le:" #: pod/video_search/apps.py msgid "Video search" @@ -8172,6 +8512,133 @@ msgstr "Résultats de la recherche" msgid "Esup-Pod xAPI" msgstr "xAPI Esup-Pod" +#~ msgid "Video statistics for %s" +#~ msgstr "Statistiques des vidéos pour %s" + +#, fuzzy +#~| msgid "Password-protected" +#~ msgid "protected" +#~ msgstr "Protégé par un mot de passe" + +#~ msgid "Prefered video discipline" +#~ msgstr "Discipline de vidéo préférée" + +#~ msgid "Prefered video type" +#~ msgstr "Type de vidéo préféré" + +#~ msgid "Show view statistics for all videos" +#~ msgstr "Afficher les statistiques de visualisation de toutes les vidéos" + +#~ msgid "Pod video viewing statistics" +#~ msgstr "Statistiques de visualisation des vidéos" + +#~ msgid "Please choose a password if this playlist is protected." +#~ msgstr "Veuillez choisir un mot de passe si cette playlist est protégée." + +#~ msgid "Password-protected playlist" +#~ msgstr "Liste de lecture protégée par un mot de passe" + +#~ msgid "Sort by descending rank before you can rearrange" +#~ msgstr "Trier par ordre décroissant avant de pouvoir réorganiser" + +#~ msgid "Sort by descending rank" +#~ msgstr "Trier par ordre décroissant" + +#~ msgid "" +#~ "If checked, the playlist can be visible to users other than the owner." +#~ msgstr "" +#~ "Si coché, cette liste de lecture sera visible aux autres utilisateurs." + +#~ msgid "Position of the video in a playlist." +#~ msgstr "Position de la vidéo dans la liste de lecture." + +#~ msgid "A video in draft mode cannot be added to a playlist." +#~ msgstr "" +#~ "Une vidéo en mode brouillon ne peut être ajoutée à une liste de lecture." + +#~ msgid "A video with a password cannot be added to a playlist." +#~ msgstr "" +#~ "Une vidéo avec mot de passe ne peut être ajoutée à une liste de lecture." + +#~ msgid "" +#~ "This is the page of your playlists. Here you can create, edit or delete " +#~ "them." +#~ msgstr "" +#~ "C’est la page de vos listes de lecture. Ici vous pouvez les créer, les " +#~ "éditer ou les supprimer." + +#~ msgid "" +#~ "A playlist with the eye symbol means that this playlist is visible to all " +#~ "users when they view this page." +#~ msgstr "" +#~ "Une liste de lecture avec un symbole œil signifie que cette liste est " +#~ "visible à tous les utilisateurs qui visiteront cette page." + +#~ msgid "This playlist has no videos yet." +#~ msgstr "Cette liste de lecture ne dispose pas encore de vidéos." + +#~ msgid "Switch to next video automatically" +#~ msgstr "Passer automatiquement à la prochaine vidéo" + +#~ msgid "Thumbnail" +#~ msgstr "Vignette" + +#~ msgid "Video thumbnail" +#~ msgstr "Vignette de la vidéo" + +#~ msgid "Move up" +#~ msgstr "Déplacer vers le haut" + +#~ msgid "Move down" +#~ msgstr "Déplacer vers le bas" + +#~ msgid "Save position" +#~ msgstr "Enregistrer les positions" + +#~ msgid "This playlist is visible to all users." +#~ msgstr "Cette liste de lecture est visible à d’autres utilisateurs." + +#~ msgid "This playlist is only visible by you." +#~ msgstr "Vous seul pouvez voir cette liste de lecture." + +#~ msgid "Launch" +#~ msgstr "Lancer" + +#~ msgid "Sorry, no playlist found" +#~ msgstr "Désolé, aucune liste de lecture trouvée" + +#~ msgid "You don't have access to this playlist." +#~ msgstr "Vous n’avez pas les droits d’accès à cette liste de lecture." + +#~ msgid "%(title)s (%(count)d video)" +#~ msgid_plural "%(title)s (%(count)d videos)" +#~ msgstr[0] "%(title)s (%(count)d vidéo)" +#~ msgstr[1] "%(title)s (%(count)d vidéos)" + +#~ msgid "The playlist has been saved!" +#~ msgstr "La liste de lecture a été sauvegardée !" + +#~ msgid "The request is wrong. No video given." +#~ msgstr "La requête est erronée. Aucune vidéo envoyée." + +#~ msgid "Only ajax request are accepted for this action." +#~ msgstr "Uniquement les requêtes ajax sont autorisées pour cette action." + +#~ msgid "This video has been removed from your playlist." +#~ msgstr "Cette vidéo a été retirée de votre liste de lecture." + +#~ msgid "The playlist have been saved." +#~ msgstr "La liste de lecture a été sauvegardée." + +#~ msgid "The video has been added to your playlist." +#~ msgstr "La vidéo a été ajoutée à votre liste de lecture." + +#~ msgid "Add current video to this playlist" +#~ msgstr "Ajouter la vidéo à cette liste de lecture" + +#~ msgid "Change the date" +#~ msgstr "Modifier la période de visualisation" + #~ msgid "Error in %s: " #~ msgstr "Erreur sur %s : " diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.mo b/pod/locale/fr/LC_MESSAGES/djangojs.mo index f312842499..1dfe5ecbae 100644 Binary files a/pod/locale/fr/LC_MESSAGES/djangojs.mo and b/pod/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index 97a51c94ec..b7719f36ea 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-05 15:50+0200\n" +"POT-Creation-Date: 2023-08-21 08:32+0000\n" "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: \n" @@ -20,24 +20,18 @@ msgstr "" msgid "Get time from the player" msgstr "Obtenir le temps du lecteur" -#: pod/chapter/static/js/chapters.js pod/enrichment/static/js/enrichment.js -#: pod/main/static/js/main.js pod/video/static/js/comment-script.js -msgid "Close" -msgstr "Fermer" - #: pod/chapter/static/js/chapters.js pod/completion/static/js/completion.js -#: pod/enrichment/static/js/enrichment.js pod/playlist/static/js/playlist.js +#: pod/enrichment/static/js/enrichment.js msgid "Error getting form." msgstr "Erreur lors de la récupération du formulaire." #: pod/chapter/static/js/chapters.js pod/completion/static/js/completion.js -#: pod/enrichment/static/js/enrichment.js pod/playlist/static/js/playlist.js +#: pod/enrichment/static/js/enrichment.js msgid "The form could not be recovered." msgstr "Le formulaire ne peut pas être récupéré." #: pod/chapter/static/js/chapters.js pod/completion/static/js/completion.js #: pod/enrichment/static/js/enrichment.js pod/main/static/js/main.js -#: pod/playlist/static/js/playlist.js #: pod/podfile/static/podfile/js/filewidget.js msgid "You are no longer authenticated. Please log in again." msgstr "Vous n’êtes plus authentifié. Veuillez vous reconnecter." @@ -176,16 +170,6 @@ msgstr "Veuillez entrer un texte pour le segment compris entre %s et %s :" msgid "Pause to enter caption for segment from %s to %s." msgstr "Mettez en pause pour entrer le texte du segment entre %s et %s." -#: pod/completion/static/js/caption_maker.js -#: pod/podfile/static/podfile/js/filewidget.js -msgid "Add" -msgstr "Ajouter" - -#: pod/completion/static/js/caption_maker.js -#: pod/video/static/js/comment-script.js -msgid "Delete" -msgstr "Supprimer" - #: pod/completion/static/js/caption_maker.js msgid "Caption" msgstr "Légende / Sous-titre" @@ -292,6 +276,11 @@ msgstr "Veuillez sélectionner un document" msgid "Iframe and Script tags are not allowed." msgstr "Les balises Iframe et Script ne sont pas autorisées." +#: pod/enrichment/static/js/enrichment.js pod/main/static/js/main.js +#: pod/video/static/js/comment-script.js +msgid "Close" +msgstr "Fermer" + #: pod/enrichment/static/js/enrichment.js msgid "Please enter a correct start from 0 to " msgstr "Veuillez entrer un correct temps de début compris entre 0 et " @@ -384,34 +373,6 @@ msgstr "Ouvrir le gestionnaire de diapositives" msgid "Enrich mode" msgstr "Mode enrichi" -#: pod/favorite/static/js/favorite-reorganize.js -msgid "Save your reorganization" -msgstr "Sauvegarder votre réorganisation" - -#: pod/favorite/static/js/favorite-reorganize.js -msgid "Save" -msgstr "Sauvegarder" - -#: pod/favorite/static/js/video-favorites-card-delete.js -msgid "The video could not be removed from favorites..." -msgstr "Le formulaire ne peut pas être récupéré." - -#: pod/favorite/static/js/video-favorites-card-list.js -msgid "Remove from favorite" -msgstr "Retirer des favoris" - -#: pod/favorite/static/js/video-favorites-card-list.js -msgid "Add in favorite" -msgstr "Ajouter aux favoris" - -#: pod/favorite/static/js/video-favorites-card-list.js -msgid "The deletion couldn't be completed..." -msgstr "La suppression n’a pas pu se faire..." - -#: pod/favorite/static/js/video-favorites.js -msgid "The favorite couldn’t be completed…" -msgstr "Le favori n’a pas pu être complété…" - #: pod/live/static/js/admin_broadcaster.js msgid "An error occurred" msgstr "Une erreur est survenue." @@ -440,6 +401,14 @@ msgstr "Pas de diffuseur pour ce bâtiment" msgid "An error occurred during broadcasters loading..." msgstr "Une erreur s’est produite lors du chargement des diffuseurs…" +#: pod/main/static/js/filter-aside-element-list-refresh.js +msgid "Descending sort" +msgstr "Tri descendant" + +#: pod/main/static/js/filter-aside-element-list-refresh.js +msgid "Ascending sort" +msgstr "Tri ascendant" + #: pod/main/static/js/main.js msgid "User not found" msgstr "Utilisateur non trouvé" @@ -498,41 +467,34 @@ msgstr "" "Cette extension de fichier n’est pas présente dans les extensions " "autorisées :" -#: pod/playlist/static/js/playlist.js -msgid "Position saved" -msgstr "Position enregistrée" +#: pod/playlist/static/playlist/js/add-or-edit.js +msgid "Public: the playlist can be accessed by anyone." +msgstr "Public : la liste de lecture est accessible par tous." -#: pod/playlist/static/js/playlist.js -msgid "Error deleting video from playlist. The video could not be deleted." -msgstr "" -"Erreur lors de la suppression de la vidéo de la liste de lecture. La vidéo " -"n’a pas pu être retirée." - -#: pod/playlist/static/js/playlist.js -msgid "Error deleting playlist. The playlist could not be deleted." +#: pod/playlist/static/playlist/js/add-or-edit.js +msgid "" +"Password-protected: the playlist can be accessed by anyone with the " +"appropriate link and password." msgstr "" -"Erreur lors de la suppression. La liste de lecture n’a pas pu être supprimée." +"Protégé par un mot de passe : la liste de lecture est accessible à " +"toute personne disposant du lien et du mot de passe appropriés." -#: pod/playlist/static/js/playlist.js -msgid "The video can not be added from this page." -msgstr "La vidéo ne peut être ajoutée depuis cette page." +#: pod/playlist/static/playlist/js/add-or-edit.js +msgid "Private: only you have access to this playlist." +msgstr "Privé : vous seul avez accès à cette liste de lecture." -#: pod/playlist/static/js/playlist.js -msgid "The video slug not found." -msgstr "La trace (slug) de la vidéo est introuvable." +#: pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js +#: pod/video/static/js/filter_aside_video_list_refresh.js +msgid "An Error occurred while processing." +msgstr "Une erreur est survenue durant l’exécution du processus." -#: pod/playlist/static/js/playlist.js -msgid "" -"Error getting video information. The video information could not be " -"retrieved." -msgstr "" -"Erreur lors de l’obtention des informations sur la vidéo. Les informations " -"vidéo n’ont pas pu être récupérées." +#: pod/playlist/static/playlist/js/playlist-reorganize.js +msgid "Save your reorganization" +msgstr "Sauvegarder votre réorganisation" -#: pod/podfile/static/podfile/js/filewidget.js -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" -msgstr "Chargement en cours…" +#: pod/playlist/static/playlist/js/playlist-reorganize.js +msgid "Save" +msgstr "Sauvegarder" #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" @@ -562,6 +524,10 @@ msgstr "Retirer" msgid "Server error" msgstr "Erreur du serveur" +#: pod/podfile/static/podfile/js/filewidget.js +msgid "Add" +msgstr "Ajouter" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Are you sure you want to delete this folder?" msgstr "Êtes-vous sûr(e) de vouloir supprimer ce dossier ?" @@ -574,10 +540,48 @@ msgstr "Voir plus" msgid "This folder is empty" msgstr "Ce dossier est vide" +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Views" +msgstr "Vues" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Favorites" +msgstr "Favoris" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Playlist additions" +msgstr "Ajouts dans une liste de lecture" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Date" +msgstr "Date" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Value" +msgstr "Valeur" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Playlists_addition" +msgstr "Ajouts_liste_de_lecture" + +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Years" +msgstr "Années" + #: pod/video/static/js/change_video_owner.js msgid "No element found" msgstr "Aucun élément trouvé" +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "Chargement en cours…" + #: pod/video/static/js/change_video_owner.js msgid "An error occurred during the change of owner" msgstr "Une erreur s’est produite lors du changement de propriétaire" @@ -595,40 +599,21 @@ msgid "Answers" msgstr "Réponses" #: pod/video/static/js/comment-script.js -msgid "Cancel" -msgstr "Annuler" +msgid "Delete" +msgstr "Supprimer" #: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "%s vote" -msgstr[1] "%s votes" +msgid "Cancel" +msgstr "Annuler" #: pod/video/static/js/comment-script.js msgid "Agree with the comment" msgstr "D’accord avec ce commentaire" -#: pod/video/static/js/comment-script.js -msgid "Reply to comment" -msgstr "Répondre au commentaire" - -#: pod/video/static/js/comment-script.js -msgid "Reply" -msgstr "Répondre" - #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "Supprimer ce commentaire" -#: pod/video/static/js/comment-script.js -msgid "Add a public comment" -msgstr "Ajouter un commentaire public" - -#: pod/video/static/js/comment-script.js -msgid "Send" -msgstr "Envoyer" - #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "Afficher les réponses" @@ -641,6 +626,13 @@ msgstr "Mauvaise réponse du serveur." msgid "Sorry, you're not allowed to vote by now." msgstr "Désolé, vous n’êtes pas autorisé à voter maintenant." +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "%s vote" +msgstr[1] "%s votes" + #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "Désolé, vous ne pouvez pas commenter cette vidéo maintenant." @@ -660,60 +652,39 @@ msgid_plural "%s comments" msgstr[0] "%s commentaire" msgstr[1] "%s commentaires" -#: pod/video/static/js/filter_aside_video_list_refresh.js -msgid "Descending sort" -msgstr "Tri descendant" - -#: pod/video/static/js/filter_aside_video_list_refresh.js -msgid "Ascending sort" -msgstr "Tri ascendant" - -#: pod/video/static/js/filter_aside_video_list_refresh.js -msgid "An Error occurred while processing." -msgstr "Une erreur est survenue durant l’exécution du processus." - #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "Ce contenu est protégé par mot de passe." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "Ce contenu est chapitré." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "Ce contenu est en brouillon." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Video content." msgstr "Contenu vidéo." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "Contenu audio." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "Éditer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "Compléter la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "Chapitrer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "Supprimer la vidéo" @@ -774,18 +745,6 @@ msgstr "Désolé, aucune vidéo trouvée" msgid "Edit the category" msgstr "Éditer la catégorie" -#: pod/video/static/js/video_category.js -msgid "Delete the category" -msgstr "Supprimer la catégorie" - -#: pod/video/static/js/video_category.js -msgid "Success!" -msgstr "Succès !" - -#: pod/video/static/js/video_category.js -msgid "Error…" -msgstr "Erreur…" - #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "Catégorie créée avec succès" @@ -802,45 +761,115 @@ msgstr "Créer catégorie" msgid "Select the general type of the video." msgstr "Sélectionnez le type général de vidéo." -#: pod/video/static/js/video_stats_view.js -msgid "Title" -msgstr "Titre" +#~ msgid "Playlists addition" +#~ msgstr "Ajouts dans une liste de lecture" + +#~ msgid "Date,Views,Favorites" +#~ msgstr "Date,Vues,Favoris" + +#~ msgid "Years,Views,Favorites" +#~ msgstr "Années,Vues,Favoris" + +#~ msgid "Title" +#~ msgstr "Titre" + +#~ msgid "Playlist additions during the month" +#~ msgstr "Ajouts dans une liste de lecture durant le mois" + +#~ msgid "Playlist additions during the year" +#~ msgstr "Ajouts dans une liste de lecture durant l’année" + +#~ msgid "Total Playlist additions from creation" +#~ msgstr "Ajouts en liste de lecture total depuis la création" + +#~ msgid "Favorite additions during the day" +#~ msgstr "Ajouts en favoris de la journée" + +#~ msgid "View during the day" +#~ msgstr "Vue de la journée" + +#~ msgid "View during the month" +#~ msgstr "Vue du mois" + +#~ msgid "View during the year" +#~ msgstr "Vue de l’année" + +#~ msgid "Total view from creation" +#~ msgstr "Vue totale depuis création" + +#~ msgid "Favorite additions during the month" +#~ msgstr "Ajouts en favoris du mois" + +#~ msgid "Favorite additions during the year" +#~ msgstr "Ajouts en favoris de l’année" + +#~ msgid "Total favorite additions from creation" +#~ msgstr "Ajouts en favoris total depuis la création" + +#~ msgid "Slug" +#~ msgstr "Titre court" + +#~ msgid "Reply to comment" +#~ msgstr "Répondre au commentaire" + +#~ msgid "Reply" +#~ msgstr "Répondre" + +#~ msgid "Add a public comment" +#~ msgstr "Ajouter un commentaire public" + +#~ msgid "Send" +#~ msgstr "Envoyer" + +#~ msgid "Delete the category" +#~ msgstr "Supprimer la catégorie" + +#~ msgid "Success!" +#~ msgstr "Succès !" + +#~ msgid "Error…" +#~ msgstr "Erreur…" + +#~ msgid "The video could not be removed from favorites..." +#~ msgstr "Le formulaire ne peut pas être récupéré." + +#~ msgid "Remove from favorite" +#~ msgstr "Retirer des favoris" -#: pod/video/static/js/video_stats_view.js -msgid "View during the day" -msgstr "Vue de la journée" +#~ msgid "Add in favorite" +#~ msgstr "Ajouter aux favoris" -#: pod/video/static/js/video_stats_view.js -msgid "View during the month" -msgstr "Vue du mois" +#~ msgid "The deletion couldn't be completed..." +#~ msgstr "La suppression n’a pas pu se faire..." -#: pod/video/static/js/video_stats_view.js -msgid "View during the year" -msgstr "Vue de l’année" +#~ msgid "The favorite couldn’t be completed…" +#~ msgstr "Le favori n’a pas pu être complété…" -#: pod/video/static/js/video_stats_view.js -msgid "Total view from creation" -msgstr "Vue totale depuis création" +#~ msgid "The video can not be added from this page." +#~ msgstr "La vidéo ne peut être ajoutée depuis cette page." -#: pod/video/static/js/video_stats_view.js -msgid "Favorite additions during the day" -msgstr "Ajouts en favoris de la journée" +#~ msgid "The video slug not found." +#~ msgstr "La trace (slug) de la vidéo est introuvable." -#: pod/video/static/js/video_stats_view.js -msgid "Favorite additions during the month" -msgstr "Ajouts en favoris du mois" +#~ msgid "" +#~ "Error getting video information. The video information could not be " +#~ "retrieved." +#~ msgstr "" +#~ "Erreur lors de l’obtention des informations sur la vidéo. Les " +#~ "informations vidéo n’ont pas pu être récupérées." -#: pod/video/static/js/video_stats_view.js -msgid "Favorite additions during the year" -msgstr "Ajouts en favoris de l’année" +#~ msgid "Position saved" +#~ msgstr "Position enregistrée" -#: pod/video/static/js/video_stats_view.js -msgid "Total favorite additions from creation" -msgstr "Ajouts en favoris total depuis la création" +#~ msgid "Error deleting video from playlist. The video could not be deleted." +#~ msgstr "" +#~ "Erreur lors de la suppression de la vidéo de la liste de lecture. La " +#~ "vidéo n’a pas pu être retirée." -#: pod/video/static/js/video_stats_view.js -msgid "Slug" -msgstr "Titre court" +#~ msgid "Error deleting playlist. The playlist could not be deleted." +#~ msgstr "" +#~ "Erreur lors de la suppression. La liste de lecture n’a pas pu être " +#~ "supprimée." #~ msgid "Are you sure you want to delete this element?" #~ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet élément ?" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 60c672637a..45a00be645 100644 --- a/pod/locale/nl/LC_MESSAGES/django.po +++ b/pod/locale/nl/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-05 15:50+0200\n" +"POT-Creation-Date: 2023-08-21 08:32+0000\n" "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -101,8 +101,6 @@ msgid "Picture" msgstr "" #: pod/authentication/models.py pod/live/models.py pod/meeting/models.py -#: pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_element_list.html #: pod/podfile/models.py pod/video/admin.py pod/video/models.py #: pod/video_search/templates/search/search.html msgid "Owner" @@ -180,8 +178,7 @@ msgstr "" #: pod/main/templates/navbar.html pod/main/templates/navbar_collapse.html #: pod/meeting/templates/meeting/add_or_edit.html #: pod/meeting/templates/meeting/my_meetings.html -#: pod/playlist/templates/playlist/playlist_video_list.html -#: pod/playlist/templates/playlist_player-iframe.html +#: pod/playlist/templates/playlist/playlist-list-modal.html #: pod/podfile/templates/podfile/customfilewidget.html #: pod/podfile/templates/podfile/home_content.html #: pod/podfile/templates/podfile/userfolder.html @@ -210,6 +207,9 @@ msgstr "" #: pod/meeting/templates/meeting/delete.html #: pod/meeting/templates/meeting/invite.html #: pod/meeting/templates/meeting/join.html pod/meeting/views.py +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/delete.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/playlist/views.py pod/recorder/templates/recorder/add_recording.html #: pod/recorder/templates/recorder/record_delete.html pod/recorder/views.py #: pod/video/templates/channel/channel_edit.html @@ -238,7 +238,9 @@ msgstr "" #: pod/meeting/templates/meeting/delete.html #: pod/meeting/templates/meeting/invite.html #: pod/meeting/templates/meeting/join.html -#: pod/playlist/templates/playlist/playlist_video_list.html +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/delete.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/recorder/templates/recorder/add_recording.html #: pod/recorder/templates/recorder/record_delete.html #: pod/video/templates/channel/channel_edit.html @@ -350,8 +352,8 @@ msgstr "" msgid "URL of the recording thumbnail of the BBB presentation." msgstr "" -#: pod/bbb/models.py pod/favorite/models.py pod/import_video/models.py -#: pod/meeting/models.py pod/recorder/models.py +#: pod/bbb/models.py pod/import_video/models.py pod/meeting/models.py +#: pod/playlist/models.py pod/recorder/models.py msgid "User" msgstr "" @@ -372,6 +374,7 @@ msgid "Meeting" msgstr "" #: pod/bbb/models.py pod/meeting/apps.py +#: pod/stats/templates/stats/meeting-stats-view.html msgid "Meetings" msgstr "" @@ -413,7 +416,7 @@ msgstr "" #: pod/bbb/models.py pod/import_video/models.py pod/live/forms.py #: pod/live/models.py pod/meeting/forms.py pod/meeting/models.py -#: pod/video_search/forms.py +#: pod/stats/templates/stats/utils/video-stats.html pod/video_search/forms.py msgid "Start date" msgstr "" @@ -422,7 +425,7 @@ msgid "Start date of the live." msgstr "" #: pod/bbb/models.py pod/live/forms.py pod/live/models.py -#: pod/video_search/forms.py +#: pod/stats/templates/stats/utils/video-stats.html pod/video_search/forms.py msgid "End date" msgstr "" @@ -698,8 +701,7 @@ msgstr "" #: pod/bbb/templates/bbb/live_record_list.html #: pod/bbb/templates/bbb/record_list.html -#: pod/favorite/templates/favorite/favorite_video_list.html -#: pod/playlist/templates/playlist/playlist_list.html +#: pod/playlist/templates/playlist/playlist-videos-list.html #: pod/recorder/templates/recorder/record_list.html #: pod/video/templates/videos/video_list.html msgid "More" @@ -707,9 +709,8 @@ msgstr "" #: pod/bbb/templates/bbb/live_record_list.html #: pod/bbb/templates/bbb/record_list.html -#: pod/favorite/templates/favorite/favorite_video_list.html #: pod/live/templates/live/events_list.html pod/main/templates/loader.html -#: pod/playlist/templates/playlist/playlist_list.html +#: pod/playlist/templates/playlist/playlist-videos-list.html #: pod/podfile/templates/podfile/home_content.html #: pod/podfile/templates/podfile/list_folder_files.html #: pod/recorder/templates/recorder/record_list.html @@ -766,7 +767,8 @@ msgid "File to import" msgstr "" #: pod/chapter/models.py pod/completion/models.py pod/enrichment/models.py -#: pod/video/models.py pod/video_encode_transcript/utils.py +#: pod/playlist/templates/playlist/playlist_card.html pod/video/models.py +#: pod/video_encode_transcript/utils.py msgid "video" msgstr "" @@ -775,7 +777,8 @@ msgstr "" msgid "title" msgstr "titel" -#: pod/chapter/models.py pod/enrichment/models.py pod/video/models.py +#: pod/chapter/models.py pod/enrichment/models.py pod/playlist/models.py +#: pod/video/models.py msgid "slug" msgstr "" @@ -835,7 +838,7 @@ msgstr "" #: pod/enrichment/templates/enrichment/group_enrichment.html #: pod/import_video/templates/import_video/add_or_edit.html #: pod/meeting/templates/meeting/add_or_edit.html -#: pod/playlist/templates/playlist.html +#: pod/playlist/templates/playlist/add_or_edit.html #: pod/recorder/templates/recorder/add_recording.html #: pod/video/templates/channel/channel_edit.html #: pod/video/templates/channel/form_theme.html @@ -851,7 +854,7 @@ msgstr "" #: pod/completion/templates/overlay/form_overlay.html #: pod/completion/templates/track/form_track.html #: pod/enrichment/templates/enrichment/form_enrichment.html -#: pod/favorite/templates/favorite/favorite_videos.html +#: pod/playlist/templates/playlist/playlist.html #: pod/video/templates/channel/form_theme.html #: pod/video/templates/videos/category_modal.html #: pod/video/templates/videos/video_note_comments_display.html @@ -877,7 +880,6 @@ msgstr "" #: pod/completion/templates/overlay/list_overlay.html #: pod/enrichment/templates/enrichment/list_enrichment.html pod/live/models.py #: pod/main/models.py pod/main/views.py pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_element_list.html #: pod/video/models.py pod/video/templates/channel/list_theme.html #: pod/video/templates/videos/video_sort_select.html msgid "Title" @@ -889,7 +891,6 @@ msgstr "Titel" #: pod/completion/templates/overlay/list_overlay.html #: pod/completion/templates/track/list_track.html #: pod/enrichment/templates/enrichment/list_enrichment.html -#: pod/playlist/templates/playlist/playlist_element_list.html #: pod/video/templates/channel/list_theme.html msgid "Actions" msgstr "" @@ -920,7 +921,7 @@ msgstr "" #: pod/enrichment/templates/enrichment/list_enrichment.html #: pod/live/templates/live/event_delete.html #: pod/meeting/templates/meeting/delete.html -#: pod/playlist/templates/playlist.html +#: pod/playlist/templates/playlist/delete.html #: pod/recorder/templates/recorder/record_delete.html #: pod/video/templates/channel/list_theme.html #: pod/video/templates/videos/category_modal.html @@ -1116,9 +1117,9 @@ msgstr "" msgid "There is already a contributor with the same name and role in the list." msgstr "" -#: pod/completion/models.py pod/enrichment/models.py pod/favorite/models.py -#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py -#: pod/video_encode_transcript/models.py +#: pod/completion/models.py pod/enrichment/models.py pod/playlist/models.py +#: pod/recorder/models.py pod/video/models.py +#: pod/video/templates/videos/video.html pod/video_encode_transcript/models.py msgid "Video" msgstr "" @@ -1126,7 +1127,7 @@ msgstr "" #: pod/completion/templates/document/list_document.html #: pod/enrichment/models.py #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html pod/podfile/models.py +#: pod/podfile/models.py msgid "Document" msgstr "" @@ -1250,8 +1251,7 @@ msgstr "" msgid "left" msgstr "" -#: pod/completion/models.py pod/live/models.py pod/playlist/models.py -#: pod/video/models.py +#: pod/completion/models.py pod/live/models.py pod/video/models.py msgid "Slug" msgstr "" @@ -1272,8 +1272,6 @@ msgid "Content" msgstr "" #: pod/completion/models.py pod/completion/templates/overlay/list_overlay.html -#: pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_element_list.html msgid "Position" msgstr "" @@ -1415,7 +1413,6 @@ msgid "Remove the subtitle or caption files" msgstr "" #: pod/completion/templates/track/list_track.html -#: pod/playlist/templates/playlist/playlist_element_list.html msgid "Remove" msgstr "" @@ -1731,6 +1728,7 @@ msgid "Total video duration" msgstr "" #: pod/cut/templates/video_cut.html +#: pod/playlist/templates/playlist/filter_aside.html #: pod/video/templates/videos/filter_aside.html msgid "Reset" msgstr "" @@ -1851,7 +1849,7 @@ msgstr "" #: pod/enrichment/models.py #: pod/enrichment/templates/enrichment/video_enrichment.html pod/main/models.py -#: pod/playlist/templates/playlist_player.html pod/podfile/models.py +#: pod/podfile/models.py msgid "Image" msgstr "" @@ -1861,7 +1859,6 @@ msgstr "" #: pod/enrichment/models.py #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Richtext" msgstr "" @@ -1998,8 +1995,6 @@ msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment-iframe.html #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player-iframe.html -#: pod/playlist/templates/playlist_player.html msgid "Enriched" msgstr "" @@ -2009,27 +2004,22 @@ msgid "Added by" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Informations" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "To help you, the different types of enrichments have specific colors:" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Weblink" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "Embed" msgstr "" #: pod/enrichment/templates/enrichment/video_enrichment.html -#: pod/playlist/templates/playlist_player.html msgid "They are visible on the video playback bar." msgstr "" @@ -2037,82 +2027,6 @@ msgstr "" msgid "You cannot enrich this video." msgstr "" -#: pod/favorite/apps.py pod/favorite/models.py -msgid "Favorite videos" -msgstr "" - -#: pod/favorite/models.py pod/recorder/models.py pod/video/models.py -#: pod/video/templates/videos/video_sort_select.html -msgid "Date added" -msgstr "" - -#: pod/favorite/models.py pod/video/templates/videos/video_sort_select.html -msgid "Rank" -msgstr "" - -#: pod/favorite/models.py -msgid "Favorite video" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_video_list.html -#: pod/video/templates/videos/video_list.html -msgid "Sorry, no video found." -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -#: pod/video/templates/channel/channel.html -#: pod/video/templates/videos/my_videos.html -#: pod/video/templates/videos/videos.html -#: pod/video_search/templates/search/search.html -#, python-format -msgid "%(counter)s video found" -msgid_plural "%(counter)s videos found" -msgstr[0] "" -msgstr[1] "" - -#: pod/favorite/templates/favorite/favorite_videos.html -#: pod/favorite/tests/test_views.py pod/favorite/views.py -#: pod/main/templates/navbar.html -msgid "My favorite videos" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Reorganize your favorite videos" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Reorganize" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Sort by descending rank before you can rearrange" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Sort by descending rank" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Help - Drag & Drop" -msgstr "" - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Select the video to move by clicking and holding." -msgstr "Sélectionnez la vidéo à déplacer en cliquant et en maintenant." - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "While holding down the video, drag it to the desired location." -msgstr "" -"Tout en maintenant la vidéo, faites-la glisser vers l'emplacement souhaité." - -#: pod/favorite/templates/favorite/favorite_videos.html -msgid "Drop the video on another to swap their position." -msgstr "Déposez la vidéo sur une autre pour échanger leur position." - -#: pod/favorite/tests/test_views.py pod/video/templates/videos/video-info.html -msgid "Number of favorites" -msgstr "" - #: pod/import_video/apps.py msgid "Import External Video" msgstr "" @@ -2302,6 +2216,7 @@ msgstr "" #: pod/live/templates/live/filter_aside.html #: pod/meeting/templates/meeting/filter_aside.html #: pod/meeting/templates/meeting/filter_aside_recording.html +#: pod/playlist/templates/playlist/filter_aside.html #: pod/video/templates/videos/filter_aside.html msgid "Filters" msgstr "" @@ -2348,6 +2263,7 @@ msgstr "" #: pod/import_video/templates/import_video/list.html pod/main/forms.py #: pod/meeting/forms.py pod/meeting/templates/meeting/internal_recordings.html +#: pod/playlist/templates/playlist/playlist_sort_select.html #: pod/podfile/models.py pod/podfile/templates/podfile/home_content.html #: pod/video_encode_transcript/models.py msgid "Name" @@ -2484,8 +2400,8 @@ msgstr "" #: pod/import_video/views.py #, python-format msgid "" -"This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" +"This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" msgstr "" #: pod/import_video/views.py @@ -2627,7 +2543,8 @@ msgstr "" msgid "An event is already planned at these dates" msgstr "" -#: pod/live/forms.py pod/meeting/forms.py pod/video/forms.py +#: pod/live/forms.py pod/meeting/forms.py pod/playlist/forms.py +#: pod/playlist/models.py pod/video/forms.py msgid "Password" msgstr "" @@ -2643,8 +2560,8 @@ msgstr "" msgid "Broadcaster device" msgstr "" -#: pod/live/forms.py pod/meeting/forms.py pod/recorder/forms.py -#: pod/video/forms.py +#: pod/live/forms.py pod/meeting/forms.py pod/playlist/forms.py +#: pod/recorder/forms.py pod/video/forms.py msgid "I agree" msgstr "" @@ -2769,7 +2686,9 @@ msgid "" "information, and format the result using the toolbar." msgstr "" -#: pod/live/models.py pod/meeting/models.py pod/video/forms.py +#: pod/live/models.py pod/meeting/models.py pod/playlist/models.py +#: pod/playlist/templates/playlist/playlist-informations-card.html +#: pod/stats/templates/stats/playlist-stats-view.html pod/video/forms.py #: pod/video/models.py msgid "Additional owners" msgstr "" @@ -2958,8 +2877,7 @@ msgstr "" msgid "Manage broadcaster" msgstr "" -#: pod/live/templates/live/direct.html pod/playlist/templates/playlist.html -#: pod/playlist/templates/playlist/playlist_list.html +#: pod/live/templates/live/direct.html #: pod/video/templates/videos/video_edit.html msgid "Edit" msgstr "" @@ -3030,6 +2948,7 @@ msgid "This event is protected by password, please fill in and click send." msgstr "" #: pod/live/templates/live/event-form.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/video/templates/videos/video-form.html msgid "Password required" msgstr "" @@ -3040,6 +2959,7 @@ msgstr "" #: pod/live/templates/live/filter_aside.html pod/main/templates/contact_us.html #: pod/meeting/templates/meeting/invite.html #: pod/meeting/templates/meeting/join.html +#: pod/playlist/templates/playlist/protected-playlist-form.html #: pod/video/templates/videos/video-form.html #: pod/video_search/templates/search/search.html msgid "Send" @@ -3234,9 +3154,7 @@ msgstr "" msgid "Delete the event" msgstr "" -#: pod/live/templates/live/event_card.html -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html +#: pod/live/templates/live/event_card.html pod/video/templates/videos/card.html msgid "This content is in draft." msgstr "" @@ -3277,6 +3195,7 @@ msgstr "" #: pod/live/templates/live/event_delete.html #: pod/meeting/templates/meeting/delete.html +#: pod/playlist/templates/playlist/delete.html #: pod/recorder/templates/recorder/record_delete.html #: pod/video/templates/videos/video_delete.html msgid "Agree required" @@ -3440,8 +3359,7 @@ msgstr "" msgid "You cannot watch this event." msgstr "" -#: pod/live/views.py pod/playlist/templates/playlist/playlist_video_list.html -#: pod/video/views.py +#: pod/live/views.py pod/playlist/views.py pod/video/views.py msgid "The password is incorrect." msgstr "" @@ -4257,7 +4175,7 @@ msgstr "" msgid "Breadcrumb" msgstr "" -#: pod/main/templates/base.html pod/playlist/templates/playlist_player.html +#: pod/main/templates/base.html msgid "Home" msgstr "" @@ -4313,6 +4231,10 @@ msgstr "" msgid "videos availables" msgstr "" +#: pod/main/templates/footer.html +msgid "See more statistics" +msgstr "" + #: pod/main/templates/mail/mail.html pod/main/templates/mail/mail_sender.html msgid "Hello" msgstr "" @@ -4360,11 +4282,16 @@ msgstr "" msgid "Toggle navigation" msgstr "" -#: pod/main/templates/navbar.html pod/recorder/models.py pod/video/forms.py +#: pod/main/templates/navbar.html pod/recorder/models.py +#: pod/stats/templates/stats/channel-stats-view.html pod/video/forms.py #: pod/video/models.py msgid "Channels" msgstr "" +#: pod/main/templates/navbar.html +msgid "Promoted playlists" +msgstr "" + #: pod/main/templates/navbar.html msgid "Some features are unavailable" msgstr "" @@ -4415,6 +4342,14 @@ msgstr "" msgid "Add your picture" msgstr "" +#: pod/main/templates/navbar.html +msgid "My playlists" +msgstr "" + +#: pod/main/templates/navbar.html pod/playlist/tests/test_views.py +msgid "My favorite videos" +msgstr "" + #: pod/main/templates/navbar.html msgid "Video Record" msgstr "" @@ -4429,11 +4364,6 @@ msgstr "" msgid "My channels" msgstr "" -#: pod/main/templates/navbar.html pod/playlist/templates/my_playlists.html -#: pod/playlist/templates/playlist.html pod/playlist/views.py -msgid "My playlists" -msgstr "" - #: pod/main/templates/navbar.html pod/podfile/templates/podfile/home.html #: pod/podfile/views.py msgid "My files" @@ -4449,6 +4379,29 @@ msgstr "" msgid "Log out" msgstr "Uitloggen" +#: pod/main/templates/navbar.html +msgid "Your statistics" +msgstr "" + +#: pod/main/templates/navbar.html +#: pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Number of videos" +msgstr "" + +#: pod/main/templates/navbar.html +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of playlists" +msgstr "" + +#: pod/main/templates/navbar.html +msgid "See more" +msgstr "" + #: pod/main/templates/navbar_collapse.html #, python-format msgid "%(counter)s Channel" @@ -4464,8 +4417,6 @@ msgstr[0] "" msgstr[1] "" #: pod/main/templates/navbar_collapse.html -#: pod/playlist/templates/playlist/playlist_list.html -#: pod/playlist/templates/playlist/playlist_video_list.html #: pod/video/templates/channel/channel.html #, python-format msgid "%(counter)s video" @@ -4509,9 +4460,7 @@ msgstr "" msgid "Recurring" msgstr "" -#: pod/meeting/forms.py -#: pod/playlist/templates/playlist/playlist_element_list.html -#: pod/video/feeds.py pod/video/models.py +#: pod/meeting/forms.py pod/video/feeds.py pod/video/models.py #: pod/video/templates/videos/video_sort_select.html msgid "Duration" msgstr "" @@ -4565,7 +4514,7 @@ msgstr "" msgid "Record session" msgstr "" -#: pod/meeting/forms.py pod/video/forms.py +#: pod/meeting/forms.py pod/playlist/forms.py pod/video/forms.py msgid "Owner of the video cannot be an additional owner too" msgstr "" @@ -5001,7 +4950,7 @@ msgid "Delete the meeting" msgstr "" #: pod/meeting/templates/meeting/meeting_card.html -msgid "Acces to this meeting is restricted" +msgid "Access to this meeting is restricted" msgstr "" #: pod/meeting/templates/meeting/meeting_card.html @@ -5192,205 +5141,398 @@ msgid "Impossible to create the internal recording" msgstr "" #: pod/playlist/apps.py pod/playlist/models.py +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/delete.html +#: pod/playlist/templates/playlist/playlist.html +#: pod/playlist/templates/playlist/playlists.html +#: pod/playlist/templates/playlist/protected-playlist-form.html +#: pod/playlist/views.py pod/stats/templates/stats/playlist-stats-view.html msgid "Playlists" msgstr "" -#: pod/playlist/models.py -msgid "Short description of the playlist." +#: pod/playlist/apps.py pod/playlist/signals.py +msgid "Your favorites videos." msgstr "" -#: pod/playlist/models.py pod/video/models.py -msgid "Visible" +#: pod/playlist/forms.py +msgid "General informations" +msgstr "" + +#: pod/playlist/forms.py +msgid "Security informations" +msgstr "" + +#: pod/playlist/forms.py pod/playlist/models.py +msgid "Please choose a password if this playlist is password-protected." +msgstr "" + +#: pod/playlist/forms.py pod/playlist/models.py +msgid "Promoted" +msgstr "" + +#: pod/playlist/forms.py pod/playlist/models.py +msgid "" +"Selecting this setting causes your playlist to be promoted on the page " +"listing promoted public playlists. However, if this setting is deactivated, " +"your playlist will still be accessible to everyone.
    For general use, we " +"recommend that you leave this setting disabled." +msgstr "" + +#: pod/playlist/forms.py +#, python-brace-format +msgid "You cannot create a playlist named \"{FAVORITE_PLAYLIST_NAME}\"" +msgstr "" + +#: pod/playlist/forms.py +msgid "Remove playlist cannot be undone" +msgstr "" + +#: pod/playlist/models.py +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +#: pod/playlist/utils.py pod/video/models.py +#: pod/video/templates/videos/video_note_comments_display.html +#: pod/video/templates/videos/video_note_display.html +msgid "Public" msgstr "" #: pod/playlist/models.py -msgid "If checked, the playlist can be visible to users other than the owner." +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +#: pod/playlist/utils.py +msgid "Password-protected" msgstr "" #: pod/playlist/models.py -#: pod/playlist/templates/playlist/playlist_video_list.html -#: pod/playlist/templates/playlist_player.html +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +#: pod/playlist/utils.py +msgid "Private" +msgstr "" + +#: pod/playlist/models.py pod/playlist/tests/test_models.py +#: pod/playlist/views.py pod/video/templates/videos/video.html msgid "Playlist" msgstr "" #: pod/playlist/models.py -msgid "Position of the video in a playlist." +msgid "Please choose a name between 1 and 250 characters." msgstr "" #: pod/playlist/models.py -msgid "Playlist element" +msgid "Please choose a description. This description is empty by default." +msgstr "" + +#: pod/playlist/models.py pod/playlist/templates/playlist/filter_aside.html +#: pod/playlist/templates/playlist/playlist-informations-card.html +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Right of access" msgstr "" #: pod/playlist/models.py -msgid "Playlist elements" +msgid "" +"\n" +" Please chosse a right of access among 'public', 'password-" +"protected', 'private'.\n" +" " msgstr "" -#: pod/playlist/models.py pod/playlist/views.py -msgid "A video in draft mode cannot be added to a playlist." +#: pod/playlist/models.py pod/video/templates/videos/video-info.html +msgid "Autoplay" msgstr "" -#: pod/playlist/models.py pod/playlist/views.py -msgid "A video with a password cannot be added to a playlist." +#: pod/playlist/models.py +msgid "Please choose if this playlist is an autoplay playlist or not." msgstr "" -#: pod/playlist/templates/my_playlists.html -#, python-format -msgid "%(counter)s playlist found" -msgid_plural "%(counter)s playlists found" -msgstr[0] "" -msgstr[1] "" +#: pod/playlist/models.py +msgid "Editable" +msgstr "" -#: pod/playlist/templates/my_playlists.html -msgid "No playlist found" +#: pod/playlist/models.py +msgid "Please choose if this playlist is editable or not." msgstr "" -#: pod/playlist/templates/my_playlists.html -msgid "" -"You have not created any playlists yet, please use the \"Add a new " -"playlist\" button to add one." +#: pod/playlist/models.py +msgid "You can add additional owners to the playlist." msgstr "" -#: pod/playlist/templates/my_playlists.html -#: pod/playlist/templates/playlist.html -#: pod/playlist/templates/playlist/playlist_list.html -#: pod/playlist/tests/test_views.py -msgid "Add a new playlist" +#: pod/playlist/models.py +msgid "Date created" msgstr "" -#: pod/playlist/templates/my_playlists.html -msgid "" -"This is the page of your playlists. Here you can create, edit or delete them." +#: pod/playlist/models.py +msgid "Date updated" msgstr "" -#: pod/playlist/templates/my_playlists.html -msgid "" -"A playlist with the eye symbol means that this playlist is visible to all " -"users when they view this page." +#: pod/playlist/models.py pod/recorder/models.py pod/video/models.py +#: pod/video/templates/videos/video_sort_select.html +msgid "Date added" +msgstr "" + +#: pod/playlist/models.py pod/video/templates/videos/video_sort_select.html +msgid "Rank" +msgstr "" + +#: pod/playlist/models.py +msgid "Playlist content" msgstr "" -#: pod/playlist/templates/playlist.html pod/playlist/tests/test_views.py -msgid "Editing the playlist" +#: pod/playlist/models.py +msgid "Playlist contents" +msgstr "" + +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/playlist_link.html +#: pod/playlist/tests/test_views.py pod/playlist/views.py +msgid "Edit the playlist" +msgstr "" + +#: pod/playlist/templates/playlist/add_or_edit.html +#: pod/playlist/templates/playlist/playlists.html +#: pod/playlist/tests/test_views.py pod/playlist/views.py +msgid "Add a playlist" +msgstr "" + +#: pod/playlist/templates/playlist/button_start_playlist.html +msgid "Start the playlist" msgstr "" -#: pod/playlist/templates/playlist.html -msgid "This playlist has no videos yet." +#: pod/playlist/templates/playlist/delete.html +#, python-format +msgid "Delete the playlist %(name)s" msgstr "" -#: pod/playlist/templates/playlist.html +#: pod/playlist/templates/playlist/delete.html msgid "Back to my playlists" msgstr "" -#: pod/playlist/templates/playlist/player_controls.html -msgid "Repeat the playlist" +#: pod/playlist/templates/playlist/delete.html +msgid "To delete the playlist, please check the box in and click delete." msgstr "" -#: pod/playlist/templates/playlist/player_controls.html -msgid "Switch to next video automatically" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my private playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "List of videos" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my password-protected playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Thumbnail" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my public playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Video thumbnail" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See my playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Move up" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See playlists I can contribute" msgstr "" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Move down" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See all public playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_element_list.html -msgid "Save position" +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See all promoted playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "This playlist is visible to all users." +#: pod/playlist/templates/playlist/filter_aside.html +msgid "See all playlists" msgstr "" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "This playlist is only visible by you." +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Informations about the playlist" msgstr "" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "Launch" +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Last updated on" msgstr "" -#: pod/playlist/templates/playlist/playlist_list.html -msgid "Sorry, no playlist found" +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "at" msgstr "" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -msgid "This content is password protected." +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Playlist owner" msgstr "" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -msgid "This content is chaptered." +#: pod/playlist/templates/playlist/playlist-informations-card.html +msgid "Show statistics for the playlist" msgstr "" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -#: pod/video/templates/videos/category_modal_card.html -msgid "Video content." +#: pod/playlist/templates/playlist/playlist-informations-card.html +#: pod/stats/apps.py pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/meeting-stats-view.html +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Statistics" msgstr "" -#: pod/playlist/templates/playlist/playlist_video_card.html -#: pod/video/templates/videos/card.html -#: pod/video/templates/videos/category_modal_card.html -msgid "Audio content." +#: pod/playlist/templates/playlist/playlist-list-modal.html +msgid "Your playlists" msgstr "" -#: pod/playlist/views.py -msgid "You cannot edit this playlist." +#: pod/playlist/templates/playlist/playlist-list-modal.html +msgid "Add the video in a new playlist" msgstr "" -#: pod/playlist/views.py -msgid "You don't have access to this playlist." +#: pod/playlist/templates/playlist/playlist-management-card.html +msgid "Manage playlist" msgstr "" -#: pod/playlist/views.py +#: pod/playlist/templates/playlist/playlist-videos-list.html +#: pod/video/templates/videos/video_list.html +msgid "Sorry, no video found." +msgstr "" + +#: pod/playlist/templates/playlist/playlist.html +#: pod/playlist/templates/playlist/playlist_content.html +#: pod/video/templates/channel/channel.html +#: pod/video/templates/videos/my_videos.html +#: pod/video/templates/videos/videos.html +#: pod/video_search/templates/search/search.html #, python-format -msgid "%(title)s (%(count)d video)" -msgid_plural "%(title)s (%(count)d videos)" +msgid "%(counter)s video found" +msgid_plural "%(counter)s videos found" msgstr[0] "" msgstr[1] "" -#: pod/playlist/views.py -msgid "The playlist has been saved!" +#: pod/playlist/templates/playlist/playlist.html +#: pod/playlist/templates/playlist/playlist_content.html +msgid "Playlist videos" msgstr "" -#: pod/playlist/views.py -msgid "The request is wrong. No video given." +#: pod/playlist/templates/playlist/playlist.html +msgid "Reorganize your favorite videos" msgstr "" -#: pod/playlist/views.py -msgid "Only ajax request are accepted for this action." +#: pod/playlist/templates/playlist/playlist.html +msgid "Reorganize" msgstr "" -#: pod/playlist/views.py -msgid "This video has been removed from your playlist." +#: pod/playlist/templates/playlist/playlist.html +msgid "Help - Drag & Drop" msgstr "" -#: pod/playlist/views.py -msgid "The playlist have been saved." +#: pod/playlist/templates/playlist/playlist.html +msgid "Select the video to move by clicking and holding." +msgstr "Sélectionnez la vidéo à déplacer en cliquant et en maintenant." + +#: pod/playlist/templates/playlist/playlist.html +msgid "While holding down the video, drag it to the desired location." +msgstr "" +"Tout en maintenant la vidéo, faites-la glisser vers l'emplacement souhaité." + +#: pod/playlist/templates/playlist/playlist.html +msgid "Drop the video on another to swap their position." +msgstr "Déposez la vidéo sur une autre pour échanger leur position." + +#: pod/playlist/templates/playlist/playlist_card.html pod/video/models.py +msgid "videos" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_card.html +#: pod/playlist/templates/playlist/playlist_player.html +msgid "Playlist image" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_link.html +msgid "Remove the playlist" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_player.html +msgid "Playlist:" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Sort" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Ascending sort" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Descending sort" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +#: pod/video/templates/videos/video_sort_select.html +msgid "Sort Direction" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +msgid "Modification date" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_sort_select.html +msgid "Creation date" +msgstr "" + +#: pod/playlist/templates/playlist/playlist_visibility_icon.html +msgid "Public and promoted" +msgstr "" + +#: pod/playlist/templates/playlist/playlists.html +#, python-format +msgid "%(counter)s playlist found" +msgid_plural "%(counter)s playlists found" +msgstr[0] "" +msgstr[1] "" + +#: pod/playlist/templates/playlist/playlists.html +msgid "No playlists found" +msgstr "" + +#: pod/playlist/templates/playlist/playlists.html +msgid "" +"You haven't got any playlist yet, please use the \"Add a playlist\" button " +"to add one." +msgstr "" + +#: pod/playlist/templates/playlist/protected-playlist-form.html +msgid "Protected playlist form" +msgstr "" + +#: pod/playlist/templates/playlist/protected-playlist-form.html +msgid "This playlist is protected by password, please fill in and click send." +msgstr "" + +#: pod/playlist/templates/playlist/protected-playlist-form.html +#: pod/video/templates/videos/video-form.html +msgid "If you do not have the password for this content, please" +msgstr "" + +#: pod/playlist/templates/playlist/protected-playlist-form.html +#: pod/video/templates/videos/video-form.html +msgid "contact its owner" +msgstr "" + +#: pod/playlist/templatetags/favorites_playlist.py +msgid "Favorites" +msgstr "" + +#: pod/playlist/tests/test_forms.py +#, fuzzy +#| msgid "Title field is required" +msgid "This field is required." +msgstr "Titelveld is verplicht" + +#: pod/playlist/tests/test_forms.py +msgid "You cannot create a playlist named \"Favorites\"" msgstr "" #: pod/playlist/views.py -msgid "The video has been added to your playlist." +msgid "The playlist has been deleted." msgstr "" #: pod/playlist/views.py -msgid "This playlist has been deleted." +msgid "The playlist has been created and the video has been added in it." msgstr "" #: pod/podfile/apps.py @@ -5836,8 +5978,8 @@ msgstr "" #: pod/video/templates/videos/video-element.html msgid "" "To view this video please enable JavaScript, and consider upgrading to a web " -"browser that supports HTML5 video" +"browser that supports HTML5 video" msgstr "" #: pod/recorder/templates/recorder/link_record.html @@ -5922,6 +6064,245 @@ msgstr "" msgid "Recorder for Studio not found." msgstr "" +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Number of themes" +msgstr "" + +#: pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of channels" +msgstr "" + +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Graph of video evolution for the channel " +msgstr "" + +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Breakdown of video status for the channel " +msgstr "" + +#: pod/stats/templates/stats/channel-stats-view.html +#: pod/stats/templates/stats/playlist-stats-view.html pod/stats/views.py +msgid "Statistics for playlists" +msgstr "" + +#: pod/stats/templates/stats/channel-stats-view.html +msgid "Breakdown of channels visibility status " +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/user-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Duration time of videos" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Most popular discipline" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "No popular discipline" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Most popular video type" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "No popular video type" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Number of users" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Statistics of videos" +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Graph of video evolution for " +msgstr "" + +#: pod/stats/templates/stats/general-stats-view.html +msgid "Breakdown of video status for " +msgstr "" + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Playlist playback time" +msgstr "" + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Playlist video statistics" +msgstr "" + +#: pod/stats/templates/stats/playlist-stats-view.html +#: pod/stats/templates/stats/video-stats-view.html +msgid "Graph of video evolution " +msgstr "" + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Breakdown of video status for the playlist " +msgstr "" + +#: pod/stats/templates/stats/playlist-stats-view.html +msgid "Breakdown of playlists visibilities for " +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "My statistics" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of files" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of videos added in favorites" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Number of meetings" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Prefered discipline" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "No prefered discipline" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Prefered type" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "No prefered type" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Statistics of your videos" +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Graph of video evolution for the user " +msgstr "" + +#: pod/stats/templates/stats/user-stats-view.html +msgid "Breakdown of video status for the user " +msgstr "" + +#: pod/stats/templates/stats/utils/pie-chart.html +#: pod/stats/templates/stats/utils/video-stats.html +#: pod/stats/templates/stats/utils/years-video-stats.html +msgid "Export to CSV" +msgstr "" + +#: pod/stats/templates/stats/utils/years-video-stats.html +msgid "Start year" +msgstr "" + +#: pod/stats/templates/stats/utils/years-video-stats.html +msgid "End year" +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html pod/video/apps.py +#: pod/video/models.py pod/video/templates/videos/videos.html +msgid "Videos" +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html +#: pod/video/templates/videos/video-info.html +msgid "Number of favorites" +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html +#: pod/video/templates/videos/video-info.html +msgid "Addition in a playlist" +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html +#: pod/video/templates/videos/video-info.html +msgid "Number of views" +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html +msgid "Graphics of videos" +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html +msgid "Graph of video evolution of " +msgstr "" + +#: pod/stats/templates/stats/video-stats-view.html +msgid "Breakdown of video status " +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "Video statistics: %s" +msgstr "" + +#: pod/stats/views.py +msgid "Site video statistics" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "Video statistics for the theme %s" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "Video statistics for the channel %s" +msgstr "" + +#: pod/stats/views.py +msgid "Statistics for channels" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "Statistics for user %s" +msgstr "" + +#: pod/stats/views.py +msgid "Site statistics" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "Statistics for the playlist %s" +msgstr "" + +#: pod/stats/views.py pod/video/templates/videos/videos.html +msgid "Video statistics" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "The following video does not exist: %s" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "You do not have access rights to this video: %s" +msgstr "" + +#: pod/stats/views.py +#, python-format +msgid "Statistics for the meeting %s" +msgstr "" + +#: pod/stats/views.py +msgid "Statistics for meetings" +msgstr "" + #: pod/urls.py msgid "Pod Administration" msgstr "" @@ -5938,11 +6319,6 @@ msgstr "" msgid "Transcript selected" msgstr "" -#: pod/video/apps.py pod/video/models.py pod/video/templates/videos/video.html -#: pod/video/templates/videos/videos.html -msgid "Videos" -msgstr "" - #: pod/video/forms.py msgid "File field" msgstr "" @@ -6300,12 +6676,6 @@ msgstr "" msgid "Shared with video owner" msgstr "" -#: pod/video/models.py -#: pod/video/templates/videos/video_note_comments_display.html -#: pod/video/templates/videos/video_note_display.html -msgid "Public" -msgstr "" - #: pod/video/models.py #, python-format msgid "%(app)s version" @@ -6327,6 +6697,10 @@ msgstr "" msgid "The style will be added to your channel to show it" msgstr "" +#: pod/video/models.py +msgid "Visible" +msgstr "" + #: pod/video/models.py msgid "" "If checked, the channel appear in a list of available channels on the " @@ -6399,10 +6773,6 @@ msgstr "" msgid "Date to delete" msgstr "" -#: pod/video/models.py -msgid "videos" -msgstr "" - #: pod/video/models.py msgid "Sum of view" msgstr "" @@ -6539,8 +6909,11 @@ msgid "Show view statistics for all videos in this theme" msgstr "" #: pod/video/templates/channel/channel.html -#: pod/video/templates/videos/videos.html -msgid "Statistics views" +msgid "Theme statistics" +msgstr "" + +#: pod/video/templates/channel/channel.html +msgid "Channel statistics" msgstr "" #: pod/video/templates/channel/channel.html @@ -6720,6 +7093,24 @@ msgstr "" msgid "Help for form fields" msgstr "" +#: pod/video/templates/videos/card.html +msgid "This content is password protected." +msgstr "" + +#: pod/video/templates/videos/card.html +msgid "This content is chaptered." +msgstr "" + +#: pod/video/templates/videos/card.html +#: pod/video/templates/videos/category_modal_card.html +msgid "Video content." +msgstr "" + +#: pod/video/templates/videos/card.html +#: pod/video/templates/videos/category_modal_card.html +msgid "Audio content." +msgstr "" + #: pod/video/templates/videos/category_modal.html msgid "category title" msgstr "categorie titel" @@ -6811,6 +7202,10 @@ msgstr "" msgid "Show all videos" msgstr "" +#: pod/video/templates/videos/link_video.html +msgid "Remove from playlist" +msgstr "" + #: pod/video/templates/videos/link_video.html #: pod/video/templates/videos/video-info.html msgid "Remove from favorite" @@ -6873,14 +7268,6 @@ msgstr "" msgid "Other versions" msgstr "" -#: pod/video/templates/videos/video-all-info.html -msgid "Add the video to a playlist" -msgstr "" - -#: pod/video/templates/videos/video-all-info.html -msgid "Add current video to this playlist" -msgstr "" - #: pod/video/templates/videos/video-comment.html msgid "Comments have been disabled for this video." msgstr "" @@ -6917,24 +7304,16 @@ msgstr "" msgid "This video is protected by password, please fill in and click send." msgstr "" -#: pod/video/templates/videos/video-form.html -msgid "If you do not have the password for this content, please" -msgstr "" - -#: pod/video/templates/videos/video-form.html -msgid "contact its owner" -msgstr "" - #: pod/video/templates/videos/video-info.html msgid "Duration:" msgstr "" #: pod/video/templates/videos/video-info.html -msgid "Number of views" +msgid "Show details of view statistics" msgstr "" #: pod/video/templates/videos/video-info.html -msgid "Show details of view statistics" +msgid "Add the video to a playlist" msgstr "" #: pod/video/templates/videos/video-info.html @@ -7024,10 +7403,6 @@ msgstr "" msgid "Options" msgstr "" -#: pod/video/templates/videos/video-info.html -msgid "Autoplay" -msgstr "" - #: pod/video/templates/videos/video-info.html msgid "Check the box to autoplay the video." msgstr "" @@ -7236,28 +7611,8 @@ msgstr "" msgid "New note" msgstr "" -#: pod/video/templates/videos/video_sort_select.html -msgid "Sort" -msgstr "" - -#: pod/video/templates/videos/video_sort_select.html -msgid "Ascending sort" -msgstr "" - -#: pod/video/templates/videos/video_sort_select.html -msgid "Descending sort" -msgstr "" - -#: pod/video/templates/videos/video_sort_select.html -msgid "Sort Direction" -msgstr "" - -#: pod/video/templates/videos/video_stats_view.html -msgid "Change the date" -msgstr "" - #: pod/video/templates/videos/videos.html -msgid "Show view statistics for all videos" +msgid "Show general statistics" msgstr "" #: pod/video/templatetags/video_tags.py @@ -7433,35 +7788,6 @@ msgstr "" msgid "You cannot access to this view." msgstr "" -#: pod/video/views.py -msgid "Pod video viewing statistics" -msgstr "" - -#: pod/video/views.py -#, python-format -msgid "Video viewing statistics for %s" -msgstr "" - -#: pod/video/views.py -#, python-format -msgid "Video viewing statistics for the channel %s" -msgstr "" - -#: pod/video/views.py -#, python-format -msgid "Video viewing statistics for the theme %s" -msgstr "" - -#: pod/video/views.py -#, python-format -msgid "You do not have access rights to this video: %s " -msgstr "" - -#: pod/video/views.py -#, python-format -msgid "The following video does not exist: %s" -msgstr "" - #: pod/video/views.py msgid "Media upload" msgstr "" diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.mo b/pod/locale/nl/LC_MESSAGES/djangojs.mo index 6d9a0715fc..e190f09b0b 100644 Binary files a/pod/locale/nl/LC_MESSAGES/djangojs.mo and b/pod/locale/nl/LC_MESSAGES/djangojs.mo differ diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index ee5809d4cc..be526d0581 100644 --- a/pod/locale/nl/LC_MESSAGES/djangojs.po +++ b/pod/locale/nl/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Esup-Pod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-05 15:50+0200\n" +"POT-Creation-Date: 2023-08-21 08:32+0000\n" "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -20,24 +20,18 @@ msgstr "" msgid "Get time from the player" msgstr "" -#: pod/chapter/static/js/chapters.js pod/enrichment/static/js/enrichment.js -#: pod/main/static/js/main.js pod/video/static/js/comment-script.js -msgid "Close" -msgstr "" - #: pod/chapter/static/js/chapters.js pod/completion/static/js/completion.js -#: pod/enrichment/static/js/enrichment.js pod/playlist/static/js/playlist.js +#: pod/enrichment/static/js/enrichment.js msgid "Error getting form." msgstr "" #: pod/chapter/static/js/chapters.js pod/completion/static/js/completion.js -#: pod/enrichment/static/js/enrichment.js pod/playlist/static/js/playlist.js +#: pod/enrichment/static/js/enrichment.js msgid "The form could not be recovered." msgstr "" #: pod/chapter/static/js/chapters.js pod/completion/static/js/completion.js #: pod/enrichment/static/js/enrichment.js pod/main/static/js/main.js -#: pod/playlist/static/js/playlist.js #: pod/podfile/static/podfile/js/filewidget.js msgid "You are no longer authenticated. Please log in again." msgstr "" @@ -161,16 +155,6 @@ msgstr "" msgid "Pause to enter caption for segment from %s to %s." msgstr "" -#: pod/completion/static/js/caption_maker.js -#: pod/podfile/static/podfile/js/filewidget.js -msgid "Add" -msgstr "" - -#: pod/completion/static/js/caption_maker.js -#: pod/video/static/js/comment-script.js -msgid "Delete" -msgstr "" - #: pod/completion/static/js/caption_maker.js msgid "Caption" msgstr "" @@ -273,6 +257,11 @@ msgstr "" msgid "Iframe and Script tags are not allowed." msgstr "" +#: pod/enrichment/static/js/enrichment.js pod/main/static/js/main.js +#: pod/video/static/js/comment-script.js +msgid "Close" +msgstr "" + #: pod/enrichment/static/js/enrichment.js msgid "Please enter a correct start from 0 to " msgstr "" @@ -365,34 +354,6 @@ msgstr "" msgid "Enrich mode" msgstr "" -#: pod/favorite/static/js/favorite-reorganize.js -msgid "Save your reorganization" -msgstr "" - -#: pod/favorite/static/js/favorite-reorganize.js -msgid "Save" -msgstr "" - -#: pod/favorite/static/js/video-favorites-card-delete.js -msgid "The video could not be removed from favorites..." -msgstr "" - -#: pod/favorite/static/js/video-favorites-card-list.js -msgid "Remove from favorite" -msgstr "" - -#: pod/favorite/static/js/video-favorites-card-list.js -msgid "Add in favorite" -msgstr "" - -#: pod/favorite/static/js/video-favorites-card-list.js -msgid "The deletion couldn't be completed..." -msgstr "" - -#: pod/favorite/static/js/video-favorites.js -msgid "The favorite couldn’t be completed…" -msgstr "" - #: pod/live/static/js/admin_broadcaster.js msgid "An error occurred" msgstr "" @@ -419,6 +380,14 @@ msgstr "" msgid "An error occurred during broadcasters loading..." msgstr "" +#: pod/main/static/js/filter-aside-element-list-refresh.js +msgid "Descending sort" +msgstr "" + +#: pod/main/static/js/filter-aside-element-list-refresh.js +msgid "Ascending sort" +msgstr "" + #: pod/main/static/js/main.js msgid "User not found" msgstr "" @@ -475,35 +444,31 @@ msgstr "" msgid "The file extension not in the allowed extension:" msgstr "" -#: pod/playlist/static/js/playlist.js -msgid "Position saved" +#: pod/playlist/static/playlist/js/add-or-edit.js +msgid "Public: the playlist can be accessed by anyone." msgstr "" -#: pod/playlist/static/js/playlist.js -msgid "Error deleting video from playlist. The video could not be deleted." -msgstr "" - -#: pod/playlist/static/js/playlist.js -msgid "Error deleting playlist. The playlist could not be deleted." +#: pod/playlist/static/playlist/js/add-or-edit.js +msgid "" +"Password-protected: the playlist can be accessed by anyone with the " +"appropriate link and password." msgstr "" -#: pod/playlist/static/js/playlist.js -msgid "The video can not be added from this page." +#: pod/playlist/static/playlist/js/add-or-edit.js +msgid "Private: only you have access to this playlist." msgstr "" -#: pod/playlist/static/js/playlist.js -msgid "The video slug not found." +#: pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js +#: pod/video/static/js/filter_aside_video_list_refresh.js +msgid "An Error occurred while processing." msgstr "" -#: pod/playlist/static/js/playlist.js -msgid "" -"Error getting video information. The video information could not be " -"retrieved." +#: pod/playlist/static/playlist/js/playlist-reorganize.js +msgid "Save your reorganization" msgstr "" -#: pod/podfile/static/podfile/js/filewidget.js -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" +#: pod/playlist/static/playlist/js/playlist-reorganize.js +msgid "Save" msgstr "" #: pod/podfile/static/podfile/js/filewidget.js @@ -534,6 +499,10 @@ msgstr "" msgid "Server error" msgstr "" +#: pod/podfile/static/podfile/js/filewidget.js +msgid "Add" +msgstr "" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Are you sure you want to delete this folder?" msgstr "" @@ -546,10 +515,48 @@ msgstr "" msgid "This folder is empty" msgstr "" +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Views" +msgstr "" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Favorites" +msgstr "" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Playlist additions" +msgstr "" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Date" +msgstr "" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Value" +msgstr "" + +#: pod/stats/static/stats/js/video_stats_view.js +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Playlists_addition" +msgstr "" + +#: pod/stats/static/stats/js/video_stats_view_global.js +msgid "Years" +msgstr "" + #: pod/video/static/js/change_video_owner.js msgid "No element found" msgstr "" +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "" + #: pod/video/static/js/change_video_owner.js msgid "An error occurred during the change of owner" msgstr "" @@ -567,40 +574,21 @@ msgid "Answers" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Cancel" -msgstr "" - -#: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "" -msgstr[1] "" - -#: pod/video/static/js/comment-script.js -msgid "Agree with the comment" +msgid "Delete" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Reply to comment" +msgid "Cancel" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Reply" +msgid "Agree with the comment" msgstr "" #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "" -#: pod/video/static/js/comment-script.js -msgid "Add a public comment" -msgstr "" - -#: pod/video/static/js/comment-script.js -msgid "Send" -msgstr "" - #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "" @@ -613,6 +601,13 @@ msgstr "" msgid "Sorry, you're not allowed to vote by now." msgstr "" +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "" +msgstr[1] "" + #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "" @@ -632,60 +627,39 @@ msgid_plural "%s comments" msgstr[0] "" msgstr[1] "" -#: pod/video/static/js/filter_aside_video_list_refresh.js -msgid "Descending sort" -msgstr "" - -#: pod/video/static/js/filter_aside_video_list_refresh.js -msgid "Ascending sort" -msgstr "" - -#: pod/video/static/js/filter_aside_video_list_refresh.js -msgid "An Error occurred while processing." -msgstr "" - #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Video content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "" @@ -745,18 +719,6 @@ msgstr "" msgid "Edit the category" msgstr "" -#: pod/video/static/js/video_category.js -msgid "Delete the category" -msgstr "" - -#: pod/video/static/js/video_category.js -msgid "Success!" -msgstr "" - -#: pod/video/static/js/video_category.js -msgid "Error…" -msgstr "" - #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "" @@ -773,42 +735,5 @@ msgstr "" msgid "Select the general type of the video." msgstr "" -#: pod/video/static/js/video_stats_view.js -msgid "Title" -msgstr "Titel" - -#: pod/video/static/js/video_stats_view.js -msgid "View during the day" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "View during the month" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "View during the year" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "Total view from creation" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "Favorite additions during the day" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "Favorite additions during the month" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "Favorite additions during the year" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "Total favorite additions from creation" -msgstr "" - -#: pod/video/static/js/video_stats_view.js -msgid "Slug" -msgstr "" +#~ msgid "Title" +#~ msgstr "Titel" diff --git a/pod/main/configuration.json b/pod/main/configuration.json index a21dff3f0e..48c7640ad1 100644 --- a/pod/main/configuration.json +++ b/pod/main/configuration.json @@ -1563,10 +1563,76 @@ } }, "playlist": { - "description": {}, - "settings": {}, + "description": { + "en": [ + "Playlist app for the playlist management.", + "Set `USE_PLAYLIST` to True to activate this application." + ], + "fr": [ + "Application Playlist pour la gestion des playlists.", + "Mettre `USE_PLAYLIST` à True pour activer cette application." + ] + }, + "settings": { + "DEFAULT_PLAYLIST_THUMBNAIL": { + "default_value": "/static/playlist/img/default-playlist.svg", + "description": { + "en": [ + "Default image displayed as a poster or thumbnail, used to present the playlist.", + "This image must be located in the `static` directory." + ], + "fr": [ + "Image par défaut affichée comme poster ou vignette, utilisée pour présenter la playlist.", + "Cette image doit se situer dans le répertoire `static`." + ] + }, + "pod_version_end": "", + "pod_version_init": "3.4" + }, + "COUNTDOWN_PLAYLIST_PLAYER": { + "default_value": 0, + "description": { + "en": [ + "Countdown used between each video when playing an autoplay playlist.", + "The coutdown is not present if it at 0." + ], + "fr": [ + "Compte à rebours utilisé entre chaque vidéo lors de la lecture d'une playlist en lecture automatique.", + "Le compte à rebours n'est pas présent s'il est à 0." + ] + }, + "pod_version_end": "", + "pod_version_init": "3.4" + }, + "USE_FAVORITES": { + "default_value": true, + "description": { + "en": [ + "Activation of favorite videos. Allows users to add videos to their favorites." + ], + "fr": [ + "Activation des vidéos favorites. Permet aux utilisateurs d'ajouter des vidéos dans leurs favoris." + ] + }, + "pod_version_end": "", + "pod_version_init": "3.4" + }, + "USE_PLAYLIST": { + "default_value": true, + "description": { + "en": [ + "Activation of playlist. Allows users to add videos in a playlist." + ], + "fr": [ + "Activation des playlist. Permet aux utilisateurs d'ajouter des vidéos dans une playlist." + ] + }, + "pod_version_end": "", + "pod_version_init": "3.4" + } + }, "title": { - "en": "", + "en": "Playlist application configuration", "fr": "Configuration application playlist" } }, @@ -2237,17 +2303,6 @@ "pod_version_end": "", "pod_version_init": "3.1.0" }, - "USE_FAVORITES": { - "default_value": true, - "description": { - "en": [ - "Activation of favorite videos. Allows users to add videos to their favorites." - ], - "fr": [ - "Activation des vidéos favorites. Permet aux utilisateurs d'ajouter des vidéos dans leurs favoris." - ] - } - }, "USE_OBSOLESCENCE": { "default_value": false, "description": { diff --git a/pod/main/rest_router.py b/pod/main/rest_router.py index d5e4c04ddf..d828dd2f67 100644 --- a/pod/main/rest_router.py +++ b/pod/main/rest_router.py @@ -4,13 +4,13 @@ from django.conf.urls import include from pod.authentication import rest_views as authentication_views from pod.video import rest_views as video_views -from pod.playlist import rest_views as playlist_views from pod.main import rest_views as main_views from pod.authentication import rest_views as auth_views from pod.video_encode_transcript import rest_views as encode_views from pod.chapter import rest_views as chapter_views from pod.completion import rest_views as completion_views +from pod.playlist import rest_views as playlist_views from pod.recorder import rest_views as recorder_views from django.conf import settings @@ -45,8 +45,7 @@ router.register(r"playlist_videos", encode_views.PlaylistVideoViewSet) router.register(r"view_count", video_views.ViewCountViewSet) -router.register(r"playlist", playlist_views.PlaylistViewSet) -router.register(r"playlist_element", playlist_views.PlaylistElementViewSet) +router.register(r"playlists", playlist_views.PlaylistViewSet) router.register(r"contributors", completion_views.ContributorViewSet) router.register(r"documents", completion_views.DocumentViewSet) diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css index b648b26b01..5e83d8c8be 100755 --- a/pod/main/static/css/pod.css +++ b/pod/main/static/css/pod.css @@ -537,8 +537,7 @@ tr, margin: .1rem; } -#videos_list .card-header, -.playlist-videos .card-header { +#videos_list .card-header { /*position: absolute; width: 100%; background: var(--color-black-alpha); @@ -1696,3 +1695,9 @@ table .alert.alert-danger.btn.pod-btn-social { z-index: 3000; background-color: var(--pod-background) !important; } + +div.disabled, a.player-element.disabled { + background-image: linear-gradient(45deg, rgba(0, 0, 0, 0.2) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.2) 50%, rgba(0, 0, 0, 0.2) 75%, transparent 75%, transparent); + background-size: 4px 4px; + background-repeat: repeat; +} diff --git a/pod/main/static/js/filter-aside-element-list-refresh.js b/pod/main/static/js/filter-aside-element-list-refresh.js new file mode 100644 index 0000000000..b2c4897460 --- /dev/null +++ b/pod/main/static/js/filter-aside-element-list-refresh.js @@ -0,0 +1,36 @@ +var sortDirectionChars = ["8600", "8599"]; +var sortDirectionTitle = [ + gettext("Descending sort"), + gettext("Ascending sort"), +]; + +/** + * Update arrow char of ascending or descending sort order. + * @param {*} sortDirectionAsc + */ +function updateSortDirectionChar(sortDirectionAsc) { + document.getElementById("sort_direction_label").innerHTML = + "&#" + sortDirectionChars[+sortDirectionAsc].toString(); +} + +/** + * Update title for input sort direction. + * @param {*} sortDirectionAsc + */ +function updateSortDirectionTitle(sortDirectionAsc) { + let newTitle = sortDirectionTitle[+sortDirectionAsc]; + document + .getElementById("sort_direction_label") + .setAttribute("title", newTitle); +} + +/** + * Toggle direction of sort. + */ +function toggleSortDirection() { + document.getElementById("sort_direction").checked = + !document.getElementById("sort_direction").checked; + const direction = document.getElementById("sort_direction").checked; + updateSortDirectionChar(direction); + updateSortDirectionTitle(direction); +} diff --git a/pod/main/static/js/infinite.js b/pod/main/static/js/infinite.js index ad8bc53190..e7bbb365d5 100644 --- a/pod/main/static/js/infinite.js +++ b/pod/main/static/js/infinite.js @@ -101,6 +101,10 @@ class InfiniteLoader { element.innerHTML += html.getElementById("videos_list").innerHTML; this.next_page_number += 1; + const favoritesButtons = document.getElementsByClassName("favorite-btn-link"); + for (let btn of favoritesButtons) { + preventRefreshButton(btn, true); + } } this.callBackAfterLoad(); }); diff --git a/pod/main/templates/footer.html b/pod/main/templates/footer.html index 747017db2f..cf47ec1059 100644 --- a/pod/main/templates/footer.html +++ b/pod/main/templates/footer.html @@ -1,5 +1,6 @@ {% load static %} {% load i18n %} +{% load general_stats %} {% spaceless %}

    @@ -31,6 +32,11 @@

    -

    {{TITLE_SITE}} {% trans "video platform of" %} {{TITLE_ETB}} - {% trans "Release" %} {{VERSION}} - {{VIDEOS_COUNT}} {% trans "videos availables" %} [ {{VIDEOS_DURATION}} ]

    +

    {{TITLE_SITE}} {% trans "video platform of" %} {{TITLE_ETB}} - {% trans "Release" %} {{VERSION}} - {% get_number_videos %} {% trans "videos availables" %} [ {% get_total_time_videos %} ]

    +

    + + {% trans "See more statistics" %} + +

    {% endspaceless %} diff --git a/pod/main/templates/navbar.html b/pod/main/templates/navbar.html index 97241c9381..73256d4a1c 100644 --- a/pod/main/templates/navbar.html +++ b/pod/main/templates/navbar.html @@ -5,6 +5,8 @@ {% get_language_info_list for LANGUAGES as languages %} {% load thumbnail %} {% load navbar %} +{% load user_stats %} +{% load favorites_playlist %}
    {% comment %} diff --git a/pod/main/test_settings.py b/pod/main/test_settings.py index 0f29fbdfe3..8bf1e76897 100644 --- a/pod/main/test_settings.py +++ b/pod/main/test_settings.py @@ -44,6 +44,7 @@ THIRD_PARTY_APPS = ["enrichment", "live"] USE_PODFILE = True USE_FAVORITES = True +USE_PLAYLIST = True USE_STATS_VIEW = True ACCOMMODATION_YEARS = {"faculty": 1} USE_OBSOLESCENCE = True diff --git a/pod/main/tests/test_views.py b/pod/main/tests/test_views.py index 3ddb109ce6..9e4b955918 100644 --- a/pod/main/tests/test_views.py +++ b/pod/main/tests/test_views.py @@ -17,6 +17,9 @@ import tempfile import os import importlib +from pod.playlist.models import Playlist + +from pod.video.models import Type, Video class MainViewsTestCase(TestCase): @@ -203,7 +206,10 @@ def setUp(self): @override_settings(RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY=True) def test_show_video_buttons_admin_restrict(self): - """Test if video buttons present in header for admin if restrict access to staff only.""" + """ + Test if video buttons present in header for admin + if restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="admin") self.client.force_login(self.user) @@ -215,7 +221,10 @@ def test_show_video_buttons_admin_restrict(self): @override_settings(RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY=True) def test_show_video_buttons_staff_restrict(self): - """Test if video buttons present in header for staff if restrict access to staff only.""" + """ + Test if video buttons present in header for staff + if restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="staff") self.client.force_login(self.user) @@ -227,7 +236,10 @@ def test_show_video_buttons_staff_restrict(self): @override_settings(RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY=True) def test_show_video_buttons_student_restrict(self): - """Test if video buttons not present in header for student if restrict access to staff only.""" + """ + Test if video buttons not present in header for student + if restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="student") self.client.force_login(self.user) @@ -239,7 +251,10 @@ def test_show_video_buttons_student_restrict(self): @override_settings(RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY=False) def test_show_video_buttons_admin_not_restrict(self): - """Test if video buttons present in header for admin if not restrict access to staff only.""" + """ + Test if video buttons present in header for admin + if not restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="admin") self.client.force_login(self.user) @@ -251,7 +266,10 @@ def test_show_video_buttons_admin_not_restrict(self): @override_settings(RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY=False) def test_show_video_buttons_staff_not_restrict(self): - """Test if video buttons present in header for staff if not restrict access to staff only.""" + """ + Test if video buttons present in header for staff + if not restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="staff") self.client.force_login(self.user) @@ -263,7 +281,10 @@ def test_show_video_buttons_staff_not_restrict(self): @override_settings(RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY=False) def test_show_video_buttons_student_not_restrict(self): - """Test if video buttons present in header for student if not restrict access to staff only.""" + """ + Test if video buttons present in header for student + if not restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="student") self.client.force_login(self.user) @@ -287,7 +308,10 @@ def setUp(self): @override_settings(RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY=True, USE_MEETING=True) def test_show_meeting_button_admin_restrict(self): - """Test if meeting button present in header for admin if restrict access to staff only.""" + """ + Test if meeting button present in header for admin + if restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="admin") self.client.force_login(self.user) @@ -298,7 +322,10 @@ def test_show_meeting_button_admin_restrict(self): @override_settings(RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY=True, USE_MEETING=True) def test_show_meeting_button_staff_restrict(self): - """Test if meeting button present in header for staff if restrict access to staff only.""" + """ + Test if meeting button present in header for staff + if restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="staff") self.client.force_login(self.user) @@ -309,7 +336,10 @@ def test_show_meeting_button_staff_restrict(self): @override_settings(RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY=True, USE_MEETING=True) def test_show_meeting_button_student_restrict(self): - """Test if meeting button not present in header for student if restrict access to staff only.""" + """ + Test if meeting button not present in header for student + if restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="student") self.client.force_login(self.user) @@ -320,7 +350,10 @@ def test_show_meeting_button_student_restrict(self): @override_settings(RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY=False, USE_MEETING=True) def test_show_meeting_button_admin_not_restrict(self): - """Test if meeting button present in header for admin if not restrict access to staff only.""" + """ + Test if meeting button present in header for admin + if not restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="admin") self.client.force_login(self.user) @@ -331,7 +364,10 @@ def test_show_meeting_button_admin_not_restrict(self): @override_settings(RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY=False, USE_MEETING=True) def test_show_meeting_button_staff_not_restrict(self): - """Test if meeting button present in header for staff if not restrict access to staff only.""" + """ + Test if meeting button present in header for staff + if not restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="staff") self.client.force_login(self.user) @@ -342,7 +378,10 @@ def test_show_meeting_button_staff_not_restrict(self): @override_settings(RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY=False, USE_MEETING=True) def test_show_meeting_button_student_not_restrict(self): - """Test if meeting button not present in header for student if not restrict access to staff only.""" + """ + Test if meeting button not present in header for student + if not restrict access to staff only. + """ importlib.reload(context_processors) self.user = User.objects.get(username="student") self.client.force_login(self.user) @@ -350,3 +389,109 @@ def test_show_meeting_button_student_not_restrict(self): self.assertEqual(response.status_code, 200) self.assertTrue('id="nav-mymeetings"' in response.content.decode()) self.client.logout() + + +class TestNavbar(TestCase): + """Navbar tests case.""" + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up required objects for next tests.""" + self.user = User.objects.create(username="pod", password="pod1234pod") + + @override_settings(USE_FAVORITES=False) + def test_statistics_category_hidden(self): + """Test if statistics are hidden when we don't have stats.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get("/") + + self.assertFalse( + 'id="stats-usermenu"' in response.content.decode(), + "test if statistics section is correctly hidden" + ) + print(" ---> test_statistics_category_hidden ok") + + @override_settings(USE_FAVORITES=False) + def test_statistics_videos(self): + """Test if videos statistics are correctly shown.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + # We create a playlist to show statistics section in usermenu + Playlist.objects.create( + name="public_playlist_user", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + + response = self.client.get("/") + self.assertFalse( + 'id="stats-usermenu-video-count"' in response.content.decode(), + "test if video count paragraph is correctly hidden" + ) + + Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + Video.objects.create( + title="Video2", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + response = self.client.get("/") + self.assertTrue( + '2' in response.content.decode(), + "test if number of videos is correct" + ) + print(" ---> test_statistics_videos ok") + + @override_settings(USE_PLAYLIST=True, USE_FAVORITES=False) + def test_statistics_playlists(self): + """Test if playlists statistics are correctly shown.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + + # We create a video to show statistics section in usermenu + Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + + response = self.client.get("/") + self.assertFalse( + 'id="stats-usermenu-playlist-count"' in response.content.decode(), + "test if video count paragraph is correctly hidden" + ) + + Playlist.objects.create( + name="playlist_1", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + Playlist.objects.create( + name="playlist_2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + response = self.client.get("/") + self.assertTrue( + '2' in response.content.decode(), + "test if number of playlists is correct." + ) + + print(" ---> test_statistics_playlists ok") diff --git a/pod/meeting/static/css/meeting.css b/pod/meeting/static/css/meeting.css index b9fb4d0134..18ed759b0c 100644 --- a/pod/meeting/static/css/meeting.css +++ b/pod/meeting/static/css/meeting.css @@ -4,6 +4,7 @@ .link-meeting { right: 1rem; + border-radius: 0.375rem; } .meeting-text-copied { diff --git a/pod/meeting/templates/meeting/meeting_card.html b/pod/meeting/templates/meeting/meeting_card.html index 64dac800f6..54b264c573 100644 --- a/pod/meeting/templates/meeting/meeting_card.html +++ b/pod/meeting/templates/meeting/meeting_card.html @@ -14,7 +14,7 @@ {% if meeting.is_restricted %} - + {% endif %} @@ -49,7 +49,7 @@ {% trans "Join the meeting" %} {% else %} - + {% trans "Start the meeting" %} {% endif %} diff --git a/pod/meeting/tests/test_views.py b/pod/meeting/tests/test_views.py index e5932dea69..bca1a17a8c 100644 --- a/pod/meeting/tests/test_views.py +++ b/pod/meeting/tests/test_views.py @@ -422,7 +422,7 @@ def test_meeting_join_get_request(self): fetch_redirect_response=True, ) - # Auth user can have acces and ask password + # Auth user can have access and ask password self.user2 = User.objects.get(username="pod2") self.client.force_login(self.user2) url = reverse("meeting:join", kwargs={"meeting_id": newmeeting.meeting_id}) diff --git a/pod/package.json b/pod/package.json index 9ddfaf9757..24eb63fa8e 100644 --- a/pod/package.json +++ b/pod/package.json @@ -20,7 +20,8 @@ "videojs-vtt-thumbnails": "^0.0.13", "videojs-wavesurfer": "^3.8.0", "wavesurfer.js": "^6.1.0", - "waypoints": "^4.0.1" + "waypoints": "^4.0.1", + "chart.js": "^4.3.0" }, "engines": { "yarn": ">= 1.0.0" diff --git a/pod/playlist/admin.py b/pod/playlist/admin.py index 6dd91b2622..2232f83a8c 100644 --- a/pod/playlist/admin.py +++ b/pod/playlist/admin.py @@ -1,76 +1,52 @@ +"""Esup-Pod playlist admin""" from django.contrib import admin -from pod.playlist.models import Playlist -from pod.playlist.models import PlaylistElement -from django.contrib.sites.shortcuts import get_current_site -from django.contrib.auth.models import User -from django.contrib.sites.models import Site -from pod.video.models import Video +from .models import Playlist, PlaylistContent + +@admin.register(Playlist) class PlaylistAdmin(admin.ModelAdmin): + """Playlist admin page.""" + + date_hierarchy = "date_updated" list_display = ( - "title", + "id", + "name", "owner", - "visible", + "visibility", + "date_updated", + "date_created", + "autoplay", ) - list_display_links = ("title",) - list_editable = ("visible",) - ordering = ( - "title", - "id", + list_display_links = ("id", "name") + list_filter = ( + "date_created", + "date_updated", + "visibility", + "autoplay", ) - list_filter = ["visible"] - autocomplete_fields = ["owner"] - search_fields = ["name"] + search_fields = [ + "name", + "owner__username", + "owner__first_name", + "owner__last_name", + ] - def formfield_for_foreignkey(self, db_field, request, **kwargs): - if (db_field.name) == "owner": - kwargs["queryset"] = User.objects.filter( - owner__sites=Site.objects.get_current() - ) - return super().formfield_for_foreignkey(db_field, request, **kwargs) - def get_queryset(self, request): - qs = super().get_queryset(request) - if not request.user.is_superuser: - qs = qs.filter(owner__owner__sites=get_current_site(request)) - return qs +@admin.register(PlaylistContent) +class PlaylistContentAdmin(admin.ModelAdmin): + """PlaylistContent admin page.""" - -admin.site.register(Playlist, PlaylistAdmin) - - -class PlaylistElementAdmin(admin.ModelAdmin): + date_hierarchy = "date_added" list_display = ( + "id", "playlist", "video", - "position", + "date_added", + "rank", ) - list_display_links = ("playlist",) - list_editable = ("position",) - ordering = ( - "playlist__title", - "id", + list_display_links = ("id", ) + list_filter = ( + "video", + "playlist", ) - autocomplete_fields = ["playlist", "video"] - - def get_queryset(self, request): - qs = super().get_queryset(request) - if not request.user.is_superuser: - qs = qs.filter(playlist__owner__owner__sites=get_current_site(request)) - return qs - - def formfield_for_foreignkey(self, db_field, request, **kwargs): - if (db_field.name) == "playlist": - kwargs["queryset"] = Playlist.objects.filter( - owner__owner__sites=Site.objects.get_current() - ) - if (db_field.name) == "video": - kwargs["queryset"] = Video.objects.filter(sites=Site.objects.get_current()) - return super().formfield_for_foreignkey(db_field, request, **kwargs) - - # class Media: - # css = {"all": ("css/pod.css",)} - - -admin.site.register(PlaylistElement, PlaylistElementAdmin) diff --git a/pod/playlist/apps.py b/pod/playlist/apps.py index f7f5a9900c..7a10fbed13 100644 --- a/pod/playlist/apps.py +++ b/pod/playlist/apps.py @@ -1,8 +1,211 @@ from django.apps import AppConfig +from django.db import connection +from django.db.models.signals import pre_migrate, post_migrate from django.utils.translation import gettext_lazy as _ +FAVORITE_PLAYLIST_NAME = "Favorites" + +FAVORITES_DATA = {} +PLAYLIST_INFORMATIONS = {} +PLAYLIST_CONTENTS = {} + class PlaylistConfig(AppConfig): name = "pod.playlist" default_auto_field = "django.db.models.BigAutoField" verbose_name = _("Playlists") + + def ready(self) -> None: + from . import signals # noqa: F401 + pre_migrate.connect(self.save_previous_data, sender=self) + post_migrate.connect(self.send_previous_data, sender=self) + post_migrate.connect(self.remove_previous_favorites_table, sender=self) + + def save_previous_data(self, sender, **kwargs): + """Save previous data from various database tables.""" + self.save_playlists() + if len(PLAYLIST_INFORMATIONS) > 0: + print("PLAYLIST_INFORMATIONS saved %s playlists" % len(PLAYLIST_INFORMATIONS)) + + self.save_playlist_content() + if len(PLAYLIST_CONTENTS) > 0: + print("PLAYLIST_CONTENTS saved %s videos in playlists" % + len(PLAYLIST_CONTENTS)) + + self.save_favorites() + if len(FAVORITES_DATA) > 0: + print("FAVORITES_DATA saved for %s persons" % len(FAVORITES_DATA)) + + def save_favorites(self): + """Save previous data from favorites table.""" + try: + with connection.cursor() as c: + c.execute( + """ + SELECT owner_id, date_added, rank, video_id + FROM favorite_favorite + ORDER BY owner_id + """ + ) + results = c.fetchall() + for res in results: + owner_id = res[0] + data = [res[i] for i in range(1, len(res))] + FAVORITES_DATA.setdefault(owner_id, []).append(data) + except Exception as e: + print(e) + + def execute_query(self, query, mapping_dict): + """ + Execute the given query and populate the mapping dictionary with the results. + + Args: + query (str): The given query to execute + mapping_dict (dict): The dictionary. + """ + try: + with connection.cursor() as c: + c.execute(query) + results = c.fetchall() + for res in results: + id = res[0] + mapping_dict[id] = [res[i] for i in range(1, len(res))] + except Exception as e: + print(e) + pass + + def save_playlists(self): + """Save previous data from playlists table.""" + self.execute_query( + """ + SELECT id, title, description, visible, owner_id + FROM playlist_playlist + ORDER BY id + """, PLAYLIST_INFORMATIONS + ) + + def save_playlist_content(self): + """Save previous data from playlistelement table.""" + self.execute_query( + """ + SELECT id, position, playlist_id, video_id + FROM playlist_playlistelement + ORDER BY id + """, PLAYLIST_CONTENTS + ) + + def send_previous_data(self, sender, **kwargs): + """Send previous data from various database tables.""" + print("Sending datas") + + if len(PLAYLIST_INFORMATIONS) > 0: + self.update_playlists() + + if len(PLAYLIST_CONTENTS) > 0: + self.add_playlists_contents() + + self.create_new_favorites() + + def create_new_favorites(self): + """Create favorites records from existing datas or create favorites playlist.""" + from pod.playlist.models import Playlist, PlaylistContent + from django.utils.translation import gettext_lazy as _ + from django.contrib.auth.models import User + + # Add Favorites playlist for users without favorites + existing_users = User.objects.all() + users_without_favorites = existing_users.exclude(id__in=FAVORITES_DATA.keys()) + for user in users_without_favorites: + Playlist.objects.create( + name=FAVORITE_PLAYLIST_NAME, + description=_("Your favorites videos."), + visibility="private", + autoplay=True, + owner=user, + editable=False + ) + + # Converting previous favorites to new system + for owner_id, data_lists in FAVORITES_DATA.items(): + new_favorites_playlist = Playlist.objects.create( + name=FAVORITE_PLAYLIST_NAME, + description=_("Your favorites videos."), + visibility="private", + autoplay=True, + owner_id=owner_id, + editable=False + ) + + for favorites_datas in data_lists: + date_added, rank, video_id = favorites_datas + PlaylistContent.objects.create( + date_added=date_added, + rank=rank, + playlist=new_favorites_playlist, + video_id=video_id + ) + + print("create_new_favorites --> OK") + + def update_playlists(self): + """Update previous playlist table.""" + from pod.playlist.models import Playlist + + playlists_to_update = [] + + for playlist_id, playlist_datas in PLAYLIST_INFORMATIONS.items(): + title, description, visible, owner_id = playlist_datas + visibility = "private" if visible == 0 else "public" + try: + playlist = Playlist.objects.get(id=playlist_id) + except Playlist.DoesNotExist: + print("playlist not exists") + continue + + playlist.name = title + playlist.description = description + playlist.visibility = visibility + playlist.owner_id = owner_id + playlist.autoplay = True + playlist.editable = True + + playlists_to_update.append(playlist) + + Playlist.objects.bulk_update(playlists_to_update, fields=[ + "name", + "description", + "visibility", + "owner_id", + "autoplay", + "editable" + ]) + print("update_playlists --> OK") + + def add_playlists_contents(self): + """Add playlist content record from existing datas""" + from pod.playlist.models import PlaylistContent + content_list_to_bulk = [] + for content_datas in PLAYLIST_CONTENTS.values(): + position, playlist_id, video_id = content_datas + + content_list_to_bulk.append( + PlaylistContent( + rank=position, + playlist_id=playlist_id, + video_id=video_id + ) + ) + PlaylistContent.objects.bulk_create(content_list_to_bulk, batch_size=1000) + print("add_playlists_contents --> OK") + + def remove_previous_favorites_table(self, sender, **kwargs): + """Remove the previous favorites table.""" + try: + with connection.cursor() as c: + c.execute( + "DROP TABLE favorite_favorite" + ) + except Exception as e: + print(e) + pass + print("Remove previous table : favorite_favorite --> OK") diff --git a/pod/playlist/context_processors.py b/pod/playlist/context_processors.py new file mode 100644 index 0000000000..9a1c115f3a --- /dev/null +++ b/pod/playlist/context_processors.py @@ -0,0 +1,20 @@ +from django.conf import settings as django_settings + +USE_PLAYLIST = getattr(django_settings, "USE_PLAYLIST", True) +USE_FAVORITES = getattr(django_settings, "USE_FAVORITES", True) +DEFAULT_PLAYLIST_THUMBNAIL = getattr( + django_settings, + "DEFAULT_PLAYLIST_THUMBNAIL", + "/static/playlist/img/default-playlist.svg" +) +COUNTDOWN_PLAYLIST_PLAYER = getattr(django_settings, "COUNTDOWN_PLAYLIST_PLAYER", 0) + + +def context_settings(request): + """Return all context settings for playlist app""" + new_settings = {} + new_settings["USE_PLAYLIST"] = USE_PLAYLIST + new_settings["USE_FAVORITES"] = USE_FAVORITES + new_settings["DEFAULT_PLAYLIST_THUMBNAIL"] = DEFAULT_PLAYLIST_THUMBNAIL + new_settings["COUNTDOWN_PLAYLIST_PLAYER"] = COUNTDOWN_PLAYLIST_PLAYER + return new_settings diff --git a/pod/playlist/forms.py b/pod/playlist/forms.py index ff0f4e49d4..29ec18b88f 100644 --- a/pod/playlist/forms.py +++ b/pod/playlist/forms.py @@ -1,16 +1,134 @@ +"""Forms used in playlist application.""" from django import forms -from django.forms.widgets import HiddenInput -from pod.playlist.models import Playlist +from django.core.exceptions import ValidationError +from django.db.models.query import QuerySet +from django.utils.translation import ugettext_lazy as _ + +from pod.main.forms_utils import add_placeholder_and_asterisk +from pod.meeting.forms import AddOwnerWidget + +from .apps import FAVORITE_PLAYLIST_NAME +from .models import Playlist + +general_informations = _('General informations') +security_informations = _('Security informations') class PlaylistForm(forms.ModelForm): - def __init__(self, *args, **kwargs): - super(PlaylistForm, self).__init__(*args, **kwargs) - self.fields["owner"].widget = HiddenInput() - for myField in self.fields: - self.fields[myField].widget.attrs["class"] = "form-control" - self.fields["visible"].widget.attrs["class"] = "form-check-input" + """Form to add or edit a playlist.""" class Meta: + """Meta class.""" model = Playlist - fields = ["title", "description", "visible", "owner"] + exclude = [ + "editable", + "slug", + "owner", + "date_created", + "date_updated", + ] + widgets = { + "additional_owners": AddOwnerWidget, + } + + field_order = [ + "name", + "description", + "visibility", + "promoted", + "password", + "autoplay", + "additional_owners", + ] + password = forms.CharField( + label=_("Password"), + widget=forms.PasswordInput( + attrs={"autocomplete": "off"} + ), + required=False, + help_text=_("Please choose a password if this playlist is password-protected."), + ) + promoted = forms.BooleanField( + label=_("Promoted"), + required=False, + help_text=_("Selecting this setting causes your playlist to be promoted on the page" + + " listing promoted public playlists. However, if this setting is deactivated," + + " your playlist will still be accessible to everyone." + + "
    For general use, we recommend that you leave this setting disabled."), + ) + fieldsets = [ + ( + "general informations", + { + "legend": f" \ + {general_informations}", + "fields": ["name", "description", "autoplay"], + }, + ), + ( + "security informations", + { + "legend": f" \ + {security_informations}", + "fields": ["additional_owners", "visibility", "password", "promoted"], + }, + ), + ] + + def __init__(self, *args, **kwargs) -> None: + """Init method.""" + super(PlaylistForm, self).__init__(*args, **kwargs) + self.fields = add_placeholder_and_asterisk(self.fields) + + def clean_name(self): + """Method to check if the playlist name asked is correct.""" + name = self.cleaned_data["name"] + if name == FAVORITE_PLAYLIST_NAME: + raise forms.ValidationError( + _(f'You cannot create a playlist named "{FAVORITE_PLAYLIST_NAME}"') + ) + return name + + def clean_add_owner(self, cleaned_data): + """Method to check if the owner is correct.""" + if "additional_owners" in cleaned_data.keys() and isinstance( + self.cleaned_data["additional_owners"], QuerySet + ): + playlist_owner = ( + self.instance.owner + if hasattr(self.instance, "owner") + else cleaned_data["owner"] + if "owner" in cleaned_data.keys() + else self.current_user + ) + if ( + playlist_owner + and playlist_owner in self.cleaned_data["additional_owners"].all() + ): + raise ValidationError( + _("Owner of the video cannot be an additional owner too") + ) + + +class PlaylistRemoveForm(forms.Form): + """Form to remove a playlist.""" + agree = forms.BooleanField( + label=_("I agree"), + help_text=_("Remove playlist cannot be undone"), + widget=forms.CheckboxInput(), + ) + + def __init__(self, *args, **kwargs) -> None: + """Init method.""" + super(PlaylistRemoveForm, self).__init__(*args, **kwargs) + self.fields = add_placeholder_and_asterisk(self.fields) + + +class PlaylistPasswordForm(forms.Form): + """Form to access to a password-protected playlist.""" + password = forms.CharField(label=_("Password"), widget=forms.PasswordInput()) + + def __init__(self, *args, **kwargs): + """Init method.""" + super(PlaylistPasswordForm, self).__init__(*args, **kwargs) + self.fields = add_placeholder_and_asterisk(self.fields) diff --git a/pod/playlist/models.py b/pod/playlist/models.py index 6ca1e1b694..431421ecc6 100644 --- a/pod/playlist/models.py +++ b/pod/playlist/models.py @@ -1,45 +1,110 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.db import models -from django.template.defaultfilters import slugify +from django.db.models import Max +from django.utils import timezone from django.utils.translation import ugettext as _ -from pod.video.models import Video +from django.template.defaultfilters import slugify + from pod.main.models import get_nextautoincrement +from pod.video.models import Video +from pod.video.utils import sort_videos_list class Playlist(models.Model): - title = models.CharField(_("Title"), max_length=100, unique=True) + """Playlist model.""" + VISIBILITY_CHOICES = [ + ("public", _("Public")), + ("protected", _("Password-protected")), + ("private", _("Private")) + ] + name = models.CharField( + verbose_name=_("Title"), + max_length=250, + default=_("Playlist"), + help_text=_("Please choose a name between 1 and 250 characters."), + ) + description = models.TextField( + verbose_name=_("Description"), + blank=True, + default="", + help_text=_("Please choose a description. This description is empty by default."), + ) + password = models.TextField( + verbose_name=_("Password"), + blank=True, + default="", + help_text=_("Please choose a password if this playlist is password-protected."), + ) + visibility = models.CharField( + verbose_name=_("Right of access"), + max_length=9, + choices=VISIBILITY_CHOICES, + default="private", + help_text=_( + ''' + Please chosse a right of access among 'public', 'password-protected', 'private'. + ''' + ), + ) + autoplay = models.BooleanField( + verbose_name=_("Autoplay"), + default=True, + help_text=_("Please choose if this playlist is an autoplay playlist or not."), + ) + promoted = models.BooleanField( + verbose_name=_("Promoted"), + default=False, + help_text=_("Selecting this setting causes your playlist to be promoted on the page" + + " listing promoted public playlists. However, if this setting is deactivated," + + " your playlist will still be accessible to everyone." + + "
    For general use, we recommend that you leave this setting disabled."), + ) + editable = models.BooleanField( + verbose_name=_("Editable"), + default=True, + help_text=_("Please choose if this playlist is editable or not."), + ) slug = models.SlugField( - _("Slug"), + _("slug"), unique=True, - max_length=100, + max_length=105, help_text=_( 'Used to access this instance, the "slug" is a short' - + " label containing only letters, numbers, underscore or dash top." + + " label containing only letters, numbers, underscore" + + " or dash top." ), + editable=False, ) - owner = models.ForeignKey(User, verbose_name=_("Owner"), on_delete=models.CASCADE) - description = models.TextField( - _("Description"), - max_length=255, - null=True, + owner = models.ForeignKey(User, verbose_name=_("User"), on_delete=models.CASCADE) + additional_owners = models.ManyToManyField( + User, blank=True, - help_text=_("Short description of the playlist."), + verbose_name=_("Additional owners"), + related_name="owners_playlists", + help_text=_("You can add additional owners to the playlist."), ) - visible = models.BooleanField( - _("Visible"), - default=False, - help_text=_( - "If checked, the playlist can be visible to users other than the owner." - ), + date_created = models.DateTimeField( + verbose_name=_("Date created"), + default=timezone.now, + editable=False, + auto_created=True, + ) + date_updated = models.DateTimeField( + verbose_name=_("Date updated"), + editable=False, + auto_now=True, ) class Meta: - ordering = ["title", "id"] + """Metadata for Playlist model.""" + + ordering = ["name", "owner", "visibility", "date_updated"] + get_latest_by = "date_updated" verbose_name = _("Playlist") verbose_name_plural = _("Playlists") - def save(self, *args, **kwargs): + def save(self, *args, **kwargs) -> None: newid = -1 if not self.id: try: @@ -52,70 +117,69 @@ def save(self, *args, **kwargs): newid = 1 else: newid = self.id - newid = "{0}".format(newid) - self.slug = "{0}-{1}".format(newid, slugify(self.title)) - super(Playlist, self).save(*args, **kwargs) + self.slug = f"{newid}-{slugify(self.name)}" + super().save(*args, **kwargs) - def __str__(self): - return "{0}".format(self.title) + def clean(self) -> None: + if self.visibility == "protected" and not self.password: + raise ValidationError("Password is required for a password-protected playlist.") + if self.visibility != "public": + self.promoted = False - def first(self): - return PlaylistElement.objects.get(playlist=self, position=1) + def __str__(self) -> str: + """Display a playlist as string.""" + return self.slug - def last(self): - last = PlaylistElement.objects.filter(playlist=self).order_by("-position") - if last: - return last[0].position + 1 - else: - return 1 + def get_number_video(self) -> int: + """Get the video number.""" + from .utils import get_number_video_in_playlist + return get_number_video_in_playlist(self) - def videos(self): - videos = list() - elements = PlaylistElement.objects.filter(playlist=self) - for element in elements: - videos.append(element.video) - return videos + def get_first_video(self, request=None) -> Video: + """Get the first video.""" + from .utils import get_video_list_for_playlist, user_can_see_playlist_video + if request is not None: + for video in sort_videos_list(get_video_list_for_playlist(self), "rank"): + if user_can_see_playlist_video(request, video): + return video + return sort_videos_list(get_video_list_for_playlist(self), "rank").first() -class PlaylistElement(models.Model): - playlist = models.ForeignKey( - Playlist, verbose_name=_("Playlist"), on_delete=models.CASCADE - ) +class PlaylistContent(models.Model): + """PlaylistContent model.""" + + playlist = models.ForeignKey(Playlist, verbose_name=_( + "Playlist"), on_delete=models.CASCADE) video = models.ForeignKey(Video, verbose_name=_("Video"), on_delete=models.CASCADE) - position = models.PositiveSmallIntegerField( - _("Position"), - default=1, - help_text=_("Position of the video in a playlist."), + date_added = models.DateTimeField( + verbose_name=_("Date added"), default=timezone.now, editable=False ) + rank = models.IntegerField(verbose_name=_("Rank"), editable=False, default=1) class Meta: - unique_together = ( - "playlist", - "video", - ) - ordering = ["position", "id"] - verbose_name = _("Playlist element") - verbose_name_plural = _("Playlist elements") - - def clean(self): - if self.video.is_draft: - raise ValidationError( - _("A video in draft mode cannot be added to a playlist.") - ) - if self.video.password: - raise ValidationError( - _("A video with a password cannot be added to a playlist.") - ) - - def save(self, *args, **kwargs): - self.full_clean() - return super(PlaylistElement, self).save(*args, **kwargs) - - def delete(self): - elements = PlaylistElement.objects.filter( - playlist=self.playlist, position__gt=self.position - ) - for element in elements: - element.position = element.position - 1 - element.save() - super(PlaylistElement, self).delete() + """Metadata for PlaylistContent model.""" + + constraints = [ + # A video cannot be twice in a playlist. + models.UniqueConstraint( + fields=["playlist", "video"], name="unique_playlist_video" + ), + ] + + ordering = ["playlist", "rank"] + get_latest_by = "rank" + verbose_name = _("Playlist content") + verbose_name_plural = _("Playlist contents") + + def save(self, *args, **kwargs) -> None: + try: + last_rank = PlaylistContent.objects.filter( + playlist=self.playlist).aggregate(Max("rank"))["rank__max"] + self.rank = last_rank + 1 if last_rank is not None else 1 + except Exception: + ... + return super().save(*args, **kwargs) + + def __str__(self) -> str: + """Display a playlist content as string.""" + return f"Playlist : {self.playlist} - Video : {self.video} - Rank : {self.rank}" diff --git a/pod/playlist/rest_views.py b/pod/playlist/rest_views.py index 8251987d28..618fa34fc7 100644 --- a/pod/playlist/rest_views.py +++ b/pod/playlist/rest_views.py @@ -1,39 +1,49 @@ from rest_framework import serializers, viewsets -from .models import Playlist -from .models import PlaylistElement +from pod.video.rest_views import VideoSerializer +from .models import Playlist, PlaylistContent -# Serializers define the API representation. +class PlaylistContentSerializer(serializers.ModelSerializer): + video = VideoSerializer() -class PlaylistSerializer(serializers.HyperlinkedModelSerializer): class Meta: - model = Playlist - fields = ("id", "title", "slug", "owner", "description", "visible") + model = PlaylistContent + fields = ("video",) -class PlaylistElementSerializer(serializers.HyperlinkedModelSerializer): +class PlaylistSerializer(serializers.HyperlinkedModelSerializer): + videos = PlaylistContentSerializer(many=True, source="playlistcontent_set", read_only=True) + class Meta: - model = PlaylistElement + model = Playlist fields = ( "id", - "playlist", - "video", - "position", + "url", + "name", + "visibility", + "description", + "autoplay", + "editable", + "slug", + "date_created", + "date_updated", + "owner", + "additional_owners", + "videos", + ) + read_only_fields = ( + "editable", ) - - -############################################################################# -# ViewSets define the view behavior. -############################################################################# class PlaylistViewSet(viewsets.ModelViewSet): queryset = Playlist.objects.all() serializer_class = PlaylistSerializer - - -class PlaylistElementViewSet(viewsets.ModelViewSet): - queryset = PlaylistElement.objects.all() - serializer_class = PlaylistElementSerializer + filter_fields = ( + "owner", + "visibility", + "autoplay", + "editable", + ) diff --git a/pod/playlist/signals.py b/pod/playlist/signals.py new file mode 100644 index 0000000000..c88ddc76c1 --- /dev/null +++ b/pod/playlist/signals.py @@ -0,0 +1,28 @@ +from django.db.models.signals import post_save +from django.dispatch import receiver +from django.utils.translation import ugettext_lazy as _ +from django.contrib.auth.models import User + +from .apps import FAVORITE_PLAYLIST_NAME +from .models import Playlist + + +@receiver(post_save, sender=User) +def create_favorite_playlist(sender, instance, created, **kwargs): + """ + Function to create the `Favorites` playlist when a user is created. + + Args: + sender (:class:`django.contrib.auth.models.User`): The User class that sends the signal. + instance (:class:`django.contrib.auth.models.User`): The instance of user that has been created + created (bool): Indicates if the user was created or not. + """ + if created: + Playlist.objects.create( + name=FAVORITE_PLAYLIST_NAME, + description=_("Your favorites videos."), + visibility="private", + autoplay=True, + owner=instance, + editable=False + ) diff --git a/pod/playlist/static/css/playlist-iframe.css b/pod/playlist/static/css/playlist-iframe.css deleted file mode 100644 index c6b69d7656..0000000000 --- a/pod/playlist/static/css/playlist-iframe.css +++ /dev/null @@ -1,78 +0,0 @@ -#overlay-footer .vjs-playlist-button::before, -.video-js .vjs-playlist-button::before{ - content: '';display: block;width: 100%;height: 100%; - background-color: #FFF; - mask-size: 20px; - -webkit-mask-size: 20px; -} - -.playlist-videos .card-header { /* in pod.css */ - padding: .4rem; -} - -#card-playlist { - position: absolute; - display: block; - width: 100%; - top: 0; - bottom: 30px; - z-index: 3; - overflow: auto; - background-color: rgba(250, 250, 250, 0.75) !important; - border-radius: 0; - border:0; -} - -#card-playlist .playlist-videos { - position: absolute; - /* top: auto; */ - bottom: 0px; - overflow: auto; - width: 100%; -} -/* #card-playlist .btn.btn-primary { float: right} */ - -#div-video-wrapper #podvideoplayer { - position: absolute; - /* bottom: 0; */ - width: 100%; -} -#div-video-wrapper.overlay #podvideoplayer.vjs-has-started .vjs-control-bar { -/*#div-video-wrapper.overlay #podvideoplayer .vjs-control-bar {*/ - opacity: 1; - z-index: 5; -} -#div-video-wrapper.overlay #podvideoplayer .vjs-big-play-centered, -#div-video-wrapper.overlay #podvideoplayer .vjs-big-play-button { - display: none; -} -.vjs-big-play-button {z-index: 5} - - -#div-video-wrapper #card-playlist > .card-header {padding: 0 1.25rem; margin: 0;border-radius: 0} -#div-video-wrapper #card-playlist > .card-header > h5 { - display: inline-block; - font-size: 1.25em; - padding: .25em 5em 0 0; -} - -#div-video-wrapper #card-playlist, -#div-video-wrapper.overlay.info #overlay-footer p.playlist-video-title {display: none} -#div-video-wrapper.overlay.playlist #card-playlist {display: block} - -.card-controls > .playlist-options > .fill-color-pod {height:1.65em} - -#div-video-wrapper #card-playlist > .playlist-videos > .row { - justify-content: space-between; -} -#div-video-wrapper #card-playlist > .playlist-videos > .row > .card-group { - margin: 2% 5%; -} - -#card-playlist .card-group { - width: 15rem; -} - -.card-controls > .playlist-options > .fill-color-pod{ - fill:var(--bs-light); -} diff --git a/pod/playlist/static/css/playlist.css b/pod/playlist/static/css/playlist.css deleted file mode 100644 index f2dc7e659d..0000000000 --- a/pod/playlist/static/css/playlist.css +++ /dev/null @@ -1,38 +0,0 @@ -.select-position { - display: none; -} -/*.playlist-delete { - position: absolute; - left: 95%; - bottom: 95%; - color: #df0000; -} -.playlist-delete:hover { - color: #ff0000; -}*/ -.pod-playlist-visibility { - position: absolute; - right: 5px; - font-size: 2em; -} - -.pod-playlist-card .card-img{ - background-image: url('/static/img/default.svg'); - background-blend-mode: luminosity; - background-position: center; - background-color: var(--pod-background-neutre2-bloc); - aspect-ratio: 16/9; -} - -.fill-color-pod{ - fill:white; -} - -#dropmenu-playlist .selected:after{ - display: inline-block; - margin-left: 1em; - font-family: bootstrap-icons; - content: "\f272"; - line-height: 1; - vertical-align: -.125em; -} diff --git a/pod/playlist/static/css/videojs-playlist.css b/pod/playlist/static/css/videojs-playlist.css deleted file mode 100644 index 39cbe5af30..0000000000 --- a/pod/playlist/static/css/videojs-playlist.css +++ /dev/null @@ -1,192 +0,0 @@ -.playlist-item:hover:not(.disabled) { - background-color: #007bff; - color: white; - cursor: pointer; -} -.playlist-elements { - background-color: rgba(0, 0, 0, .2); - margin: 10px; -} - -.playlist-videos { - overflow-y: auto; - overflow-x: hidden; - max-height: 100%; - padding-top: 0; - padding-bottom: 0; -} - -.playlist-videos .row { - border-radius: 0; - margin: 0 -20px; -} -#collapseAside .playlist-videos .row .card-group { - width: 100%; - margin: 0; -} -#collapseAside .playlist-videos .card {border-radius:0;} - -.playlist-videos .row .card-group .video-card .card-body { - padding: 0; - position: relative; -} - -.playlist-videos .row .card-group .video-card .card-body a { - display: block; - padding: .25em .5em .25em calc(40% + .5em); - line-height: 1.35em; - min-height: 2em; -} -.playlist-videos .row .card-group .video-card .card-body a .card-thumbnail { - position: absolute; - width: 40%; - top: 0; bottom:0; left:0; - display: flex; - align-items: center; - /*background: black;*/ - border-left: solid var(--bs-dark-gray) 1px; - overflow: hidden; - border-radius: 0; -} -.playlist-videos .row .card-group .video-card .card-body a .card-thumbnail img { - width: 100%; - height: auto; - border-radius: 0; -} - -.playlist-videos .row .card-group .video-card .card-body a span.small { - word-break: break-all; - font-size: 85%; -} - -.playlist-videos .row .card-group a { - color:var(--bs-gray-dark) -} -.playlist-videos .row .card-group.on a { - color:var(--pod-primary) -} -#collapseAside .playlist-videos .row .card-group .card-header { - padding: .1rem .3rem .2em; -} -.playlist-videos .row .card-group.on .card-header { - border-bottom: 1px solid var(--pod-primary); -} -#collapseAside #card-playlist h5 > small {font-size:75%;line-height:1.5em} -#collapseAside .playlist-videos .row .card-group > .video-card {border:0 !important; border-radius:0;} -/* .playlist-videos .row .card-group > .video-card {border:solid 1px var(--gray) !important} */ -.playlist-videos .row .card-group.on > .video-card {border:solid 1px var(--pod-primary)} - -.playlist-videos .row .card-group.on > .video-card .card-body {background-color: var(--pod-primary)} -.playlist-videos .row .card-group.on > .video-card .card-body a {color: var(--bs-white)} -/*.playlist-videos .row .card-group.on > .video-card .card-header .text-muted { - color: var(--pod-primary) !important}*/ -.playlist-videos .row .card-group.on > .video-card .card-header .text-muted svg {stroke: var(--pod-primary) !important} - -.playlist-videos .row .card-group > .video-card .vdata { - display: inline-block; - height: auto; - overflow: hidden; - background: var(--gray) right center no-repeat; - color: var(--bs-white); - padding: 0 .5em 0 .5em; - margin: .4em .5em -.4em -.5em; - border-radius: 0 .25em .25em 0; -} - -.playlist-videos .row .card-group.on > .video-card .vdata { - padding-right: 1.075rem; - background-color: var(--pod-primary); - background-size: 15px; - background-image:url('data:image/svg+xml;utf8,'); -} - -.playlist-counter { - color:white; -} - -/*.card-controls {float:right}*/ -.card-controls > .playlist-options { - /*margin-top:0; - cursor: pointer;*/ - border: 2px solid transparent; - padding: 0 .3rem; -} -.card-controls > .playlist-options.on { - border-color: var(--bs-success); -} -.card-controls > .playlist-options > .fill-color-pod{ - fill:var(--bs-dark-gray); - height: 1.25em; - width: auto; -} -.card-controls > .playlist-options.on > .fill-color-pod { - fill:var(--pod-primary); -} - -.hidden {display:none} - -#video-form-wrapper { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1050; - padding: 1.25em; -} -#mainContent #video-form-wrapper { - left: 1.5em; - right: 1.5em; -} - -.vjs-control-bar {z-index:1} - -/* Override */ - -.playlist-videos .row .card-group > .video-card .vdata { - background: var(--pod-font-color) right center no-repeat !important; -} - -.playlist-videos .row .card-group.on > .video-card .vdata { - padding-right: 1.25rem !important; - background-color: var(--pod-primary-darken) !important; - background-size: 1rem !important; - background-image: url('data:image/svg+xml;utf8,') !important; -} - -/*.playlist-videos .row .card-group .video-card .card-body a { - padding: 1em .25em 1.25em calc(30% + .25em); -}*/ - -.playlist-videos .row .card-group .video-card .card-body a .card-thumbnail { /* ligne 39 */ - background: black; - /*width: 30%;*/ -} - -.playlist-videos .row .card-group .video-card .card-body { - border-bottom: 0.15rem solid var(--bs-card-border-color) !important; -} - -.playlist-videos .row .card-group.on .card-header { - /*background-color: var(--pod-primary);*/ - border-bottom: 1px solid var(--pod-background-neutre2-bloc); - border-radius: 0 !important; -} - -/*.playlist-videos .row .card-group.on > .video-card .card-header .text-muted { - color: var(--pod-background) !important; -}*/ - -/* Remove parasitic underline inhrited from "a" styling on playlist controls */ - -/*a.playlist-options { - text-decoration: none; - width: 2rem; - height: 2rem; -}*/ - -.playlist-videos .card-header > div > span + span { - width: 3rem; - justify-content: space-around; - display: flex; -} diff --git a/pod/playlist/static/js/playlist.js b/pod/playlist/static/js/playlist.js deleted file mode 100644 index 2762077c9a..0000000000 --- a/pod/playlist/static/js/playlist.js +++ /dev/null @@ -1,282 +0,0 @@ -var showalert = (message, alerttype) => { - document.body.append( - ``, - ); - setTimeout(() => { - document.getElementById("formalertdiv").remove(); - }, 5000); -}; - -var ajaxfail = function (data) { - showalert( - gettext("Error getting form.") + - "(" + - data + - ")" + - gettext("The form could not be recovered."), - "alert-danger", - ); -}; - -document.addEventListener("DOMContentLoaded", function () { - const table = document.getElementById("table_list_videos"); - - Array.from(document.querySelectorAll(".position-up")).forEach((button) => { - button.addEventListener("click", function () { - let row = button.closest("tr"); - let currentposition = row.querySelector(".video-position"); - - if (currentposition.textContent > 1) { - let oldposition = - row.previousElementSibling.querySelector(".video-position"); - currentposition.textContent = parseInt(currentposition.textContent) - 1; - oldposition.textContent = parseInt(oldposition.textContent) + 1; - } - console.log(row.previousSibling); - row.parentNode.insertBefore(row, row.previousElementSibling); - }); - }); - - document.querySelectorAll(".position-down").forEach((element) => { - element.addEventListener("click", function () { - let row = element.parentNode.parentNode; - let currentposition = row.querySelector(".video-position"); - let oldposition = currentposition; - if (row.nextElementSibling !== null) { - oldposition = row.nextElementSibling.querySelector(".video-position"); - } - - if (parseInt(currentposition.textContent) < table.rows.length - 1) { - currentposition.textContent = parseInt(currentposition.textContent) + 1; - oldposition.textContent = parseInt(oldposition.textContent) - 1; - } - row.parentNode.insertBefore(row.nextElementSibling, row); - }); - }); - let savePosition = document.getElementById("save-position"); - if (savePosition !== null) { - savePosition.addEventListener("click", function () { - var videos = {}; - for (let i = 1; i < table.rows.length; i++) { - var slug = table.rows[i].children[1].attributes["data-slug"].value; - var pos = table.rows[i].children[4].innerHTML; - videos[slug] = pos; - } - let token = document.cookie - .split(";") - .filter((item) => item.trim().startsWith("csrftoken="))[0] - .split("=")[1]; - - form_data = new FormData(); - form_data.append("videos", JSON.stringify(videos)); - form_data.append("csrfmiddlewaretoken", token); - form_data.append("action", "move"); - - const return_url = $(this).data("return-url"); - var jqxhr = fetch(window.location.href, { - method: "POST", - headers: { - "X-CSRFToken": token, - "X-Requested-With": "XMLHttpRequest", - }, - body: form_data, - }) - .then((response) => { - if (response.status !== 200) { - showalert( - gettext("You are no longer authenticated. Please log in again."), - "alert-danger", - ); - } else { - showalert(gettext("Position saved"), "alert-success"); - window.location.reload(); - } - }) - .catch((error) => { - showalert( - "Error moving videos. (" + - error + - ") The videos could not be moved.", - "alert-danger", - ); - }); - }); - } - - document.querySelectorAll(".position-delete").forEach((element) => { - element.addEventListener("click", async function () { - let slug = element.parentNode.parentNode - .querySelector(".video-title") - .getAttribute("data-slug"); - let token = document.cookie - .split(";") - .filter((item) => item.trim().startsWith("csrftoken="))[0] - .split("=")[1]; - - headers = { - "X-CSRFToken": token, - "X-Requested-With": "XMLHttpRequest", - }; - - form_data = new FormData(); - form_data.append("video", slug); - form_data.append("action", "remove"); - - await fetch(window.location.href, { - method: "POST", - headers: headers, - body: form_data, - }) - .then((response) => { - if (response.status != 200) { - showalert( - gettext("You are no longer authenticated. Please log in again."), - "alert-danger", - ); - } else { - response.json().then((data) => { - if (data.success) { - showalert(data.success, "alert-success"); - window.location.reload(); // hide link playlist - } else { - showalert(data.fail, "alert-danger"); - } - }); - } - }) - .catch((error) => { - showalert( - gettext( - "Error deleting video from playlist. The video could not be deleted.", - ), - "alert-danger", - ); - }); - }); - }); - - document.querySelectorAll(".playlist-delete").forEach((element) => { - const return_url = element.dataset.returnUrl; - element.addEventListener("click", function () { - let token = document.cookie - .split(";") - .filter((item) => item.trim().startsWith("csrftoken="))[0] - .split("=")[1]; - if (confirm("Are you sure you want to delete this playlist?")) { - headers = { - "X-Requested-With": "XMLHttpRequest", - "X-CSRFToken": token, - }; - - let form_data = new FormData(); - form_data.append("action", "delete"); - - let jqxhr = fetch(window.location.href, { - method: "POST", - headers: headers, - body: form_data, - }) - .then((response) => { - if (response.status != 200) { - showalert( - gettext( - "You are no longer authenticated. Please log in again.", - ), - "alert-danger", - ); - } else { - if (response.status == 200) { - showalert(response.statusText, "alert-success"); - setTimeout(() => (window.location = return_url), 1000); - } else { - showalert(response.statusText, "alert-danger"); - } - } - }) - .catch((error) => { - showalert( - gettext( - "Error deleting playlist. The playlist could not be deleted.", - ), - "alert-danger", - ); - }); - } - }); - }); - let infoVideo = document.getElementById("info-video"); - if (infoVideo !== null) { - document - .getElementById("info-video") - .addEventListener("click", function (e) { - let target = e.target; - if (!target.classList.contains("playlist-item")) return; - e.preventDefault(); - const url = window.location.href; - const regex = new RegExp("(.*)/video/(\\d+-(.*))/"); - const checkslug = regex.test(url); - const foundslug = url.match(regex); - if (!checkslug) { - showalert( - gettext("The video can not be added from this page."), - "alert-danger", - ); - return; - } - if (!foundslug[2]) { - showalert(gettext("The video slug not found."), "alert-danger"); - return; - } - - const slug = target.getAttribute("data-slug"); - const link = target; - let token = document.cookie - .split(";") - .filter((item) => item.trim().startsWith("csrftoken="))[0] - .split("=")[1]; - - form_data = new FormData(); - form_data.append("video", foundslug[2]); - form_data.append("action", "add"); - - const jqxhr = fetch("/playlist/edit/" + slug + "/", { - method: "POST", - headers: { - "X-CSRFToken": token, - "X-Requested-With": "XMLHttpRequest", - }, - body: form_data, - }) - .then((response) => { - if (response.status == 200) { - response.json().then((data) => { - if (data.success) { - showalert(data.success, "alert-success"); - //window.location.reload(); // hide link playlist - link.classList.add("disabled"); - link.classList.remove("playlist-item"); - link.append(""); - } else { - showalert(data.fail, "alert-danger"); - } - }); - } else { - showalert( - gettext( - "You are no longer authenticated. Please log in again.", - ), - "alert-danger", - ); - } - }) - .catch((error) => { - showalert( - gettext( - "Error getting video information. The video information could not be retrieved.", - ), - "alert-danger", - ); - }); - }); - } -}); diff --git a/pod/playlist/static/js/playlist_player.js b/pod/playlist/static/js/playlist_player.js deleted file mode 100644 index 94d4f150ba..0000000000 --- a/pod/playlist/static/js/playlist_player.js +++ /dev/null @@ -1,537 +0,0 @@ -let PlaylistPlayer = { - invalid_feedback_value: "Please provide a valid value for this field.", - invalid_feedback_password: "The password is incorrect.", - getParameters: function () { - let parameters = ""; - if (this.auto_on) { - parameters += "&auto=on"; - } - if (this.loop_on) { - parameters += "&loop=on"; - } - if (this.is_iframe) { - parameters += "&is_iframe=true"; - } - return parameters; - }, - - unselectCurrent: function () { - this.elements[this.current_position - 1].parentNode.classList.remove("on"); - }, - setCurrent: function (position) { - this.current_position = position; - this.elements[this.current_position - 1].parentNode.classList.add("on"); - - const vtitle = this.elements[this.current_position - 1].dataset.title, - purl = - "/playlist/" + this.playlist + "/?p=" + position + this.getParameters(); - history.pushState({ title: vtitle }, "", purl); - for (let c in this.titlectns) { - this.titlectns[c].innerHTML = vtitle; - } - }, - onPlayerEnd: function () { - if (this.current_position != this.length || this.loop_on) { - if (this.current_position != this.length) { - this.loadVideo(this.current_position + 1); - } else if (this.loop_on) { - this.loadVideo(1); - } - } - }, - - loadVideo: async function (position) { - this.unselectCurrent(); - const video_url = this.elements[position - 1].children[1].children[0].href, - url = video_url.replace("/video/", "/video/xhr/"), - parameters = - url.indexOf("?") > 0 - ? this.getParameters() - : this.getParameters().replace(/^&/, "?"), - //, password = $(this.current_element).parent().children('.vdata').data('password') == 'unchecked' - _this = this; - - await fetch(url + parameters, { - method: "GET", - datatype: "json", - headers: { - "Content-Type": "application/json", - "X-Requested-With": "XMLHttpRequest", - }, - }) - .then((response) => response.json()) - .then((json) => { - if (json.status == "ok") { - _this.setPlayer(json); - document.getElementById("info-video").innerHTML = - json.html_video_info; - // Update aside (Enrichement info, Managment links, Notes) - if (!_this.is_iframe) { - // Show / Hide enrichment info block - let card = document.getElementById("card-enrichmentinformations"); - if (json.version == "E") { - card.classList.remove("off"); - } else { - card.classList.add("off"); - } - // Update managment links - let manageLinks = document.querySelectorAll( - "#card-managevideo .card-body a", - ); - manageLinks.forEach(function (el) { - var href_value = el.getAttribute("href"); - var new_href_value = href_value.replace( - /(.*)\/([^/]*)\/([^/])*$/, - function (str, g0, g1, g2) { - return g0 + "/" + json.slug + "/" + (g2 ? g2 : ""); - }, - ); - el.setAttribute("href", new_href_value); - }); - // Update note form - document.getElementById("card-takenote").innerHTML = - json.html_video_note; - } - _this.setCurrent(position); - } else if (json.statusText == "password") { - if (document.getElementById("video-form-wrapper") == null) { - _this.formctn.append('
    '); - } - let wrapper = document.getElementById("video-form-wrapper"); - wrapper.classList.remove("hidden"); - wrapper.innerHTML = json.html_content; - wrapper.querySelector(".invalid-feedback").style.display = "None"; - wrapper - .querySelector('button[type="submit"]') - .addEventListener("click", function (e) { - e.preventDefault(); - e.stopPropagation(); - const password = document.getElementById("id_password").value; - let csrfmiddlewaretoken = document.querySelector( - '#video_password_form > input[name="csrfmiddlewaretoken"]', - ).value; - if (password == "") { - wrapper.querySelector(".invalid-feedback").innerHTML = - _this.invalid_feedback_value; - wrapper.querySelector(".invalid-feedback").style.display = - "block"; - return; - } - fetch(url, { - method: "POST", - context: document.body, - headers: { - "Content-Type": "application/json", - "X-CSRFToken": csrfmiddlewaretoken, - }, - }) - .then((response) => { - if (response.status == 200) { - json = response.json(); - wrapper.childNodes.forEach((node) => { - node.remove(); - }); - wrapper.classList.add("hidden"); - _this.setPlayer(json); - document.getElementById("info-video").html = - json.html_video_info; - _this.setCurrent(position); - } else { - wrapper.querySelector(".invalid-feedback").innerHTML = - this.strings.invalid_feedback_password; - wrapper.style.display = "block"; - } - }) - .catch((error) => {}); - }); - } else if (json.error == "acces") { - rurl = json.url + "?"; - if (_this.is_iframe) { - rurl += "is_iframe=true&"; - } - rurl += "referrer=" + _this.baseurl; - "/playlist/" + - _this.slug + - "/?p=" + - position + - _this.getParameters().replace(/&/g, "%26"); - window.location.href = rurl; - } else if (json.error == "deny") { - const nposition = position < _this.elements.length ? position + 1 : 1; - _this.loadVideo(nposition); - } - }); - }, - init: function (o) { - /* o is a javascript object containing playlist parameters for playlist player initialisation and playing : - * - version : String ('O' or 'E') corresponding to the default version of the video in wich it should be played - * - current_position : Number equals to the position of the current video (can be pass has query string ex: p=1) - * - length : Number of video in the playlist - * - elements : List of HTML playlist video elements - * - baseurl : String equals to pod site base url - * - is_iframe : Boolean to define if the playlist must be show in iframe mode or not - * - is_360 : Boolean to specifiy if the current video is a 360° video - * - vsjLogo : Logo to add to the player (can be null) - * - formctn : HTML element for a eventualy needed form - * - vtitlectn : List of HTML element where the current video title is display (and should be update) - * - head_files : Object containning a List of js and css that could be load or unload for any video type (enrichments, 360°, etc) - * - controls : Object containing loop and auto controls HTML elements - * - strings : Object containing pre-translated strings that could be needed to display (Cf info or alert messages) - */ - this.version = o.version; - this.current_position = o.current_position; - this.length = o.length; - this.baseurl = o.baseurl; - this.slug = o.slug; - this.is_iframe = o.is_iframe; - this.is_360 = o.is_360; - this.vjsLogo = o.vjsLogo; - this.formctn = o.formctn; - this.titlectns = o.vtitlectns; - this.headFiles.set(o.head_files); - this.controls = o.controls; - this.strings = o.strings ? o.strings : this.strings; - this.auto_on = this.loop_on = false; - this.elements = []; - this.hasPlayed = false; - - const parameter = [ - /(playlist)\/([^/]+)\//, - /(auto)\=([^&]+)/, - /(loop)\=([^&]+)/, - ]; - this.playlist = window.location.href.match(parameter[0])[2]; - let _this = this; - - if (window.location.href.match(parameter[1])) { - this.controls.auto.classList.add("on"); - this.auto_on = true; - } - if (window.location.href.match(parameter[2])) { - this.controls.loop.classList.add("on"); - this.loop_on = true; - } - - function toogleOption(e) { - e.preventDefault(); - e.stopPropagation(); - if (this.classList.contains("on")) { - this.classList.remove("on"); - _this[this.dataset.id + "_on"] = false; - } else { - this.classList.add("on"); - _this[this.dataset.id + "_on"] = true; - } - } - - for (let c in this.controls) { - this.controls[c].dataset.id = c; - this.controls[c].onclick = toogleOption; - } - - for (let i = 0, p = 1, nbe = o.elements.length; i < nbe; i++, p++) { - _this.elements.push(o.elements[i]); - o.elements[i].querySelector("a").dataset.position = p; - o.elements[i].querySelector("a").addEventListener("click", function (e) { - if (this.dataset.position == _this.current_position) { - e.preventDefault(); //e.stopPropagation(); - player.play(); - } /*if(_this.auto_on)*/ else { - e.preventDefault(); //e.stopPropagation(); - _this.loadVideo(this.dataset.position); - } - }); - } - - player.on("ended", function () { - _this.onPlayerEnd(); - }); - // console.log('Should load video '+this.current_position) - this.loadVideo(this.current_position); - }, - headFiles: { - plugins: { - enrichment: null, - chapter: null, - vr360: null, - overlay: null, - overview: null, - }, - set: function (o) { - for (let p in o) { - if (this.plugins.hasOwnProperty(p)) { - this.plugins[p] = o[p]; - } - } - }, - getOrLoad: function (p, cb) { - if (this.plugins[p].js) { - if (document.querySelectorAll("#" + p + "_style_id").length == 0) { - document - .querySelector("head") - .append( - '', - ); - } - if (document.querySelectorAll("#" + p + "_style_id").length == 0) { - let s = document.createElement("SCRIPT"); - s.id = p + "_script_id"; - s.src = this.plugins[p].js; - if (typeof cb === "function") { - s.onload = cb; - } - document.getElementsByTagName("HEAD")[0].append(s); - } else if (typeof cb == "function") { - cb(); - } - } - }, - unload: function (p) { - let unloadFile = document.querySelector( - "#" + p + "_style_id, #" + p + "_script_id", - ); - if (unloadFile) { - unloadFile.remove(); - } - }, - unloadCSS: function (p) { - let unloadFile = document.getElementById(p + "_style_id"); - if (unloadFile) { - unloadFile.remove(); - } - }, - }, - - setPlayer: function (json) { - // Register player settings - const volume = player.volume(), - muted = player.muted(); - - // Remove some overlay or enrichment element wich could cause problems if not need - const has_overlay = json.overlay && json.overlay.length > 0, - has_enrichment = json.version != "O"; - - if (!has_enrichment) { - this.headFiles.unloadCSS("enrichment"); - metadataTrack = null; - } - if (!has_overlay) { - this.headFiles.unloadCSS("overlay"); - } - - // Replace video_element - document - .querySelectorAll( - "form#video_count_form, ul.video-slides, ul#overlays, div.chapters-list", - ) - .forEach(function (e) { - e.remove(); - }); - - player.dispose(); - - let infoWrapper = document.querySelectorAll( - "#info-video-wrapper, #info-video", - )[0]; - infoWrapper.insertAdjacentHTML("beforebegin", json.html_video_element); - const _this = this; - - player = videojs("podvideoplayer", options, function () {}); - player.ready(function () { - // Chapters - if (json.chapter.length > 0) { - player.videoJsChapters(); - document.querySelectorAll(".vjs-big-play-button").forEach(function (e) { - e.style = "z-index : 2"; - - document.querySelectorAll(".vjs-control-bar").forEach(function (e) { - e.style = "z-index : 3"; - }); - }); - } - - // Enrichments - if (has_enrichment) { - player - .el() - .getElementsByTagName("VIDEO")[0] - .append( - '', - ); - _this.headFiles.getOrLoad("enrichment", function () { - var tracks = player.el().getElementsByTagName("TRACK"); - for (var i = 0; i < tracks.length; i++) { - if ( - tracks[i].kind === "metadata" && - tracks[i].label === "enrichment" - ) { - metadataTrack = tracks[i]; - metadataTrack.index = i; - break; - } - } - player.addEventListener("loadedmetadata", function () { - let slide = [], - player = this; - if (!metadataTrack.cues) { - //Safari do not get cues - let tracksrc = player.el().getElementsByTagName("TRACK")[ - metadataTrack.index - ].src; - loadEnrichmentVTTfile(tracksrc, function (cues) { - if (typeof player.slides === "function") { - player.slides(cues); - } - }); - } else { - for (i = 0; i < metadataTrack.cues.length; i++) { - // Replace tabs by spaces to prevent a "JSON.parse: bad control character in string literal" error. - data = JSON.parse( - metadataTrack.cues[i].text.replace(/\t/g, " "), - ); - slide.push({ - title: data.title, - url: data.url, - type: data.type, - stop_video: data.stop_video, - start: metadataTrack.cues[i].startTime, - end: metadataTrack.cues[i].endTime, - }); - } - if (typeof player.slides === "function") { - try { - player.slides(slide); - } catch (e) {} - } - } - }); - }); - } - - // Overlays - if (has_overlay) { - _this.headFiles.getOrLoad("overlay", function () { - player.on("loadedmetadata", function () { - if (typeof player.overlay === "function") { - player.overlay({ overlays: json.overlay }); - } - }); - }); - } - - // Add vttThumbnails - if (json.overview) { - if (typeof player.vttThumbnails === "function") { - player.vttThumbnails({ src: _this.baseurl + json.overview }); - } else { - _this.headFiles.getOrLoad("overview", function () { - try { - player.vttThumbnails({ src: _this.baseurl + json.overview }); - } catch (e) { - console.warn("Error in retrieving overview image : " + e); - } - }); - } - } - - // Add 360° video - if (json.is_360) { - if (typeof player.vr === "function") { - player.vr({ projection: "360" }); - } else { - _this.headFiles.getOrLoad("vr360", function () { - try { - player.vr({ projection: "360" }); - } catch (e) { - console.warn("Error in calling video 360° function : " + e); - } - }); - } - } - - // Add info and playlist controls and resize player if is_iframe - if (_this.is_iframe) { - player.videoJsInfo(); - player.videoJsPlaylist(); - if (typeof resizeVideoJs === "function") { - resizeVideoJs(); - } - if (typeof setOnPlayerPlayPause === "function") { - setOnPlayerPlayPause(); - } - if (!_this.hasPlayed) { - player.on("firstplay", function () { - document - .querySelectorAll("#card-playlist .close.hidden") - .forEach(function (e) { - e.classList.remove("hidden"); - }); - - _this.hasPlayed = true; - }); - } - } - - // Set video source - if (json.is_video) { - if (json.src.m3u8) { - player.src(json.src.m3u8); - player.hlsQualitySelector({ - displayCurrentQuality: true, - }); - player.on("error", function (e) { - e.stopImmediatePropagation(); - var error = player.error(); - //alert(error.code+" "+error.type+" "+error.message); - if (error.code == 3 || error.code == 4) { - //console.log('error!', error.code, error.type , error.message); - if (player.src() == "" || player.src().indexOf("m3u8") != -1) { - player.src(json.src.mp4); - player.controlBar.appendChild("QualitySelector"); - if (_this.hasPlayed) player.play(); - } - } - }); - } else { - player.src(json.src.mp4); - player.controlBar.addChild("QualitySelector"); - } - } else if (json.src.m4a) player.src(json.src.m4a); - - // Add videojs logo if defined - if (_this.vjsLogo) player.videoJsLogo(_this.vjsLogo); - - // Add viewCount - player.on("firstplay", function () { - var video_count_form = document.getElementById("video_count_form"); - var data_form = new FormData(video_count_form); - let url = video_count_form.getAttribute("action"); - fetch(url, { - method: "POST", - body: data_form, - headers: { - "X-Requested-With": "XMLHttpRequest", - }, - }); - }); - - // add onPlayerEnd listener for the rebuild player - player.on("ended", function () { - _this.onPlayerEnd(); - }); - - // Restore registered settings - player.volume(volume); - player.muted(muted); - - // Play if auto is active - if (_this.auto_on) player.play(); - }); - }, -}; diff --git a/pod/playlist/static/js/videojs-playlist-controlbar.js b/pod/playlist/static/js/videojs-playlist-controlbar.js deleted file mode 100644 index d22a341966..0000000000 --- a/pod/playlist/static/js/videojs-playlist-controlbar.js +++ /dev/null @@ -1,58 +0,0 @@ -(function () { - "use strict"; - var videojs = null; - if (typeof window.videojs === "undefined" && typeof require === "function") { - videojs = require("video.js"); - } else { - videojs = window.videojs; - } - - (function (window, videojs) { - var videoJsPlaylist, - defaults = { - ui: true, - }; - - /* - * Playlist menu button - */ - var MenuButton = videojs.getComponent("Button"); - - var PlaylistMenuButton = videojs.extend(MenuButton, { - constructor: function (player, options) { - options.label = "Playlist"; - MenuButton.call(this, player, options); - this.el().setAttribute("aria-label", "Playlist"); - videojs.dom.addClass(this.el(), "vjs-playlist-button"); - this.controlText("Playlist"); - }, - }); - PlaylistMenuButton.prototype.handleClick = function (event) { - MenuButton.prototype.handleClick.call(this, event); - show_video_playlist(); - }; - MenuButton.registerComponent("PlaylistMenuButton", PlaylistMenuButton); - - /** - * Initialize the plugin. - */ - videoJsPlaylist = function (options) { - var settings = videojs.mergeOptions(defaults, options), - player = this; - player.ready(function () { - if (settings.ui) { - var menuButton = new PlaylistMenuButton(player, settings); - player.controlBar.info = player.controlBar.el_.appendChild( - menuButton.el_, - ); - player.controlBar.info.dispose = function () { - this.parentNode.removeChild(this); - }; - } - }); - }; - - // Register the plugin - videojs.registerPlugin("videoJsPlaylist", videoJsPlaylist); - })(window, videojs); -})(); diff --git a/pod/playlist/static/playlist/css/playlist.css b/pod/playlist/static/playlist/css/playlist.css new file mode 100644 index 0000000000..2d431154fb --- /dev/null +++ b/pod/playlist/static/playlist/css/playlist.css @@ -0,0 +1,192 @@ +a.link { + text-decoration: none; +} + +a.link:hover { + text-decoration: underline; +} + +.link-playlist { + right: 1rem; + border-radius: 0.375rem; +} + +#playlist-modal { + font-size: 1.7em; + gap: 1rem; +} + +#playlist-modal .playlist-title { + text-decoration: none; + color: var(--pod-font-color); +} + +#playlist-modal .playlist-title:hover { + text-decoration: underline; +} + +.remove-video-from-playlist, +.add-video-from-playlist { + font-weight: 700; + display: flex; + align-items: center; + justify-content: center; + border-radius: 90px; + color: var(--pod-background); + width: 40px; + height: 40px; +} + +.remove-video-from-playlist { + background-color: #CC3434; +} + +.remove-video-from-playlist:hover { + background-color: #AA3434; + color: var(--pod-background); +} + +.add-video-from-playlist { + background-color: rgb(45, 168, 45); +} + +.add-video-from-playlist:hover { + background-color: rgb(35, 133, 35); + color: var(--pod-background); +} + + +.shake-effect { + animation: shake 2.3s ease-in-out; + animation-iteration-count: infinite; + cursor: grab; +} + +.shake-effect .badge { + display: block; +} + + +.shake-effect-active { + cursor: grabbing; +} + +@keyframes shake { + 0% { + transform: translate(1px, 1px) rotate(0deg); + } + + 10% { + transform: translate(-1px, -2px) rotate(-1deg); + } + + 20% { + transform: translate(-3px, 0px) rotate(1deg); + } + + 30% { + transform: translate(3px, 2px) rotate(0deg); + } + + 40% { + transform: translate(1px, -1px) rotate(1deg); + } + + 50% { + transform: translate(-1px, 2px) rotate(-1deg); + } + + 60% { + transform: translate(-3px, 1px) rotate(0deg); + } + + 70% { + transform: translate(3px, 1px) rotate(-1deg); + } + + 80% { + transform: translate(-1px, -1px) rotate(1deg); + } + + 90% { + transform: translate(1px, 2px) rotate(0deg); + } + + 100% { + transform: translate(1px, 2px) rotate(0deg); + } +} + +.no-click { + pointer-events: none; +} + +#sortForm.no-click, +#collapse-button.no-click { + opacity: 0; + transition: opacity .9s ease; +} + +.card-hidden { + display: none; +} + +.card-footer, +.draggable-container .badge { + transition: opacity 0.9s ease; +} + +.shake-effect .card-footer, +.draggable-container .badge { + opacity: 0; +} + +.shake-effect .badge { + opacity: 1; +} + +.dropzone-hover { + border: .2rem solid #1F7C85; +} + +p.playlist-last-updated { + font-style: italic; +} + +.grayscale-image { + filter: grayscale(100%); +} + +.lock-icon-container { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + font-size: 2em; + color: white; +} + +.scroll-container { + height: 40rem; + overflow: auto; +} + +a.player-element, +a.player-element:hover { + color: inherit; + text-decoration: none; + border: var(--bs-border-width) solid var(--color-alto) !important; +} + +a.player-element:not(.disabled):hover { + background-color: #F1F1F1; + border: var(--bs-border-width) solid var(--pod-primary) !important; +} + +a.player-element.selected { + background-color: #D1D1D1; +} + +.promoted-icon { + color: var(--pod-primary); +} \ No newline at end of file diff --git a/pod/playlist/static/playlist/img/default-playlist.svg b/pod/playlist/static/playlist/img/default-playlist.svg new file mode 100644 index 0000000000..1ba4826d19 --- /dev/null +++ b/pod/playlist/static/playlist/img/default-playlist.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/pod/playlist/static/playlist/js/add-or-edit.js b/pod/playlist/static/playlist/js/add-or-edit.js new file mode 100644 index 0000000000..09b60f9ee7 --- /dev/null +++ b/pod/playlist/static/playlist/js/add-or-edit.js @@ -0,0 +1,63 @@ +/** + * Hide or show the password field. If it is show, it is required. + * + * @param {boolean} toHide For hide the field, set to `true`. + */ +function hidePasswordField(toHide) { + if (toHide) { + passwordDivElement.classList.add('d-none'); + passwordInputElement.required = false; + } else { + passwordDivElement.classList.remove('d-none'); + passwordInputElement.required = true; + } +} + +function updateVisibilityHelpText(visibility, helpText) { + if (visibility == 'public') { + helpText.innerHTML = gettext('Public: the playlist can be accessed by anyone.'); + } else if (visibility == 'protected') { + helpText.innerHTML = gettext('Password-protected: the playlist can be accessed by anyone with the appropriate link and password.'); + } else if (visibility == 'private') { + helpText.innerHTML = gettext('Private: only you have access to this playlist.'); + } +} + +const visibilityHelpElement = document.getElementById("id_visibilityHelp"); +const visibilityHelpAdvancedElement = document.createElement('small'); +visibilityHelpAdvancedElement.id = 'visibilityHelpAdvanced'; +visibilityHelpAdvancedElement.classList.add('form-text'); +visibilityHelpElement.parentNode.insertBefore(visibilityHelpAdvancedElement, visibilityHelpElement.nextSibling); +visibilityHelpElement.parentNode.insertBefore(document.createElement('br'), visibilityHelpElement.nextSibling); + + +const visibilitySelectElement = document.getElementById('id_visibility'); +const passwordInputElement = document.getElementById('id_password'); +const passwordDivElement = passwordInputElement.closest(".list-group-item"); + +const promotedInputElement = document.getElementById('id_promoted'); +const promotedDivElement = promotedInputElement.closest(".list-group-item"); + +if (visibilitySelectElement.value !== 'protected') { + hidePasswordField(true); +} +if (visibilitySelectElement.value !== 'public') { + promotedDivElement.classList.add("d-none"); +} +updateVisibilityHelpText(visibilitySelectElement.value, visibilityHelpAdvancedElement) + +visibilitySelectElement.addEventListener('change', (event) => { + console.log(visibilityHelpAdvancedElement); + updateVisibilityHelpText(event.target.value, visibilityHelpAdvancedElement); + if (event.target.value == 'protected') { + hidePasswordField(false); + } else { + hidePasswordField(true); + } + + if (event.target.value == 'public') { + promotedDivElement.classList.remove("d-none"); + } else { + promotedDivElement.classList.add("d-none"); + } +}) diff --git a/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js b/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js new file mode 100644 index 0000000000..96edb66cb1 --- /dev/null +++ b/pod/playlist/static/playlist/js/filter-aside-playlist-list-refresh.js @@ -0,0 +1,58 @@ +/** + * Return url with filter and sort parameters. + * + * @returns The new URL. + */ +function getUrlForRefresh() { + let newUrl = window.location.pathname; + let urlParams = new URLSearchParams(window.location.search); + let visibilityParam = urlParams.get('visibility'); + // Add sort-related parameters + newUrl += "?visibility=" + visibilityParam + "&sort=" + document.getElementById("sort").value + "&"; + var sortDirectionAsc = document.getElementById("sort_direction").checked; + if (sortDirectionAsc) { + newUrl += + "sort_direction=" + document.getElementById("sort_direction").value + "&"; + } + window.history.pushState({}, '', newUrl); + return newUrl; +} + +/** + * Updates playlist list. + */ +function refreshPlaylistsSearch() { + url = getUrlForRefresh(); + fetch(url, { + method: "GET", + headers: { + "X-CSRFToken": "{{ csrf_token }}", + "X-Requested-With": "XMLHttpRequest", + }, + dataType: "html", + cache: "no-cache", + }) + .then((response) => response.text()) + .then((data) => { + let parser = new DOMParser(); + let html = parser.parseFromString(data, "text/html"); + document.getElementById("playlists_list").replaceWith(html.getElementById("playlists_list")); + }) + .catch((error) => { + document.getElementById("playlists_list").innerHTML = gettext( + "An Error occurred while processing." + ); + }); +} + +// Add trigger event to manage sort direction. +document + .getElementById('sort_direction_label') + .addEventListener('click', function (e) { + e.preventDefault(); + toggleSortDirection(); + refreshPlaylistsSearch(); + }); +document.getElementById('sort').addEventListener('change', function (e) { + refreshPlaylistsSearch(); +}); diff --git a/pod/playlist/static/playlist/js/playlist-modal.js b/pod/playlist/static/playlist/js/playlist-modal.js new file mode 100644 index 0000000000..1e88828d57 --- /dev/null +++ b/pod/playlist/static/playlist/js/playlist-modal.js @@ -0,0 +1,18 @@ +/** + * Add event listener for the playlist modal in video page. + */ +function addEventListenerForModal() { + const playlists = document.getElementById("playlist-list").children; + const buttons = []; + for (let playlist of playlists) { + buttons.push(playlist.querySelector(".action-btn")); + } + + for (let button of buttons) { + preventRefreshButton(button, false); + } +} + +document.addEventListener('DOMContentLoaded', function () { + addEventListenerForModal(); +}); diff --git a/pod/playlist/static/playlist/js/playlist-player.js b/pod/playlist/static/playlist/js/playlist-player.js new file mode 100644 index 0000000000..fae8560900 --- /dev/null +++ b/pod/playlist/static/playlist/js/playlist-player.js @@ -0,0 +1,75 @@ +/** + * Switch to the next video when this exists. + */ +function switchToNextVideo() { + const playerElements = Array.from(document.querySelectorAll('.player-element')); + const selectedElement = document.querySelector('.selected'); + const currentIndex = playerElements.indexOf(selectedElement); + if (currentIndex < playerElements.length - 1) { + playerElements[currentIndex + 1].classList.add('selected'); + selectedElement.classList.remove('selected'); + if (!(playerElements[currentIndex + 1].classList.contains('disabled'))) { + window.location.href = playerElements[currentIndex + 1].getAttribute('href'); + } else { + switchToNextVideo(); + } + } +} + +/** + * Scroll to the selected video. + */ +function scrollToSelectedVideo() { + const scrollContainer = document.querySelector('.scroll-container'); + const selectedVideo = document.querySelector('.selected'); + if (selectedVideo && scrollContainer) { + const containerRect = scrollContainer.getBoundingClientRect(); + const selectedRect = selectedVideo.getBoundingClientRect(); + const offsetTop = selectedRect.top - containerRect.top; + scrollContainer.scrollTo({ + top: offsetTop, + behavior: 'smooth' + }); + } +} + +/** + * Get startCountDown() promise. + * + * @returns The promise. + */ +function asyncStartCountDown() { + return new Promise(function (resolve) { + startCountdown(resolve); + }); +} + +/** + * Start the count down. + * + * @param {function} callback The call back function. + */ +function startCountdown(callback) { + countdownElement.textContent = count; + if (count > 1) { + count--; + setTimeout(function () { + startCountdown(callback); + }, 1000); + } else if (typeof callback === 'function') { + callback(); + } +} + +const videos = document.querySelectorAll('.player-element'); +videos.forEach(function (video) { + new MutationObserver(scrollToSelectedVideo).observe(video, { attributes: true, attributeFilter: ['class'] }); +}); + +document.addEventListener('DOMContentLoaded', function () { + setTimeout(function () { + scrollToSelectedVideo(); + }, 500); +}); + +var countdownElement = document.getElementById('countdown'); diff --git a/pod/favorite/static/js/favorite-reorganize.js b/pod/playlist/static/playlist/js/playlist-reorganize.js similarity index 80% rename from pod/favorite/static/js/favorite-reorganize.js rename to pod/playlist/static/playlist/js/playlist-reorganize.js index 202cc2fc37..ef51bfe0cd 100644 --- a/pod/favorite/static/js/favorite-reorganize.js +++ b/pod/playlist/static/playlist/js/playlist-reorganize.js @@ -3,22 +3,15 @@ var infinite; addEventForReorganizedButton(); -const sortSelectElement = document.getElementById("sort"); -const sortDirectionElement = document.getElementById("sort_direction"); - const reorganizeButtonsSpanElement = document.getElementById("reorganize-buttons"); const collapseAsideElement = document.getElementById("collapseAside"); const reorganizeButton = document.getElementById("reorganize-button"); -const refreshButton = document.getElementById("refresh-button"); -document - .getElementById("sort_direction_label") - .addEventListener("click", changeReorganizeButtons); -sortSelectElement.addEventListener("change", changeReorganizeButtons); /** * Add or remove the CSS class to make drop zone hover. + * * @param {string} state State of style (`add` or `remove`). * @param {Element} element Element to add CSS class. */ @@ -31,18 +24,6 @@ function addOrRemoveDropZoneHoverStyleClass(state, element) { } } -/** - * Switch the 'reorganize' and 'sort by rank' buttons. - */ -function changeReorganizeButtons() { - if (sortSelectElement.value === "rank" && !sortDirectionElement.checked) { - reorganizeButton.classList.remove("d-none"); - refreshButton.classList.add("d-none"); - } else { - reorganizeButton.classList.add("d-none"); - refreshButton.classList.remove("d-none"); - } -} /** * Add an event listener to the 'reorganize-button' element. @@ -68,6 +49,7 @@ function addEventForReorganizedButton() { if (this.id == "reorganize-button") { event.preventDefault(); activateDragAndDrop(); + console.log(this.id) this.id = "save-button"; this.title = gettext("Save your reorganization"); const iconElement = this.querySelector("i"); @@ -79,16 +61,11 @@ function addEventForReorganizedButton() { convert2DTableToJson(exchangedValues); } }); - document - .getElementById("refresh-button") - .addEventListener("click", function (event) { - event.preventDefault(); - window.location.assign(window.location.href.split("?")[0]); - }); } /** * Clear and transfer data when drag event starts. + * * @param {Event} event The name of the event. */ function onDragStart(event) { @@ -99,6 +76,7 @@ function onDragStart(event) { /** * Prevent the default behavior of the element during the event. + * * @param {Event} event The name of the event. */ function onDragOver(event) { @@ -108,6 +86,7 @@ function onDragOver(event) { /** * Performs a swap between the dragged elements when dropping. + * * @param {Event} event The name of the event. */ function onDrop(event) { @@ -134,7 +113,6 @@ function onDrop(event) { function activateDragAndDrop(parent) { const draggableElements = document.querySelectorAll(".draggable-container"); const cardFooterElements = document.querySelectorAll(".card-footer"); - const sortForm = document.getElementById("sortForm"); draggableElements.forEach((draggableElement) => { draggableElement.setAttribute("draggable", true); draggableElement.addEventListener("dragstart", onDragStart); @@ -143,17 +121,23 @@ function activateDragAndDrop(parent) { draggableElement.classList.add("shake-effect"); draggableElement.children[0].classList.add("no-click"); }); - sortForm.classList.add("no-click"); updateCollapseAside(); infinite.removeLoader(); document .getElementById("cancel_btn_favorites_list") .classList.remove("d-none"); + if (document.getElementById("card-manage-playlist")) { + document + .getElementById("card-manage-playlist") + .classList.add("d-none") + } } /** * Convert a 2D table into a JSON string representation. + * * @param {Array} table The 2D table to convert. + * * @returns {String} The JSON string representation. */ function convert2DTableToJson(table) { @@ -168,10 +152,6 @@ function convert2DTableToJson(table) { * Update collapse aside to help user. */ function updateCollapseAside() { - const collapseAside = document.querySelector( - "#collapseAside > div.card.card-body", - ); - collapseAside.remove(); const helpInformations = document.querySelector("#card-sharedraftversion"); helpInformations.classList.remove("card-hidden"); } diff --git a/pod/playlist/static/playlist/js/utils-playlist.js b/pod/playlist/static/playlist/js/utils-playlist.js new file mode 100644 index 0000000000..4e124ce5ce --- /dev/null +++ b/pod/playlist/static/playlist/js/utils-playlist.js @@ -0,0 +1,72 @@ +/** + * Disables the default refresh behavior of a button and performs an asynchronous GET request using the Fetch API. + * @param {HTMLElement} button - The HTML button element. + */ +function preventRefreshButton(button, jsonFormat) { + const FAVORITE_BUTTON_ID = 'favorite-button'; + const PLAYLIST_MODAL_ID = 'playlist-list'; + if (button) { + button.addEventListener('click', function (e) { + e.preventDefault(); + let url = this.getAttribute('href'); + if (button.classList.contains('action-btn')) { + button.classList.add('disabled'); + button.style.backgroundColor = 'gray'; + this.removeAttribute('href'); + } + if (jsonFormat) { + url += '?json=true' + } + fetch(url, { + method: "GET" + }) + .then((response) => { + if (response.ok) { + if (jsonFormat) { + return response.json(); + } + return response.text(); + } else { + throw new Error('Network response was not ok.'); + } + }) + .then((data) => { + if (jsonFormat) { + const starIconElement = button.querySelector('.bi'); + if (data.state === 'in-playlist') { + const newUrl = url.replace('/add/', '/remove/'); + starIconElement.classList.remove('bi-star'); + starIconElement.classList.add('bi-star-fill'); + button.setAttribute('href', newUrl); + } else if (data.state === 'out-playlist') { + const newUrl = url.replace('/remove/', '/add/'); + starIconElement.classList.remove('bi-star-fill'); + starIconElement.classList.add('bi-star'); + button.setAttribute('href', newUrl); + } + preventRefreshButton(button, jsonFormat); + } else { + const parser = new DOMParser(); + const html = parser.parseFromString(data, 'text/html'); + const updatedButton = html.getElementById(button.id); + const favoriteButton = document.getElementById(FAVORITE_BUTTON_ID); + const playlistModal = document.getElementById(PLAYLIST_MODAL_ID); + preventRefreshButton(updatedButton); + button.replaceWith(updatedButton); + if (playlistModal && button.id === FAVORITE_BUTTON_ID) { + playlistModal.replaceWith(html.getElementById(PLAYLIST_MODAL_ID)); + addEventListenerForModal(); + } + if (favoriteButton && button.id !== FAVORITE_BUTTON_ID) { + const updatedFavoriteButton = html.getElementById(FAVORITE_BUTTON_ID); + preventRefreshButton(updatedFavoriteButton, false); + favoriteButton.replaceWith(updatedFavoriteButton); + } + } + }) + .catch(error => { + console.error('Error : ', error); + }); + }); + } +} diff --git a/pod/playlist/static/playlist/js/video-favorites-remove-card.js b/pod/playlist/static/playlist/js/video-favorites-remove-card.js new file mode 100644 index 0000000000..1561c9ff4b --- /dev/null +++ b/pod/playlist/static/playlist/js/video-favorites-remove-card.js @@ -0,0 +1,30 @@ +document.addEventListener("DOMContentLoaded", function () { + const cards = document.getElementsByClassName("draggable-container"); + for (let card of cards) { + const btn = card.querySelector(".favorite-btn-link"); + btn.addEventListener("click", function (e) { + e.preventDefault(); + const url = btn.getAttribute("href"); + fetch(url, { + method: "GET" + }) + .then((response) => { + if (response.ok) { + return response.text(); + } else { + throw new Error("Network response was not ok."); + } + }) + .then((data) => { + card.remove(); + const parser = new DOMParser(); + const html = parser.parseFromString(data, "text/html"); + const title = document.getElementById("video_count"); + title.replaceWith(html.getElementById("video_count")); + }) + .catch(error => { + console.error("Error : ", error) + }); + }) + } +}); diff --git a/pod/playlist/static/playlist/js/video-header-favorites.js b/pod/playlist/static/playlist/js/video-header-favorites.js new file mode 100644 index 0000000000..2daffaa153 --- /dev/null +++ b/pod/playlist/static/playlist/js/video-header-favorites.js @@ -0,0 +1,4 @@ +document.addEventListener("DOMContentLoaded", function () { + const favoriteButton = document.getElementById("favorite-button"); + preventRefreshButton(favoriteButton); +}); diff --git a/pod/playlist/static/playlist/js/video-list-favorites-card.js b/pod/playlist/static/playlist/js/video-list-favorites-card.js new file mode 100644 index 0000000000..739668a9f8 --- /dev/null +++ b/pod/playlist/static/playlist/js/video-list-favorites-card.js @@ -0,0 +1,6 @@ +document.addEventListener("DOMContentLoaded", function () { + const favoritesButtons = document.getElementsByClassName("favorite-btn-link"); + for (let btn of favoritesButtons) { + preventRefreshButton(btn, true); + } +}); diff --git a/pod/playlist/static/playlist/js/video-playlists-remove-card.js b/pod/playlist/static/playlist/js/video-playlists-remove-card.js new file mode 100644 index 0000000000..4b2be804d4 --- /dev/null +++ b/pod/playlist/static/playlist/js/video-playlists-remove-card.js @@ -0,0 +1,30 @@ +document.addEventListener("DOMContentLoaded", function () { + const cards = document.getElementsByClassName("draggable-container"); + for (let card of cards) { + const btn = card.querySelector(".remove-from-playlist-btn-link"); + btn.addEventListener("click", function (e) { + e.preventDefault(); + const url = btn.getAttribute("href"); + fetch(url, { + method: "GET" + }) + .then((response) => { + if (response.ok) { + return response.text(); + } else { + throw new Error("Network response was not ok."); + } + }) + .then((data) => { + card.remove(); + const parser = new DOMParser(); + const html = parser.parseFromString(data, "text/html"); + const title = document.getElementById("video_count"); + title.replaceWith(html.getElementById("video_count")); + }) + .catch(error => { + console.error("Error : ", error) + }); + }) + } +}); diff --git a/pod/playlist/templates/my_playlists.html b/pod/playlist/templates/my_playlists.html deleted file mode 100644 index 93f068eac9..0000000000 --- a/pod/playlist/templates/my_playlists.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends 'base.html' %} -{% load i18n %} -{% load static %} - -{% block page_extra_head %} - - -{% endblock page_extra_head %} - -{% block breadcrumbs %}{{ block.super }}
  • {% trans "My playlists" %}
    • {% endblock %} - -{% block page_title %} - {% blocktrans count counter=playlists.paginator.count %}{{ counter }} playlist found{% plural %}{{ counter }} playlists found{% endblocktrans %} -{% endblock %} - -{% block page_content %} - {% if playlists.paginator.count == 0 %} -

    {% trans 'No playlist found' %}

    -

    {% trans 'You have not created any playlists yet, please use the "Add a new playlist" button to add one.' %}

    - {% trans 'Add a new playlist' %} - {% else %} -
    {% blocktrans count counter=playlists.paginator.count %}{{ counter }} playlist found{% plural %}{{ counter }} playlists found{% endblocktrans %}
    - {% include 'playlist/playlist_list.html' %} - {% endif %} -
    -

    {% trans 'This is the page of your playlists. Here you can create, edit or delete them.' %}

    -

    {% trans 'A playlist with the eye symbol means that this playlist is visible to all users when they view this page.' %}

    -{% endblock page_content %} - -{% block collapse_page_aside %}{% endblock collapse_page_aside %} -{% block page_aside %}{% endblock page_aside %} diff --git a/pod/playlist/templates/playlist.html b/pod/playlist/templates/playlist.html deleted file mode 100644 index 05eef36d4c..0000000000 --- a/pod/playlist/templates/playlist.html +++ /dev/null @@ -1,83 +0,0 @@ - -{% extends 'base.html' %} -{% load i18n %} -{% load static %} - -{% block page_extra_head %} - - -{% endblock page_extra_head %} - -{% block breadcrumbs %} - {{block.super}} -
  • - {% trans 'My playlists' %} -
    • - {% if form.instance.title %} -
  • - {{form.instance.title}} -
    • -
  • - {% trans "Edit" %} -
    • - {% else %} -
  • - {% trans "Add a new playlist" %} -
    • - {% endif %} -{% endblock %} - -{% block page_title %} - {% if form.instance.title %}{% trans 'Editing the playlist' %} "{{form.instance.title}}"{% else %}{% trans 'Add a new playlist' %}{% endif %} -{% endblock %} - -{% block page_content %} -

    - {% if form.instance.title %} - {% trans 'Editing the playlist' %} "{{form.instance.title}}" - {% else %} - {% trans 'Add a new playlist' %} - {% endif %} -

    -
    - {% csrf_token %} - {% for field_hidden in form.hidden_fields %} - {{field_hidden}} - {% endfor %} - {% for field in form.visible_fields %} -
    - {{field.errors}} - {{field}} - - {% else %} - class="mb-3 from-group {% if field.field.required %} form-group-required{% endif %}"> - {{field.errors}} - - {{field}} - {% endif %} -
    - {% endfor %} -
    - - {% csrf_token %} - - {% trans 'Delete' %} -
    -
    -
    - {% if form.instance.playlistelement_set.all %} - {% include 'playlist/playlist_element_list.html' %} - {% else %} -

    {% trans 'This playlist has no videos yet.' %}

    - {% endif %} -
    - {% trans 'Back to my playlists' %} -{% endblock page_content %} diff --git a/pod/playlist/templates/playlist/add_or_edit.html b/pod/playlist/templates/playlist/add_or_edit.html new file mode 100644 index 0000000000..fee85b8c6f --- /dev/null +++ b/pod/playlist/templates/playlist/add_or_edit.html @@ -0,0 +1,92 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + {% trans "Playlists" %} +
    • +
  • + {% if form.instance.slug %} + {% trans "Edit the playlist" %} "{{ form.instance.name }}" + {% else %} + {% trans "Add a playlist" %} + {% endif %} +
    • +{% endblock breadcrumbs %} + +{% block page_content %} +
    + {% csrf_token %} +
    + {% if form.errors %} +

    + {% trans "One or more errors have been found in the form." %} + {% for error in form.non_field_errors %} + - {{ error }}
    + {% endfor %} +

    + {% endif %} + {% for field_hidden in form.hidden_fields %} + {{ field_hidden }} + {% endfor %} + {% for fieldset in form.fieldsets %} + {% with options=fieldset|last name=fieldset|first %} +
    +
    + {% if options.legend %} + {{ options.legend|safe }} + {% endif %} + {% for field in form.visible_fields %} + {% if field.name in options.fields %} + {% spaceless %} +
    +
    +
    + {{ field.errors }} + {% if "form-check-input" in field.field.widget.attrs.class %} +
    + {{ field }} +
    + {% else %} + + {{ field }} + {% endif %} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} + {% if field.field.required %}
    {% trans "Please provide a valid value for this field." %}
    {% endif %} +
    +
    +
    + {% endspaceless %} + {% endif %} + {% endfor %} +
    + {{ options.additional_data|safe }} +
    +
    +
    + {% endwith %} + {% endfor %} +
    +
    + +
    +
    +{% endblock page_content %} + +{% block collapse_page_aside %} +{% endblock collapse_page_aside %} + +{% block page_aside %} +{% endblock page_aside %} + +{% block more_script %} + + + + + {{ form.media }} +{% endblock more_script %} diff --git a/pod/playlist/templates/playlist/button_start_playlist.html b/pod/playlist/templates/playlist/button_start_playlist.html new file mode 100644 index 0000000000..42e2a5fd0c --- /dev/null +++ b/pod/playlist/templates/playlist/button_start_playlist.html @@ -0,0 +1,7 @@ +{% load i18n %} +{% load playlist_buttons %} + +{% get_link_to_start_playlist playlist as link_to_start %} + + {% trans "Start the playlist" %} + diff --git a/pod/playlist/templates/playlist/delete.html b/pod/playlist/templates/playlist/delete.html new file mode 100644 index 0000000000..0c668ce691 --- /dev/null +++ b/pod/playlist/templates/playlist/delete.html @@ -0,0 +1,82 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + {% trans "Playlists" %} +
    • +
  • + {{ playlist.name }} +
    • +
  • + {% trans "Delete" %} +
    • +{% endblock breadcrumbs %} + +{% block page_content %} + +

    {% blocktrans with name=playlist.name %}Delete the playlist {{name}}{% endblocktrans %} + + +  {% trans "Back to my playlists" %} + + +

    +

    {% trans 'To delete the playlist, please check the box in and click delete.' %}

    +
    + {% csrf_token %} +
    +
    + {% trans 'Agree required' %} + {% if form.errors %} +

    {% trans "One or more errors have been found in the form." %}

    + {% endif %} + {% for field_hidden in form.hidden_fields %} + {{field_hidden}} + {% endfor %} + {% for field in form.visible_fields %} + {% spaceless %} +
    +
    + {{ field.errors }} + {% if "form-check-input" in field.field.widget.attrs.class %} +
    + {{ field }} +
    + {% else %} + + {{ field }} + {% endif %} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} + {% if field.field.required %}
    {% trans "Please provide a valid value for this field." %}
    {% endif %} +
    +
    + {% endspaceless %} + {% endfor %} +
    + + +  {% trans "Back to my playlists" %} + +
    +
    +
    +
    +{% endblock page_content %} + +{% block collapse_page_aside %} +{% endblock collapse_page_aside %} + +{% block page_aside %} +{% endblock page_aside %} + +{% block more_script %} +{% endblock more_script %} diff --git a/pod/playlist/templates/playlist/filter_aside.html b/pod/playlist/templates/playlist/filter_aside.html new file mode 100644 index 0000000000..a8072c014f --- /dev/null +++ b/pod/playlist/templates/playlist/filter_aside.html @@ -0,0 +1,65 @@ +{% load i18n %} +{% load custom_tags %} + +{% spaceless %} +
    +

    +  {% trans "Filters"%} + {% trans 'Reset' %} +

    + +
    +
    + +  {% trans "Right of access"%} + +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    + +{% endspaceless %} diff --git a/pod/playlist/templates/playlist/player_controls.html b/pod/playlist/templates/playlist/player_controls.html deleted file mode 100644 index 36fcb0fd4a..0000000000 --- a/pod/playlist/templates/playlist/player_controls.html +++ /dev/null @@ -1,14 +0,0 @@ -{# HTML for playlist controls. Don't use this file alone, it must be integrated into another template! #} -{% load i18n static %} -
    - - - - - - -
    diff --git a/pod/playlist/templates/playlist/playlist-informations-card.html b/pod/playlist/templates/playlist/playlist-informations-card.html new file mode 100644 index 0000000000..73767710e8 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist-informations-card.html @@ -0,0 +1,34 @@ +{% load i18n %} +
    +

    +  {% trans "Informations about the playlist" %} +

    +
    +

    + {% trans "Last updated on" %} {{ playlist.date_updated.date }} {% trans "at" %} {{ playlist.date_updated.time }} +

    +

    + {{ playlist.description }} +

    +

    + {% trans "Right of access" %} : {% include "playlist/playlist_visibility_icon.html" with playlist=playlist %} +

    +

    + {% trans "Playlist owner" %} : {{ playlist.owner }} +

    + + {% if additional_owners|length > 0 %} +
    + {% trans "Additional owners" %} : + +
    + {% endif %} +
    + {% if USE_STATS_VIEW %} + {% trans "Statistics" %} + {% endif %} +
    diff --git a/pod/playlist/templates/playlist/playlist-list-modal.html b/pod/playlist/templates/playlist/playlist-list-modal.html new file mode 100644 index 0000000000..68aeec08e2 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist-list-modal.html @@ -0,0 +1,52 @@ +{% load i18n %} +{% load static %} +{% load playlist_list_modal %} +{% load favorites_playlist %} + +{% block page_extra_head %} + +{% endblock page_extra_head %} + + + + {% block more_script %} + + + {% endblock %} \ No newline at end of file diff --git a/pod/playlist/templates/playlist/playlist-management-card.html b/pod/playlist/templates/playlist/playlist-management-card.html new file mode 100644 index 0000000000..008eb39c23 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist-management-card.html @@ -0,0 +1,14 @@ +{% load i18n %} +{% load playlist_buttons %} + +{% user_can_edit_or_remove playlist as can_edit_or_remove %} +{% if can_edit_or_remove %} +
    +

    +  {% trans "Manage playlist" %} +

    +
    + {% include "playlist/playlist_link.html" %} +
    +
    +{% endif %} \ No newline at end of file diff --git a/pod/playlist/templates/playlist/playlist-videos-list.html b/pod/playlist/templates/playlist/playlist-videos-list.html new file mode 100644 index 0000000000..407b860b90 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist-videos-list.html @@ -0,0 +1,38 @@ +{% load i18n %} +{% load static %} +{% spaceless %} +
    + {% for video in videos %} +
    +
    + {% include "videos/card.html" %} +
    {{ video.rank }}
    +
    +
    + {% empty %} +
    +

    {% trans "Sorry, no video found." %}

    +
    + {% endfor %} +
    + {% if videos.has_next %} + + {% endif %} + +{% endspaceless %} +{% block more_script %} + {% if in_favorites_playlist %} + + {% else %} + + + + {% endif %} +{% endblock %} diff --git a/pod/playlist/templates/playlist/playlist.html b/pod/playlist/templates/playlist/playlist.html new file mode 100644 index 0000000000..f6e5c7947c --- /dev/null +++ b/pod/playlist/templates/playlist/playlist.html @@ -0,0 +1,99 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} +{% load playlist_buttons %} +{% load favorites_playlist %} + +{% block opengraph %}{% load video_filters %} + + + + + + + + +{% endblock %} + +{% block page_extra_head %} + +{% endblock page_extra_head %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Playlists" %} + +
    • +
  • + {% get_playlist_name playlist %} +
    • +{% endblock %} + + +{% block page_content %} +
    +

    + {% blocktrans count counter=count_videos %}{{ counter }} video found{% plural %}{{ counter }} videos found{% endblocktrans %} +

    +
    + {% user_can_edit_or_remove playlist as can_edit_or_remove %} + {% if can_edit_or_remove or in_favorites_playlist %} +
    + {% csrf_token %} + + + +  {% trans "Cancel" %} +
    + {% endif %} +
    +
    + {% include "videos/video_sort_select.html" with video_rank=True %} +
    +
    + {% include 'loader.html' %} + {% include "playlist/playlist-videos-list.html" %} +{% endblock page_content %} + +{% block page_aside %} +
    + {% include 'videos/filter_aside.html' %} +
    +
    +

    {% trans "Help - Drag & Drop" %}

    +
    +
      +
    1. {% trans "Select the video to move by clicking and holding." %}
      2. +
    2. {% trans "While holding down the video, drag it to the desired location." %}
      3. +
    3. {% trans "Drop the video on another to swap their position." %}
      4. +
    +
    +
    + {% include "playlist/playlist-management-card.html" %} +
    +
    + {% include "playlist/button_start_playlist.html" %} +
    +
    + {% include "playlist/playlist-informations-card.html" %} +{% endblock page_aside %} + +{% block more_script %} + + + + +{% endblock more_script %} diff --git a/pod/playlist/templates/playlist/playlist_card.html b/pod/playlist/templates/playlist/playlist_card.html new file mode 100644 index 0000000000..8828f55151 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist_card.html @@ -0,0 +1,45 @@ +{% load i18n l10n %} +{% load playlist_buttons %} +{% load favorites_playlist %} +{% spaceless %} + {% user_can_edit_or_remove playlist as can_edit_or_remove %} +
    +
    +
    + + + {% get_playlist_name playlist as playlist_name %} + {{ playlist_name|capfirst|truncatechars:20 }} +
    + {{ playlist.get_number_video }} + {% if playlist.get_number_video > 1 %} + {% trans "videos" %} + {% else %} + {% trans "video" %} + {% endif %} +     +     + {% include "playlist/playlist_visibility_icon.html" with playlist=playlist %} +
    +
    +
    + + {% if playlist.get_number_video > 0 %} + + {% trans + + {% else %} + {% trans + {% endif %} + +
    +
    + {% if can_edit_or_remove %} +
    + {% include "playlist/playlist_link.html" %} +
    + {% endif %} + {% include "playlist/button_start_playlist.html" %} +
    +
    +{% endspaceless %} diff --git a/pod/playlist/templates/playlist/playlist_content.html b/pod/playlist/templates/playlist/playlist_content.html new file mode 100644 index 0000000000..4f27adb238 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist_content.html @@ -0,0 +1,21 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} + +{% block opengraph %}{% load video_filters %} + + + + + + + + +{% endblock %} + +{% block page_extra_head %} + +{% endblock page_extra_head %} + + +{% endspaceless %} diff --git a/pod/playlist/templates/playlist/playlist_element_list.html b/pod/playlist/templates/playlist/playlist_element_list.html deleted file mode 100644 index 19115cd026..0000000000 --- a/pod/playlist/templates/playlist/playlist_element_list.html +++ /dev/null @@ -1,44 +0,0 @@ -{# HTML for playlist element list. Don't use this file alone it must be integrated into another template! #} -{% load i18n %} -
    - - - - - - - - - - - - - - {% for element in list_videos %} - - - - - - - - - {% endfor %} - -
    {% trans 'List of videos' %} ({{list_videos|length}})
    {% trans 'Thumbnail' %}{% trans 'Title' %}{% trans 'Owner' %}{% trans 'Duration' %}{% trans 'Position' %}{% trans 'Actions' %}
    - - {% trans 'Video thumbnail' %} - - {{element.video.title}}{{element.video.owner.get_full_name}}{{element.video.duration_in_time}}{{element.position}} - - - -
    -
    - -
    -
    \ No newline at end of file diff --git a/pod/playlist/templates/playlist/playlist_link.html b/pod/playlist/templates/playlist/playlist_link.html new file mode 100644 index 0000000000..499c41d06d --- /dev/null +++ b/pod/playlist/templates/playlist/playlist_link.html @@ -0,0 +1,9 @@ +{% load i18n %} +{% spaceless %} + + + + + + +{% endspaceless %} diff --git a/pod/playlist/templates/playlist/playlist_list.html b/pod/playlist/templates/playlist/playlist_list.html deleted file mode 100644 index afd9d3c5b9..0000000000 --- a/pod/playlist/templates/playlist/playlist_list.html +++ /dev/null @@ -1,42 +0,0 @@ -{# HTML for playlist list. Don't use this file alone it must be integrated into another template! #} -{% load i18n %} -{% spaceless %} -
    - {% for playlist in playlists %} -
    -
    - - {% if playlist.visible %} - - {% else %} - - {% endif %} -
    -

    {{playlist.title}}

    -

    {% blocktrans count counter=playlist.videos|length %}{{counter}} video{% plural %}{{counter}} videos{% endblocktrans %}

    -

    {{playlist.description}}

    -
    -
    - {% trans 'Edit' %} - {% if playlist.videos %} - {% trans 'Launch' %} - {% endif %} -
    -
    -
    - {% empty %} -
    -

    {% trans "Sorry, no playlist found" %}

    -
    - {% endfor %} -
    - - - -
    - {% if playlists.has_next %} - {% trans "More" %} - {% endif %} - -
    -{% endspaceless %} diff --git a/pod/playlist/templates/playlist/playlist_player.html b/pod/playlist/templates/playlist/playlist_player.html new file mode 100644 index 0000000000..24584d0dab --- /dev/null +++ b/pod/playlist/templates/playlist/playlist_player.html @@ -0,0 +1,78 @@ +{% load i18n l10n static %} +{% load playlist_buttons %} +{% load favorites_playlist %} + +{% block page_extra_head %} + +{% endblock page_extra_head %} + + + +
    + {% get_playlist_name playlist_in_get as playlist_name %} +

     {% trans "Playlist:" %} {{ playlist_name|capfirst|truncatechars:20 }}

    + +
    + + + + diff --git a/pod/playlist/templates/playlist/playlist_sort_select.html b/pod/playlist/templates/playlist/playlist_sort_select.html new file mode 100644 index 0000000000..0cffcfcbd6 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist_sort_select.html @@ -0,0 +1,17 @@ +{% load i18n %} +
    + + {% if sort_direction == 'on' %} + + {% else %} + + {% endif %} + + + + +
    diff --git a/pod/playlist/templates/playlist/playlist_video_card.html b/pod/playlist/templates/playlist/playlist_video_card.html deleted file mode 100644 index e61ec60e68..0000000000 --- a/pod/playlist/templates/playlist/playlist_video_card.html +++ /dev/null @@ -1,48 +0,0 @@ -{% load i18n %} -{% spaceless %} -
    - -
    -
    - - {{ position }} - {{video.duration_in_time}} - - - {% if video.password or video.is_restricted %} - - - - {% endif %} - - {% if video.is_draft %} - - - - {% endif %} - {% if video.chapter_set.all %} - - - - {% endif %} - {% if video.is_video %} - - - - {% else %} - - - - {% endif %} - -
    -
    -
    - -
    {{video.get_thumbnail_card|safe}}
    - {{video.title|capfirst|truncatechars:43}} - -     -
    -
    -{% endspaceless %} \ No newline at end of file diff --git a/pod/playlist/templates/playlist/playlist_video_list.html b/pod/playlist/templates/playlist/playlist_video_list.html deleted file mode 100644 index c42d991d24..0000000000 --- a/pod/playlist/templates/playlist/playlist_video_list.html +++ /dev/null @@ -1,87 +0,0 @@ -{# HTML for playlist list. Don't use this file alone it must be integrated into another template! #} -{% load i18n static %} - -{% with pllength=playlist.videos|length %} -
    - {% if is_iframe %} -
    -

    -  {{ playlist.title }} - - ({% blocktrans count counter=pllength %}{{ counter }} video{% plural %}{{ counter }} videos){% endblocktrans %}) - -

    - - {% include 'playlist/player_controls.html' %} -
    - {% else %} -

    - - {% trans 'Playlist' %} - {% blocktrans count counter=pllength %}{{ counter }} video{% plural %}{{ counter }} videos{% endblocktrans %} - {% include 'playlist/player_controls.html' %} -

    - {% endif %} -
    -
    - {% for pvideo in playlist.videos %} -
    - {% include 'playlist/playlist_video_card.html' with video=pvideo playlist=playlist position=forloop.counter %} -
    - {% endfor %} -
    -
    -
    -{% endwith %} - - diff --git a/pod/playlist/templates/playlist/playlist_visibility_icon.html b/pod/playlist/templates/playlist/playlist_visibility_icon.html new file mode 100644 index 0000000000..70c01fa4c7 --- /dev/null +++ b/pod/playlist/templates/playlist/playlist_visibility_icon.html @@ -0,0 +1,21 @@ +{% load i18n %} + +{% if playlist.visibility == "protected" %} + + + +{% elif playlist.visibility == "private" %} + + + +{% elif playlist.visibility == "public" %} + {% if playlist.promoted %} + + + + {% else %} + + + + {% endif %} +{% endif %} \ No newline at end of file diff --git a/pod/playlist/templates/playlist/playlists.html b/pod/playlist/templates/playlist/playlists.html new file mode 100644 index 0000000000..275380f916 --- /dev/null +++ b/pod/playlist/templates/playlist/playlists.html @@ -0,0 +1,59 @@ +{% extends 'base.html' %} +{% load i18n l10n %} +{% load static %} +{% load thumbnail %} + +{% block more_style %} + +{% endblock more_style %} + +{% block breadcrumbs %}{{ block.super }}
  • {% trans "Playlists" %}
    • {% endblock %} + +{% block page_content %} +
    + {% if playlists|length != 0 %} +

    + {% blocktrans count counter=playlists|length %}{{ counter }} playlist found{% plural %}{{ counter }} playlists found{% endblocktrans %} +

    +
    + {% if playlists|length > 1 %} +
    + {% include "playlist/playlist_sort_select.html" %} +
    + {% endif %} + {% else %} +

    {% trans "No playlists found"%}

    +

    + {% blocktrans %}You haven't got any playlist yet, please use the "Add a playlist" button to add one.{% endblocktrans %} +

    + {% endif %} +
    + +
    + + {% trans "Add a playlist" %} + +
    + +
    + {% for playlist in playlists %} +
    + {% include "playlist/playlist_card.html" %} +
    + {% endfor %} +
    + +{% endblock page_content %} + +{% block collapse_page_aside %} + {{ block.super }} +{% endblock collapse_page_aside %} + +{% block page_aside %} + {% include 'playlist/filter_aside.html' %} +{% endblock page_aside %} + +{% block more_script %} + + +{% endblock more_script %} \ No newline at end of file diff --git a/pod/playlist/templates/playlist/protected-playlist-form.html b/pod/playlist/templates/playlist/protected-playlist-form.html new file mode 100644 index 0000000000..911c667b05 --- /dev/null +++ b/pod/playlist/templates/playlist/protected-playlist-form.html @@ -0,0 +1,56 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} +{% load favorites_playlist %} + +{% block page_title %}{% trans 'Protected playlist form' %}{% endblock %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Playlists" %} + +
    • +
  • + {% get_playlist_name playlist %} +
    • +{% endblock %} + +{% block page_content %} +
    + {% csrf_token %} +
    +
    + {% trans 'Password required' %} +

    {% trans 'This playlist is protected by password, please fill in and click send.' %}

    + + {% if form.errors %} +

    {% trans "One or more errors have been found in the form." %}

    + {% endif %} + {% for field_hidden in form.hidden_fields %} + {{field_hidden}} + {% endfor %} + {% for field in form.visible_fields %} + {% spaceless %} +
    + {{ field.errors }} + + {{ field }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} + {% if field.field.required %}
    {% trans "Please provide a valid value for this field." %}
    {% endif %} +
    + {% endspaceless %} + {% endfor %} +
    + +
    +
    +
    +
    +

    + {% trans 'If you do not have the password for this content, please' %} {% trans 'contact its owner' %}. +

    +{% endblock %} \ No newline at end of file diff --git a/pod/playlist/templates/playlist_player-iframe.html b/pod/playlist/templates/playlist_player-iframe.html deleted file mode 100644 index 49d98f5b12..0000000000 --- a/pod/playlist/templates/playlist_player-iframe.html +++ /dev/null @@ -1,177 +0,0 @@ -{% extends 'videos/video-iframe.html' %} {% load i18n %} {% load static %} {% block page_extra_head %} {% include 'videos/video-header.html' %} - - - - -{% endblock page_extra_head %} {% block breadcrumbs %}{{ block.super }}{%endblock %} {% block page_title %}{%if channel %}{{channel.title}} - -{%endif%}{%if theme %}{{theme.title}} - {%endif%}({% trans 'Enriched' %}) -{{video.title}}{% endblock %} {% block page_content %} -
    - {% include 'playlist/playlist_video_list.html' with is_iframe=True %} - {% block video-element %} - {% if form %} - {% include 'videos/video-form.html' %} {% else%} - - {%endif%} {% endblock video-element %} - -
    -
    -

    {{ video.title }}

    - -
    -
    -
    - -
    - -{% block more_script %} -{% if not form %} -{% include 'videos/video-script.html'%} - -{% endblock more_script %} -{% endblock page_content %} diff --git a/pod/playlist/templates/playlist_player.html b/pod/playlist/templates/playlist_player.html deleted file mode 100644 index 3aba4adf80..0000000000 --- a/pod/playlist/templates/playlist_player.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends 'videos/video.html' %} -{% load i18n %} -{% load static %} - -{% block page_extra_head %} -{% include 'videos/video-header.html' %} - - - -{% endblock page_extra_head %} - -{% block breadcrumbs %} -
  • {% trans 'Home' %}
    • -
  • {% trans 'Playlist' %}
    • -
  • {{playlist.title|capfirst|truncatechars:45}}
    • -
  • {{video.title|capfirst|truncatechars:45}}
    • -{% endblock %} - -{% block page_title %}{% if channel %}{{channel.title}} — {% endif %}{% if theme %}{{theme.title}} — {% endif %}({% trans 'Enriched' %}) {{video.title}}{% endblock %} - -{% block page_content %} -{% block video-element %} -{% if form %} - {% include 'videos/video-form.html' %} -{% else %} - -
    -{% endif %} -{% endblock video-element %} -{% endblock page_content %} - -{% block page_aside %} -{% include 'playlist/playlist_video_list.html' %} -
    -

    -  {% trans 'Informations' %} -

    -
    -

    {% trans 'To help you, the different types of enrichments have specific colors:' %}

    -

    -

      -
    • {% trans 'Image' %}
      • -
    • {% trans 'Document' %}
      • -
    • {% trans 'Richtext' %}
      • -
    • {% trans 'Weblink' %}
      • -
    • {% trans 'Embed' %}
      • -
    -

    -

    {% trans 'They are visible on the video playback bar.' %}

    -
    -
    - {{ block.super }} -{% endblock page_aside %} - -{% block more_script %} -{{block.super}} -{% endblock more_script %} diff --git a/pod/favorite/__init__.py b/pod/playlist/templatetags/__init__.py similarity index 100% rename from pod/favorite/__init__.py rename to pod/playlist/templatetags/__init__.py diff --git a/pod/playlist/templatetags/favorites_playlist.py b/pod/playlist/templatetags/favorites_playlist.py new file mode 100644 index 0000000000..a12efb9808 --- /dev/null +++ b/pod/playlist/templatetags/favorites_playlist.py @@ -0,0 +1,62 @@ +from django.template import Library +from django.contrib.auth.models import User +from django.utils.translation import ugettext_lazy as _ + +from pod.video.models import Video + +from ..apps import FAVORITE_PLAYLIST_NAME +from ..models import Playlist +from ..utils import ( + check_video_in_playlist, + get_favorite_playlist_for_user, +) + + +register = Library() + + +@register.simple_tag(name="get_favorite_playlist") +def get_favorite_playlist(user: User) -> Playlist: + """ + Get the favorite playlist of a user. + + Args: + user (:class:`django.contrib.auth.models.User`): The user object + + Returns: + Playlist: The favorite playlist + """ + return get_favorite_playlist_for_user(user) + + +@register.simple_tag(name="is_favorite") +def is_favorite(user: User, video: Video) -> bool: + """ + Template tag to check if the user has this video as favorite. + + Args: + context (dict): The template context dictionary + user (:class:`django.contrib.auth.models.User`): The user object + video (:class:`pod.video.models.Video`): The video entity to check + + Returns: + bool: `True` if the user has the video as favorite, `False` otherwise + """ + return check_video_in_playlist(get_favorite_playlist_for_user(user), video) + + +@register.simple_tag(name="get_playlist_name") +def get_playlist_name(playlist: Playlist) -> str: + """ + Get the playlist name. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The specific playlist + + Returns: + str: The favorites playlist name + """ + if playlist.name == FAVORITE_PLAYLIST_NAME: + return _("Favorites") + else: + return playlist.name diff --git a/pod/playlist/templatetags/playlist_buttons.py b/pod/playlist/templatetags/playlist_buttons.py new file mode 100644 index 0000000000..f56769189e --- /dev/null +++ b/pod/playlist/templatetags/playlist_buttons.py @@ -0,0 +1,63 @@ +"""Template tags used for playlist application buttons.""" + +from django.template import Library + +from pod.video.models import Video +from ..models import Playlist +from ..utils import ( + get_link_to_start_playlist as get_link_to_start_playlist_util, + user_can_see_playlist_video, +) + +register = Library() + + +@register.simple_tag(takes_context=True, name="user_can_edit_or_remove") +def user_can_edit_or_remove(context: dict, playlist: Playlist) -> bool: + """ + Template tag used to check if the user can edit or remove a specific playlist. + + Args: + context (dict): The context. + playlist (:class:`pod.playlist.models.Playlist`): The specific playlist. + + Returns: + bool: `True` if the user can do it. `False` otherwise. + """ + request = context["request"] + if not request.user.is_authenticated: + return False + return playlist.editable and (request.user == playlist.owner or request.user.is_staff) + + +@register.simple_tag(takes_context=True, name="get_link_to_start_playlist") +def get_link_to_start_playlist(context: dict, playlist: Playlist, video=None) -> str: + """ + Template tag used to get the link to start a specific playlist. + + Args: + context (dict): The context. + playlist (:class:`pod.playlist.models.Playlist`): The specific playlist. + video (:class:`pod.video.models.Video`): The video entity to check, default to None + + + Returns: + str: Link to start the playlist. + """ + request = context["request"] + return get_link_to_start_playlist_util(request, playlist, video) + + +@register.simple_tag(takes_context=True, name="can_see_playlist_video") +def can_see_playlist_video(context: dict, video: Video) -> bool: + """ + Template tag to check if the user can see a playlist video. + + Args: + context (dict): The template context dictionary + video (:class:`pod.video.models.Video`): The video entity to check + + Returns: + bool: `True` if the user can, `False` otherwise + """ + return user_can_see_playlist_video(context["request"], video) diff --git a/pod/playlist/templatetags/playlist_list_modal.py b/pod/playlist/templatetags/playlist_list_modal.py new file mode 100644 index 0000000000..06fc06b531 --- /dev/null +++ b/pod/playlist/templatetags/playlist_list_modal.py @@ -0,0 +1,41 @@ +from django.template import Library +from django.contrib.auth.models import User + +from pod.video.models import Video +from ..models import Playlist +from ..utils import ( + check_video_in_playlist, + get_playlist_list_for_user, + get_playlists_for_additional_owner +) + +register = Library() + + +@register.simple_tag(name="get_user_playlists") +def get_user_playlists(user: User) -> list: + """ + Get all playlist for a user. + + Args: + user (:class:`django.contrib.auth.models.User`): The user object + + Returns: + list (:class:`list(pod.playlist.models.Playlist)`): The list of playlist. + """ + return get_playlist_list_for_user(user) | get_playlists_for_additional_owner(user) + + +@register.simple_tag(name="video_in_playlist") +def video_in_playlist(playlist: Playlist, video: Video) -> bool: + """ + Verify if a video is present in a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + video (:class:`pod.video.models.Video`): The video object + + Returns: + bool: True if the video is on the playlist, False otherwise + """ + return check_video_in_playlist(playlist, video) diff --git a/pod/playlist/tests/test_forms.py b/pod/playlist/tests/test_forms.py new file mode 100644 index 0000000000..b1c5723f1c --- /dev/null +++ b/pod/playlist/tests/test_forms.py @@ -0,0 +1,241 @@ +"""Tests the forms for playlist module.""" +from django.utils.translation import ugettext as _ +from django.test import override_settings, TestCase + +from ...playlist.forms import PlaylistForm, PlaylistRemoveForm, PlaylistPasswordForm +from ...playlist.apps import FAVORITE_PLAYLIST_NAME + + +FIELD_REQUIRED_ERROR_MESSAGE = _("This field is required.") + +# ggignore-start +# gitguardian:ignore +PWD = "thisisnotpassword" +# ggignore-end + + +class PlaylistFormTest(TestCase): + """ + Tests for the playlist form. + + Args: + TestCase (::class::`django.test.TestCase`): The test case. + """ + + @override_settings(USE_PLAYLIST=True) + def test_valid_data_for_public_playlist(self): + """ + Test the form with valid data for a public playlist. + """ + form = PlaylistForm(data={ + "name": "Test Playlist", + "description": "Test description", + "visibility": "public", + "password": "", + "autoplay": True, + "additional_owners": [], + }) + self.assertTrue(form.is_valid()) + print(" ---> test_valid_data_for_public_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_valid_data_for_private_playlist(self): + """ + Test the form with valid data for a private playlist. + """ + form = PlaylistForm(data={ + "name": "Test Playlist", + "description": "Test description", + "visibility": "private", + "password": "", + "autoplay": True, + "additional_owners": [], + }) + self.assertTrue(form.is_valid()) + print(" ---> test_valid_data_for_private_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_valid_data_for_protected_playlist(self): + """ + Test the form with valid data for a protected playlist. + """ + form = PlaylistForm(data={ + "name": "Test Playlist", + "description": "Test description", + "visibility": "protected", + "password": PWD, + "autoplay": True, + "additional_owners": [], + }) + self.assertTrue(form.is_valid()) + print(" ---> test_valid_data_for_protected_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_invalid_data_for_protected_playlist(self): + """ + Test the form with invalid data for a protected playlist. + """ + form = PlaylistForm(data={ + "name": "Test Playlist", + "description": "Test description", + "visibility": "protected", + "password": "", + "autoplay": True, + "additional_owners": [], + }) + self.assertFalse(form.is_valid()) + print(" ---> test_invalid_data_for_protected_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_name_validation_for_public_playlist(self): + """ + Test if the name validation works correctly for a public playlist. + """ + valid_form = PlaylistForm(data={ + "name": "Valid Name", + "visibility": "public", + }) + invalid_form = PlaylistForm(data={ + "name": FAVORITE_PLAYLIST_NAME, + "visibility": "public", + }) + self.assertTrue(valid_form.is_valid()) + self.assertFalse(invalid_form.is_valid()) + self.assertEqual(invalid_form.errors["name"][0], _("You cannot create a playlist named \"Favorites\"")) + print(" ---> test_name_validation_for_public_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_name_validation_for_private_playlist(self): + """ + Test if the name validation works correctly for a private playlist. + """ + valid_form = PlaylistForm(data={ + "name": "Valid Name", + "visibility": "private", + }) + invalid_form = PlaylistForm(data={ + "name": FAVORITE_PLAYLIST_NAME, + "visibility": "private", + }) + self.assertTrue(valid_form.is_valid()) + self.assertFalse(invalid_form.is_valid()) + self.assertEqual(invalid_form.errors["name"][0], _("You cannot create a playlist named \"Favorites\"")) + print(" ---> test_name_validation_for_private_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_name_validation_for_protected_playlist(self): + """ + Test if the name validation works correctly for a protected playlist. + """ + valid_form = PlaylistForm(data={ + "name": "Valid Name", + "visibility": "protected", + "password": PWD, + }) + invalid_form = PlaylistForm(data={ + "name": FAVORITE_PLAYLIST_NAME, + "visibility": "protected", + "password": PWD, + }) + self.assertTrue(valid_form.is_valid()) + self.assertFalse(invalid_form.is_valid()) + self.assertEqual(invalid_form.errors["name"][0], _("You cannot create a playlist named \"Favorites\"")) + print(" ---> test_name_validation_for_protected_playlist ok") + + @override_settings(USE_PLAYLIST=True) + def test_blank_data_for_public_playlist(self): + """ + Test the form with blank data for a public playlist. + """ + form = PlaylistForm(data={}) + self.assertFalse(form.is_valid()) + self.assertLessEqual(1, len(form.errors)) + print(" ---> test_blank_data_for_public_playlist ok") + + +class PlaylistRemoveFormTest(TestCase): + """ + Tests to remove a playlist form. + + Args: + TestCase (::class::`django.test.TestCase`): The test case. + """ + + @override_settings(USE_PLAYLIST=True) + def test_valid_data(self): + """ + Test the form with valid data. + """ + form = PlaylistRemoveForm(data={"agree": True}) + self.assertTrue(form.is_valid()) + print(" ---> test_valid_data ok") + + @override_settings(USE_PLAYLIST=True) + def test_agree_required(self): + """ + Test the form with agree field not selected and not provided. + """ + agree_not_selected_form = PlaylistRemoveForm(data={"agree": False}) + agree_not_provided_form = PlaylistRemoveForm(data={}) + self.assertFalse(agree_not_selected_form.is_valid()) + self.assertEqual(len(agree_not_selected_form.errors), 1) + self.assertEqual(agree_not_selected_form.errors["agree"][0], FIELD_REQUIRED_ERROR_MESSAGE) + self.assertFalse(agree_not_provided_form.is_valid()) + self.assertEqual(len(agree_not_provided_form.errors), 1) + self.assertEqual(agree_not_provided_form.errors["agree"][0], FIELD_REQUIRED_ERROR_MESSAGE) + print(" ---> test_agree_required ok") + + @override_settings(USE_PLAYLIST=True) + def test_blank_data(self): + """ + Test the form with empty data. + """ + form = PlaylistRemoveForm(data={}) + self.assertFalse(form.is_valid()) + self.assertEqual(len(form.errors), 1) + self.assertEqual(form.errors["agree"][0], FIELD_REQUIRED_ERROR_MESSAGE) + print(" ---> test_blank_data ok") + + +class PlaylistPasswordFormTests(TestCase): + """ + Tests for playlist password form. + + Args: + TestCase (::class::`django.test.TestCase`): The test case. + """ + + @override_settings(USE_PLAYLIST=True) + def test_valid_data(self): + """ + Test the form with valid data. + """ + form = PlaylistPasswordForm(data={"password": PWD}) + self.assertTrue(form.is_valid()) + print(" ---> test_valid_data ok") + + @override_settings(USE_PLAYLIST=True) + def test_password_required(self): + """ + Test the form with password field empty and not provided. + """ + password_not_provided_form = PlaylistPasswordForm(data={}) + empty_password_form = PlaylistPasswordForm(data={"password": ""}) + self.assertFalse(password_not_provided_form.is_valid()) + self.assertEqual(len(password_not_provided_form.errors), 1) + self.assertEqual(password_not_provided_form.errors["password"][0], FIELD_REQUIRED_ERROR_MESSAGE) + self.assertFalse(empty_password_form.is_valid()) + self.assertEqual(len(empty_password_form.errors), 1) + self.assertEqual(empty_password_form.errors["password"][0], FIELD_REQUIRED_ERROR_MESSAGE) + print(" ---> test_password_required ok") + + @override_settings(USE_PLAYLIST=True) + def test_blank_data(self): + """ + Test the form with empty data. + """ + form = PlaylistPasswordForm(data={}) + self.assertFalse(form.is_valid()) + self.assertEqual(len(form.errors), 1) + self.assertEqual(form.errors["password"][0], FIELD_REQUIRED_ERROR_MESSAGE) + print(" ---> test_blank_data ok") diff --git a/pod/playlist/tests/test_models.py b/pod/playlist/tests/test_models.py index 6d96886012..ceb7884666 100644 --- a/pod/playlist/tests/test_models.py +++ b/pod/playlist/tests/test_models.py @@ -1,188 +1,184 @@ -"""Unit tests for playlist models.""" -from django.test import TestCase +"""Tests the models for playlist module.""" + from django.contrib.auth.models import User -from django.core.exceptions import ValidationError -from pod.video.models import Video -from pod.video.models import Type -from pod.playlist.models import Playlist -from pod.playlist.models import PlaylistElement +from django.utils.translation import ugettext as _ +from django.test import TestCase + +from pod.video.models import Type, Video +from ..models import Playlist, PlaylistContent -class PlaylistModelTestCase(TestCase): - """Test case for Pod Playlist model.""" - fixtures = [ - "initial_data.json", - ] +# ggignore-start +# gitguardian:ignore +class PlaylistModelTests(TestCase): + """ + Tests for the Playlist model. + + Args: + TestCase (::class::`django.test.TestCase`): The test case. + """ def setUp(self): - owner = User.objects.create(username="test") + """ + Set up the tests. + """ + self.user = User.objects.create_user(username="testuser", password="testpassword") + + def test_create_playlist(self): + """ + Test the model creation. + """ playlist = Playlist.objects.create( - title="playlist", - owner=owner, + name="Test Playlist", + description="Test description", + visibility="public", + autoplay=True, + owner=self.user, ) - videotype = Type.objects.create(title="others") - video = Video.objects.create( - title="video1", - type=videotype, - owner=owner, - video="test.mp4", + self.assertEqual(playlist.name, "Test Playlist") + self.assertEqual(playlist.description, "Test description") + self.assertEqual(playlist.visibility, "public") + self.assertTrue(playlist.autoplay) + self.assertEqual(playlist.owner, self.user) + print(" ---> test_create_playlist ok") + + def test_default_values(self): + """ + Test the model default values. + """ + playlist = Playlist.objects.create(owner=self.user) + self.assertEqual(playlist.name, _("Playlist")) + self.assertEqual(playlist.description, "") + self.assertEqual(playlist.password, "") + self.assertEqual(playlist.visibility, "private") + self.assertTrue(playlist.autoplay) + self.assertTrue(playlist.editable) + print(" ---> test_default_values ok") + + def test_slug_generation(self): + """ + Test the model slug generation. + """ + playlist = Playlist.objects.create(name="Test Playlist", owner=self.user) + self.assertEqual(playlist.slug, f"{playlist.id}-test-playlist") + print(" ---> test_slug_generation ok") + + def test_additional_owners(self): + """ + Test the model additional owners. + """ + owner1 = User.objects.create_user(username="owner1", password="testpassword") + owner2 = User.objects.create_user(username="owner2", password="testpassword") + playlist = Playlist.objects.create(name="Test Playlist", owner=owner1) + playlist.additional_owners.add(owner2) + self.assertEqual(playlist.additional_owners.count(), 1) + self.assertEqual(playlist.additional_owners.first(), owner2) + print(" ---> test_additional_owners ok") + + def test_date_created_and_updated(self): + """ + Test the model creation date and update date. + """ + playlist = Playlist.objects.create(name="Test Playlist", owner=self.user) + self.assertIsNotNone(playlist.date_created) + self.assertIsNotNone(playlist.date_updated) + self.assertLessEqual(playlist.date_created, playlist.date_updated) + print(" ---> test_date_created_and_updated ok") + + def test_string_representation(self): + """ + Test the model string representation. + """ + playlist = Playlist.objects.create(name="Test Playlist", owner=self.user) + self.assertEqual(str(playlist), playlist.slug) + print(" ---> test_string_representation ok") + + +class PlaylistContentModelTests(TestCase): + """ + Tests for the PlaylistContent model. + + Args: + TestCase (::class::`django.test.TestCase`): The test case. + """ + + fixtures = ["initial_data.json"] + + def setUp(self): + """ + Set up the tests. + """ + self.user = User.objects.create_user(username='testuser', password='testpassword') + self.playlist = Playlist.objects.create(name='Test Playlist', owner=self.user) + self.video = Video.objects.create( + title="Video", + owner=self.user, + video="video.mp4", is_draft=False, + type=Type.objects.get(id=1), ) - video2 = Video.objects.create( - title="video2", - type=videotype, - owner=owner, - video="test.mp4", + self.video2 = Video.objects.create( + title="Video 2", + owner=self.user, + video="video-2.mp4", is_draft=False, + type=Type.objects.get(id=1), ) - Playlist.objects.create( - title="playlist2", - owner=owner, - description="description", - visible=True, + + def test_create_playlist_content(self): + """ + Test the model creation. + """ + playlist_content = PlaylistContent.objects.create( + playlist=self.playlist, + video=self.video ) - PlaylistElement.objects.create(playlist=playlist, video=video, position=1) - PlaylistElement.objects.create(playlist=playlist, video=video2, position=2) - - def test_attributs(self): - playlist = Playlist.objects.get(id=1) - owner = User.objects.get(id=1) - self.assertEqual(playlist.title, "playlist") - self.assertEqual(playlist.slug, "1-playlist") - self.assertEqual(playlist.owner, owner) - self.assertEqual(playlist.description, None) - self.assertFalse(playlist.visible) - - print(" ---> test_attributs: OK! --- PlaylistModel") - - def test_attributs_full(self): - playlist = Playlist.objects.get(id=2) - owner = User.objects.get(id=1) - self.assertEqual(playlist.title, "playlist2") - self.assertEqual(playlist.slug, "2-playlist2") - self.assertEqual(playlist.owner, owner) - self.assertEqual(playlist.description, "description") - self.assertTrue(playlist.visible) - - print(" ---> test_attributs_full: OK! --- PlaylistModel") - - def test_first(self): - playlist = Playlist.objects.get(id=1) - element = PlaylistElement.objects.get(id=1) - self.assertEqual(playlist.first(), element) - - print(" ---> test_first: OK! --- PlaylistModel") - - def test_last(self): - playlist = Playlist.objects.get(id=1) - playlist2 = Playlist.objects.get(id=2) - self.assertEqual(playlist.last(), 3) - self.assertEqual(playlist2.last(), 1) - - print(" ---> test_last: OK! --- PlaylistModel") - - def test_videos(self): - playlist = Playlist.objects.get(id=1) - video = Video.objects.get(id=1) - video2 = Video.objects.get(id=2) - self.assertTrue(len(playlist.videos()) == 2) - self.assertEqual(playlist.videos()[0], video) - self.assertEqual(playlist.videos()[1], video2) - - print(" ---> test_videos: OK! --- PlaylistModel") - print(" [ END PLAYLIST_TEST MODEL ] ") - - def test_delete(self): - Playlist.objects.get(id=1).delete() - Playlist.objects.get(id=2).delete() - self.assertEqual(Playlist.objects.all().count(), 0) - self.assertEqual(PlaylistElement.objects.all().count(), 0) - - print(" ---> test_delete: OK! --- PlaylistModel") - - -class PlaylistElementModelTestCase(TestCase): - def setUp(self): - owner = User.objects.create(username="test") - playlist = Playlist.objects.create( - title="playlist", - owner=owner, + self.assertEqual(playlist_content.playlist, self.playlist) + self.assertEqual(playlist_content.video, self.video) + self.assertEqual(playlist_content.rank, 1) + print(" ---> test_create_playlist_content ok") + + def test_unique_constraint(self): + """ + Test creating two playlist contents with the same playlist and video. + """ + PlaylistContent.objects.create( + playlist=self.playlist, + video=self.video ) - videotype = Type.objects.create(title="others") - video = Video.objects.create( - title="video1", - type=videotype, - owner=owner, - video="test.mp4", - is_draft=False, + with self.assertRaises(Exception): + PlaylistContent.objects.create( + playlist=self.playlist, + video=self.video + ) + print(" ---> test_unique_constraint ok") + + def test_rank_generation(self): + """ + Test the rank generation playlist content. + """ + playlist_content1 = PlaylistContent.objects.create( + playlist=self.playlist, + video=self.video ) - video2 = Video.objects.create( - title="video2", - type=videotype, - owner=owner, - video="test.mp4", - is_draft=False, - ) - Video.objects.create( - title="video3", type=videotype, owner=owner, video="test.mp4" + playlist_content2 = PlaylistContent.objects.create( + playlist=self.playlist, + video=self.video2 ) - Video.objects.create( - title="video4", - type=videotype, - owner=owner, - video="test.mp4", - is_draft=False, - password="test", + self.assertEqual(playlist_content1.rank, 1) + self.assertEqual(playlist_content2.rank, 2) + print(" ---> test_rank_generation ok") + + def test_string_representation(self): + """ + Test the string representation models. + """ + playlist_content = PlaylistContent.objects.create( + playlist=self.playlist, + video=self.video ) - PlaylistElement.objects.create(playlist=playlist, video=video) - PlaylistElement.objects.create(playlist=playlist, video=video2, position=2) - - def test_attributs(self): - element = PlaylistElement.objects.get(id=1) - video = Video.objects.get(id=1) - playlist = Playlist.objects.get(id=1) - self.assertEqual(element.playlist, playlist) - self.assertEqual(element.video, video) - self.assertEqual(element.position, 1) - - print(" ---> test_attributs: OK! --- PlaylistElementModel") - - def test_attributs_full(self): - element = PlaylistElement.objects.get(id=2) - video2 = Video.objects.get(id=2) - playlist = Playlist.objects.get(id=1) - self.assertEqual(element.playlist, playlist) - self.assertEqual(element.video, video2) - self.assertEqual(element.position, 2) - - print(" ---> test_attributs_full: OK! --- PlaylistElementModel") - - def test_delete(self): - PlaylistElement.objects.get(id=1).delete() - PlaylistElement.objects.get(id=2).delete() - self.assertTrue(PlaylistElement.objects.all().count() == 0) - self.assertTrue(Playlist.objects.all().count() == 1) - - print(" ---> test_delete: OK! --- PlaylistElementModel") - - def test_add_draft(self): - playlist = Playlist.objects.get(id=1) - video = Video.objects.get(id=3) - element = PlaylistElement() - element.playlist = playlist - element.video = video - self.assertRaises(ValidationError, element.clean) - - print(" [ BEGIN PLAYLIST_TEST MODEL ] ") - print(" ---> test_add_draft: OK! -- PlaylistElementModel") - - def test_add_password(self): - playlist = Playlist.objects.get(id=1) - video = Video.objects.get(id=4) - element = PlaylistElement() - element.playlist = playlist - element.video = video - self.assertRaises(ValidationError, element.clean) - - print(" ---> test_add_password: OK! -- PlaylistElementModel") + expected_string = f"Playlist : {self.playlist} - Video : {self.video} - Rank : {playlist_content.rank}" + self.assertEqual(str(playlist_content), expected_string) + print(" ---> test_string_representation ok") +# ggignore-end diff --git a/pod/playlist/tests/test_utils.py b/pod/playlist/tests/test_utils.py new file mode 100644 index 0000000000..7612a98ee1 --- /dev/null +++ b/pod/playlist/tests/test_utils.py @@ -0,0 +1,432 @@ +"""Unit tests for Esup-Pod playlist utilities.""" +import hashlib +from django.test import TestCase +from django.contrib.auth.models import User +from pod.video.models import Type, Video +from pod.playlist.models import Playlist, PlaylistContent +from pod.playlist.utils import ( + check_password, + check_video_in_playlist, + get_link_to_start_playlist, + get_next_rank, + get_number_playlist, + get_number_video_added_in_playlist, + get_number_video_in_playlist, + get_playlist, + get_playlist_list_for_user, + get_playlists_for_additional_owner, + get_promoted_playlist, + get_public_playlist, + get_video_list_for_playlist, + user_add_video_in_playlist, + user_remove_video_from_playlist, + remove_playlist, + get_number_video_added_in_specific_playlist, + get_favorite_playlist_for_user, + get_additional_owners, + get_total_favorites_video, + get_count_video_added_in_playlist +) + + +class PlaylistTestUtils(TestCase): + """TestCase for Esup-Pod playlist utilities.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + self.user = User.objects.create(username="pod", password="pod1234pod") + self.user2 = User.objects.create(username="pod2", password="pod1234pod2") + self.video = Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video2 = Video.objects.create( + title="Video2", + owner=self.user, + video="test2.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video3 = Video.objects.create( + title="Video3", + owner=self.user2, + video="test3.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.playlist = Playlist.objects.create( + name="Playlist1", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + + def test_user_add_video_in_playlist(self) -> None: + """Test if test_user_add_video_in_playlist works correctly.""" + user_add_video_in_playlist(self.playlist, self.video) + video_in_playlist = PlaylistContent.objects.filter( + playlist=self.playlist, + video=self.video + ).exists() + self.assertTrue( + video_in_playlist, + "Test if tuple has been correctly inserted." + ) + user_add_video_in_playlist(self.playlist, self.video) + self.assertEqual( + 1, + get_number_video_in_playlist(self.playlist) + ) + print(" ---> test_user_add_video_in_playlist ok") + + def test_user_remove_video_from_playlist(self) -> None: + """Test if test_user_remove_video_from_playlist works correctly.""" + user_add_video_in_playlist(self.playlist, self.video) + user_remove_video_from_playlist(self.playlist, self.video) + video_in_playlist = PlaylistContent.objects.filter( + playlist=self.playlist, + video=self.video + ).exists() + self.assertFalse( + video_in_playlist, + "Test if tuple has been correctly removed." + ) + print(" ---> test_user_remove_video_from_playlist ok") + + def test_check_video_in_playlist(self) -> None: + """Test if test_check_video_in_playlist works correctly.""" + self.assertFalse( + check_video_in_playlist(self.playlist, self.video) + ) + user_add_video_in_playlist(self.playlist, self.video) + self.assertTrue( + check_video_in_playlist(self.playlist, self.video) + ) + print(" ---> test_check_video_in_playlist ok") + + def test_get_next_rank(self) -> None: + """Test if test_get_next_rank works correctly.""" + self.assertEqual( + 1, + get_next_rank(self.playlist) + ) + user_add_video_in_playlist(self.playlist, self.video) + user_add_video_in_playlist(self.playlist, self.video2) + self.assertEqual( + 3, + get_next_rank(self.playlist) + ) + print(" ---> test_get_next_rank ok") + + def test_get_number_playlist(self) -> None: + """Test if test_get_number_playlist works correctly.""" + self.assertEqual( + 2, + get_number_playlist(self.user) + ) # Favorites + Playlist1 + self.assertEqual( + 1, + get_number_playlist(self.user2) + ) # Favorites + print(" ---> test_get_number_playlist ok") + + def test_get_number_video_in_playlist(self) -> None: + """Test if test_get_number_video_in_playlist works correctly.""" + self.assertEqual( + 0, + get_number_video_in_playlist(self.playlist) + ) + user_add_video_in_playlist(self.playlist, self.video) + self.assertEqual( + 1, + get_number_video_in_playlist(self.playlist) + ) + print(" ---> test_get_number_video_in_playlist ok") + + def test_get_number_video_added_in_playlist(self) -> None: + """Test if test_get_number_video_in_playlist works correctly.""" + self.assertEqual( + 0, + get_number_video_added_in_playlist(self.video) + ) + playlist2 = Playlist.objects.create( + name="Playlist2", + description="Ma description", + visibility="private", + autoplay=True, + owner=self.user2 + ) + playlist3 = Playlist.objects.create( + name="Playlist3", + description="Ma description", + visibility="private", + autoplay=True, + owner=self.user + ) + user_add_video_in_playlist(self.playlist, self.video) + user_add_video_in_playlist(playlist2, self.video) + user_add_video_in_playlist(playlist3, self.video) + self.assertEqual( + 3, + get_number_video_added_in_playlist(self.video) + ) + print(" ---> test_get_number_video_added_in_playlist ok") + + def test_remove_playlist(self) -> None: + """Test if remove_playlist works correctly.""" + remove_playlist(self.user, self.playlist) + self.assertEqual(1, get_number_playlist(self.user)) + print(" ---> test_remove_playlist ok") + + def test_get_public_playlist(self) -> None: + """Test if test_get_public_playlist works correctly.""" + self.assertEqual(1, len(get_public_playlist())) + + Playlist.objects.create( + name="playlist_protected", + description="Ma description", + visibility="protected", + autoplay=True, + owner=self.user2 + ) + Playlist.objects.create( + name="playlist_private", + description="Ma description", + visibility="private", + autoplay=True, + owner=self.user + ) + + Playlist.objects.create( + name="playlist_public_2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + + self.assertEqual(2, len(get_public_playlist())) + print(" ---> test_get_public_playlist ok") + + def test_get_promoted_playlist(self) -> None: + """Test if test_get_promoted_playlist works correctly.""" + self.assertEqual(1, len(get_public_playlist())) + + Playlist.objects.create( + name="playlist_protected", + description="Ma description", + visibility="protected", + autoplay=True, + owner=self.user2 + ) + Playlist.objects.create( + name="playlist_private", + description="Ma description", + visibility="private", + autoplay=True, + owner=self.user + ) + + Playlist.objects.create( + name="playlist_public_2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user, + promoted=True + ) + + self.assertEqual(1, len(get_promoted_playlist())) + print(" ---> test_get_promoted_playlist ok") + + def test_get_playlist_list_for_user(self) -> None: + """Test if test_get_playlist_list_for_user works correctly.""" + playlist_user = Playlist.objects.create( + name="playlist_public_2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + playlist_user2 = Playlist.objects.create( + name="playlist_public_user2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user2 + ) + + self.assertEqual( + 3, + get_number_playlist(self.user) + ) + self.assertTrue( + playlist_user in get_playlist_list_for_user(self.user), + "The user playlist is in the list." + ) + self.assertFalse( + playlist_user2 in get_playlist_list_for_user(self.user), + "The user2 playlist is not present in the user list." + ) + print(" ---> test_get_playlist_list_for_user ok") + + def test_get_video_list_for_playlist(self) -> None: + """Test if test_get_video_list_for_playlist works correctly.""" + user_add_video_in_playlist(self.playlist, self.video) + user_add_video_in_playlist(self.playlist, self.video2) + + self.assertEqual( + 2, + len(get_video_list_for_playlist(self.playlist)) + ) + self.assertTrue( + check_video_in_playlist(self.playlist, self.video), + "The video is present on playlist list." + ) + self.assertTrue( + check_video_in_playlist(self.playlist, self.video2), + "The video2 is present on playlist list." + ) + print(" ---> test_get_video_list_for_playlist ok") + + def test_get_playlist(self) -> None: + """Test if test_get_playlist works correctly.""" + new_playlist = Playlist.objects.create( + name="new_playlist", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + self.assertEqual( + get_playlist(new_playlist.slug), + new_playlist + ) + print(" ---> test_get_playlist ok") + + def test_get_playlists_for_additional_owner(self) -> None: + """Test if get_playlists_for_additional_owner works correctly.""" + new_playlist = Playlist.objects.create( + name="new_playlist", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + new_playlist.additional_owners.add(self.user2) + new_playlist.save() + self.assertTrue( + new_playlist in get_playlists_for_additional_owner(self.user2), + "The playlist is present on additional playlist list." + ) + print(" ---> test_get_playlists_for_additional_owner ok") + + def test_get_link_to_start_playlist(self) -> None: + """Test if get_link_to_start_playlist works correctly.""" + user_add_video_in_playlist(self.playlist, self.video) + self.assertEqual( + get_link_to_start_playlist(self.user, self.playlist), + f"/video/{self.video.slug}/?playlist={self.playlist.slug}" + ) + print(" ---> test_get_link_to_start_playlist ok") + + def test_get_number_video_added_in_specific_playlist(self): + """Test if get_number_video_added_in_specific_playlist works correctly.""" + user_add_video_in_playlist(self.playlist, self.video) + user_add_video_in_playlist(self.playlist, self.video2) + + new_playlist = Playlist.objects.create( + name="new_playlist", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + user_add_video_in_playlist(new_playlist, self.video3) + self.assertEqual(2, get_number_video_added_in_specific_playlist(self.playlist)) + self.assertEqual(1, get_number_video_added_in_specific_playlist(new_playlist)) + + print(" ---> test_get_number_video_added_in_specific_playlist ok") + + def test_get_favorite_playlist_for_user(self): + """Test if get_favorite_playlist_for_user works correctly.""" + slug_user_1 = get_favorite_playlist_for_user(self.user) + user_add_video_in_playlist(slug_user_1, self.video) + user_add_video_in_playlist(slug_user_1, self.video2) + user_add_video_in_playlist(slug_user_1, self.video3) + self.assertEqual(3, get_number_video_added_in_specific_playlist( + get_favorite_playlist_for_user(self.user))) + self.assertEqual(0, get_number_video_added_in_specific_playlist( + get_favorite_playlist_for_user(self.user2))) + + print(" ---> test_get_favorite_playlist_for_user ok") + + def test_get_additional_owners(self): + """Test if get_additional_owners works correctly.""" + new_playlist = Playlist.objects.create( + name="new_playlist", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + self.assertEqual(0, len(get_additional_owners(new_playlist))) + new_playlist.additional_owners.add(self.user2) + self.assertEqual(1, len(get_additional_owners(new_playlist))) + self.assertIn(self.user2, get_additional_owners(new_playlist)) + print(" ---> test_get_additional_owners ok") + + def test_get_total_favorites_video(self): + """Test if get_total_favorites_video works correctly.""" + fav_user_1 = get_favorite_playlist_for_user(self.user) + user_add_video_in_playlist(fav_user_1, self.video) + user_add_video_in_playlist(fav_user_1, self.video2) + fav_user_2 = get_favorite_playlist_for_user(self.user2) + user_add_video_in_playlist(fav_user_2, self.video) + + self.assertEqual(2, get_total_favorites_video(self.video)) + self.assertEqual(1, get_total_favorites_video(self.video2)) + self.assertEqual(0, get_total_favorites_video(self.video3)) + + print(" ---> test_get_total_favorites_video ok") + + def test_get_count_video_added_in_playlist(self): + """Test if get_count_video_added_in_playlist works correctly.""" + fav_user_1 = get_favorite_playlist_for_user(self.user) + fav_user_2 = get_favorite_playlist_for_user(self.user2) + + user_add_video_in_playlist(fav_user_1, self.video) + user_add_video_in_playlist(fav_user_2, self.video) + user_add_video_in_playlist(self.playlist, self.video) + user_add_video_in_playlist(self.playlist, self.video2) + + self.assertEqual(3, get_count_video_added_in_playlist(self.video)) + self.assertEqual(1, get_count_video_added_in_playlist(self.video2)) + self.assertEqual(0, get_count_video_added_in_playlist(self.video3)) + + print(" ---> test_get_count_video_added_in_playlist ok") + + def test_check_password(self): + """Test if test_check_password works correctly.""" + protected_playlist = Playlist.objects.create( + name="Playlist1", + description="Ma description", + visibility="protected", + autoplay=True, + owner=self.user, + # Encoding not made in create method. + password=hashlib.sha256("good_password".encode("utf-8")).hexdigest() + ) + self.assertFalse( + check_password("wrong_password", protected_playlist) + ) + self.assertTrue( + check_password("good_password", protected_playlist) + ) + + print(" ---> test_check_password ok") diff --git a/pod/playlist/tests/test_views.py b/pod/playlist/tests/test_views.py index bf8033938e..915a5c24a8 100644 --- a/pod/playlist/tests/test_views.py +++ b/pod/playlist/tests/test_views.py @@ -1,301 +1,1081 @@ -""" -Unit tests for playlist views -""" -import json +"""Esup-Pod playlist views tests. -from django.test import TestCase +* run with 'python manage.py test pod.playlist.tests.test_views' +""" from django.contrib.auth.models import User -from django.contrib.auth import authenticate -from django.utils.translation import ugettext_lazy as _ -from pod.video.models import Video -from pod.video.models import Type -from pod.playlist.models import Playlist -from pod.playlist.models import PlaylistElement -from django.contrib.sites.models import Site from django.urls import reverse +from django.utils.translation import ugettext as _ +from django.test import override_settings, TestCase -# edit_endpoint = "/playlist/edit/{0}/" +from bs4 import BeautifulSoup +from pod.video.models import Type, Video -class PlaylistViewsTestCase(TestCase): - fixtures = [ - "initial_data.json", - ] +from ..apps import FAVORITE_PLAYLIST_NAME +from ...playlist import context_processors +from ..models import Playlist, PlaylistContent +from ..utils import get_favorite_playlist_for_user, get_link_to_start_playlist, user_add_video_in_playlist - def setUp(self): - owner = User.objects.create(username="test", password="azerty") - owner.set_password("hello") - owner.save() - user = User.objects.create(username="utest", password="azerty") - user.set_password("uhello") - user.save() - videotype = Type.objects.create(title="others") - Video.objects.create( - title="video1", - type=videotype, - owner=owner, - video="video1.mp4", - duration=20, +import importlib + + +class TestPlaylistsPageTestCase(TestCase): + """Playlists page test case.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up required objects for next tests.""" + self.first_user = User.objects.create( + username="first.user", + password="first1234first", + ) + self.second_user = User.objects.create( + username="second.user", + password="second1234second", + ) + self.first_video = Video.objects.create( + title="First video", + owner=self.first_user, + video="first_video.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.second_video = Video.objects.create( + title="Second video", + owner=self.first_user, + video="second_video.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.third_video = Video.objects.create( + title="Third video", + owner=self.first_user, + video="third_video.mp4", is_draft=False, + type=Type.objects.get(id=1), ) - Video.objects.create( - title="video2", - type=videotype, - owner=owner, - video="video2.mp4", - duration=30, + self.fourth_video = Video.objects.create( + title="Fourth video", + owner=self.second_user, + video="fourth_video.mp4", is_draft=False, + type=Type.objects.get(id=1), ) - owner.owner.sites.add(Site.objects.get_current()) - owner.owner.save() + self.public_playlist = Playlist.objects.create( + name="Public playlist", + visibility="public", + owner=self.first_user, + ) + self.protected_playlist = Playlist.objects.create( + name="Protected playlist", + password="protected1234protected", + visibility="protected", + owner=self.first_user, + ) + self.private_playlist = Playlist.objects.create( + name="Private playlist", + visibility="private", + owner=self.first_user, + ) + self.public_playlist_2 = Playlist.objects.create( + name="Second public playlist", + visibility="public", + owner=self.second_user, + ) + self.playlist_content_1 = PlaylistContent.objects.create( + playlist=self.public_playlist, + video=self.first_video, + rank=1, + ) + self.playlist_content_2 = PlaylistContent.objects.create( + playlist=self.public_playlist, + video=self.second_video, + rank=2, + ) + self.playlist_content_3 = PlaylistContent.objects.create( + playlist=self.public_playlist, + video=self.third_video, + rank=3, + ) + self.playlist_content_4 = PlaylistContent.objects.create( + playlist=self.public_playlist, + video=self.fourth_video, + rank=4, + ) + self.url = reverse("playlist:list") - def test_myplaylist(self): - url = reverse("playlist:my_playlists", kwargs={}) - response = self.client.get(url) - self.assertEqual(response.status_code, 302) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(url) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "my_playlists.html") - - print(" [ BEGIN PLAYLIST VIEWS ] ") - print(" ---> test_myplaylist : OK!") - - def test_playlist_play(self): - playlist = Playlist.objects.create( - title="Playlist 1", - owner=User.objects.get(username="test"), - visible=True, - ) - video1 = Video.objects.get(id=1) - PlaylistElement.objects.create(playlist=playlist, video=video1, position=1) - playlist_url = reverse("playlist:playlist", kwargs={"slug": playlist.slug}) - playlist_url_iframe = playlist_url + "?is_iframe=true" - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist_player.html") - response = self.client.get(playlist_url_iframe) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist_player-iframe.html") - playlist.visible = False - playlist.save() - print( - "\n-> Check if unvisible playlist is not accessible by not authenticate user" - ) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 403) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 200) - print( - "-> Check if unvisible playlist is not accessible ", - "by authenticate but not owner user", - ) - authenticate(username="utest", password="uhello") - login = self.client.login(username="utest", password="uhello") - self.assertTrue(login) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 403) - - print(" ---> test_playlist_play : OK!") - - def test_playlist_create(self): - owner = User.objects.get(id=1) - playlist_url = reverse("playlist:playlist_edit", kwargs={}) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 302) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist.html") - self.assertContains(response, "playlist_form") - self.assertContains(response, _("Add a new playlist")) - response = self.client.post( - playlist_url, - data={ - "action": "edit", - "title": "playlist1", - "owner": owner.id, - "description": "test", - "visible": False, + @override_settings(USE_PLAYLIST=True) + def test_video_counter(self) -> None: + """Test if the video counter works correctly.""" + importlib.reload(context_processors) + self.client.force_login(self.first_user) + response = self.client.get(self.url) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + "4" in response.content.decode(), + "Test if '4' is visible." + ) + self.client.logout() + print(" ---> test_video_counter ok") + + @override_settings(USE_PLAYLIST=True) + def test_playlist_counter(self) -> None: + """Test if the playlist counter works correctly.""" + importlib.reload(context_processors) + self.client.force_login(self.first_user) + response = self.client.get(self.url) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + "4" in response.content.decode(), + "Test if '4' is visible." + ) + self.client.logout() + print(" ---> test_playlist_counter ok") + + @override_settings(USE_PLAYLIST=True) + def test_card_titles(self) -> None: + """Test if the playlist card titles are correct.""" + importlib.reload(context_processors) + self.client.force_login(self.first_user) + response = self.client.get(self.url) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + "Protected playlist" in response.content.decode(), + "Test if playlist title is visible." + ) + self.client.logout() + print(" ---> test_card_titles ok") + + @override_settings(USE_PLAYLIST=True) + def test_private_filter(self) -> None: + """ + Test if private playlists only are visible when the private filter is active. + """ + importlib.reload(context_processors) + self.client.force_login(self.first_user) + response = self.client.get(f"{self.url}?visibility=private") + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertFalse( + "bi-lock" in response.content.decode(), + "Test if protected icon isn't visible." + ) + self.assertFalse( + "bi-globe-americas" in response.content.decode(), + "Test if public icon isn't visible." + ) + self.client.logout() + print(" ---> test_private_filter ok") + + @override_settings(USE_PLAYLIST=True) + def test_protected_filter(self) -> None: + """ + Test if protected playlists only are visible when the protected filter is active. + """ + importlib.reload(context_processors) + self.client.force_login(self.first_user) + response = self.client.get(f"{self.url}?visibility=protected") + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertFalse( + "bi-incognito" in response.content.decode(), + "Test if private icon isn't visible." + ) + self.assertFalse( + "bi-globe-americas" in response.content.decode(), + "Test if public icon isn't visible." + ) + self.client.logout() + print(" ---> test_protected_filter ok") + + @override_settings(USE_PLAYLIST=True) + def test_public_filter(self) -> None: + """ + Test if public playlists only are visible when the public filter is active. + """ + importlib.reload(context_processors) + self.client.force_login(self.first_user) + response = self.client.get(f"{self.url}?visibility=public") + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertFalse( + "bi-incognito" in response.content.decode(), + "Test if private icon isn't visible." + ) + self.assertFalse( + "bi-lock" in response.content.decode(), + "Test if protected icon isn't visible" + ) + self.client.logout() + print(" ---> test_public_filter ok") + + +class TestPlaylistsPageLinkTestCase(TestCase): + """Playlists page link test case.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up required objects for next tests.""" + self.user = User.objects.create( + username="first.user", + password="first1234first", + ) + + @override_settings(USE_PLAYLIST=True) + def test_icon_visible(self) -> None: + """Test if the icon is visible.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get("/") + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + "bi-list-ul" in response.content.decode(), + "Test if playlist icon is visible." + ) + self.client.logout() + print(" ---> test_icon_visible ok") + + +class TestModalVideoPlaylist(TestCase): + """Playlist list modal test case.""" + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up required objects for next tests.""" + self.user = User.objects.create(username="pod", password="pod1234pod") + self.user2 = User.objects.create(username="pod2", password="pod1234pod2") + self.video = Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.public_playlist_user = Playlist.objects.create( + name="public_playlist_user", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + self.private_playlist_user = Playlist.objects.create( + name="private_playlist_user", + description="Ma description", + visibility="private_playlist", + autoplay=True, + owner=self.user + ) + self.public_playlist_user2 = Playlist.objects.create( + name="public_playlist_user2", + description="Ma description", + visibility="protected_playlist", + autoplay=True, + owner=self.user2 + ) + user_add_video_in_playlist(self.public_playlist_user, self.video) + self.url = reverse("video:video", kwargs={"slug": self.video.slug}) + + @override_settings(USE_PLAYLIST=True) + def test_list_playlist_in_modal(self) -> None: + """Test if the list is correctly show.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url) + self.assertTrue( + f'id="{self.public_playlist_user.slug}-btn"' in response.content.decode(), + "Test if the first playlist is present." + ) + self.assertTrue( + f'id="{self.private_playlist_user.slug}-btn"' in response.content.decode(), + "Test if the second playlist is present." + ) + self.assertFalse( + f'id="{self.public_playlist_user2.slug}-btn"' in response.content.decode(), + "Test if the user2 playlist is not present." + ) + self.client.logout() + print(" ---> test_list_playlist_in_modal ok") + + @override_settings(USE_PLAYLIST=True) + def test_buttons_actions_playlist_in_modal(self) -> None: + """Test if the buttons are correctly shown.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url) + + # self.video is on the public playlist of user1 + url_remove_button = reverse( + "playlist:remove-video", + kwargs={"slug": self.public_playlist_user.slug, "video_slug": self.video.slug} + ) + url_add_button = reverse( + "playlist:add-video", + kwargs={"slug": self.private_playlist_user.slug, + "video_slug": self.video.slug} + ) + self.assertTrue( + f' test_buttons_actions_playlist_in_modal ok") + + @override_settings(USE_PLAYLIST=True) + def test_buttons_link(self) -> None: + """Test if the buttons are correctly shown.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url) + + # self.video is on the public playlist of user1 + url_remove_button = reverse( + "playlist:remove-video", + kwargs={"slug": self.public_playlist_user.slug, "video_slug": self.video.slug} + ) + url_add_button = reverse( + "playlist:add-video", + kwargs={"slug": self.private_playlist_user.slug, + "video_slug": self.video.slug} + ) + self.assertTrue( + f' test_buttons_actions_playlist_in_modal ok") + + +class TestAddOrRemoveFormTestCase(TestCase): + """Add or remove form test case.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up required objects for next tests.""" + self.user = User.objects.create( + username="simple.user", + password="user1234user", + ) + self.simple_playlist = Playlist.objects.create( + name="My simple playlist", + visibility="public", + owner=self.user, + ) + self.addUrl = reverse("playlist:add") + self.editUrl = reverse("playlist:edit", kwargs={ + "slug": self.simple_playlist.slug}) + + @override_settings(USE_PLAYLIST=True) + def test_add_form_page(self) -> None: + """Test if the form to add a new playlist is present.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.addUrl) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + _("Add a playlist") in response.content.decode(), + "Test of 'Add a playlist' is visible in the page.", + ) + self.client.logout() + print(" ---> test_add_form_page ok") + + @override_settings(USE_PLAYLIST=True) + def test_edit_form_page(self) -> None: + """Test if the form to edit a playlist is present.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.editUrl) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + _("Edit the playlist") in response.content.decode(), + "Test of 'Edit the playlist' is visible in the page.", + ) + self.client.logout() + print(" ---> test_edit_form_page ok") + + +class TestStartupPlaylistParamTestCase(TestCase): + """Add or remove form test case.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up required objects for next tests.""" + self.user = User.objects.create( + username="simple.user", + password="user1234user", + ) + self.simple_playlist = Playlist.objects.create( + name="My simple playlist", + visibility="public", + owner=self.user, + ) + self.playlist_without_videos = Playlist.objects.create( + name="My playlist without videos", + visibility="public", + owner=self.user, + ) + self.video = Video.objects.create( + title="First video", + owner=self.user, + video="first_video.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + user_add_video_in_playlist(self.simple_playlist, self.video) + self.url = reverse("playlist:list") + + @override_settings(USE_PLAYLIST=True) + def test_link_in_playlists_page(self) -> None: + """Test if the link is present into the playlists page.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + print(response.content.decode()) + self.assertTrue( + f"/playlist/start-playlist/{self.simple_playlist.slug}" in response.content.decode(), + "Test if the link is present into the playlists page.", + ) + self.client.logout() + print(" ---> test_link_in_playlists_page ok") + + @override_settings(USE_PLAYLIST=True) + def test_disabled_in_playlists_page(self) -> None: + """Test if the disabled is present into the playlists page.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200.", + ) + self.assertTrue( + "disabled" in response.content.decode(), + "Test if the disabled is present into the playlists page.", + ) + self.client.logout() + print(" ---> test_disabled_in_playlists_page ok") + + +class TestPlaylistPage(TestCase): + """Playlist page test case.""" + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + self.user = User.objects.create(username="pod", password="pod1234pod") + self.user2 = User.objects.create(username="pod2", password="pod1234pod2") + self.video = Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video2 = Video.objects.create( + title="Video2", + owner=self.user, + video="test2.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video3 = Video.objects.create( + title="Video3", + owner=self.user2, + video="test3.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.playlist_user1 = Playlist.objects.create( + name="Playlist1", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + self.playlist_user2 = Playlist.objects.create( + name="Playlist2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user2 + ) + + self.url_fav_user1 = reverse("playlist:content", kwargs={ + 'slug': get_favorite_playlist_for_user(self.user).slug}) + self.url_fav_user2 = reverse("playlist:content", kwargs={ + 'slug': get_favorite_playlist_for_user(self.user2).slug}) + + @override_settings(USE_FAVORITES=True) + def test_playlist_video_list(self): + """Test if the favorite video list has a correct number of video in it.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + user_add_video_in_playlist(get_favorite_playlist_for_user(self.user), self.video) + user_add_video_in_playlist(get_favorite_playlist_for_user(self.user), self.video2) + response = self.client.get(self.url_fav_user1) + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200 when the favorite video list isn't empty", + ) + self.assertTrue( + 'data-countvideos="2"' in response.content.decode(), + "Test if the playlist video list isn't empty", + ) + self.client.logout() + + self.client.force_login(self.user2) + user_add_video_in_playlist(self.playlist_user2, self.video3) + response = self.client.get(reverse("playlist:content", kwargs={ + 'slug': self.playlist_user2.slug})) + self.assertTrue( + 'data-countvideos="1"' in response.content.decode(), + "Test if the playlist video list isn't empty", + ) + print(" ---> test_playlist_video_list ok") + + @override_settings(USE_FAVORITES=True) + def test_favorite_video_list_link_in_navbar(self) -> None: + """Test if the favorite video list link is present in the navbar.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get("/") + self.assertEqual( + response.status_code, + 200, + "Test if status code equal 200 in test_favorite_video_list_link_in_navbar", + ) + self.assertTrue( + str(_("My favorite videos")) in response.content.decode(), + "Test if the favorite video list link is present in the navbar", + ) + self.assertTrue( + self.url_fav_user1 in response.content.decode(), + ) + self.client.logout() + print(" ---> test_favorite_video_list_link_in_navbar ok") + + def test_folder_icon_in_video_links(self) -> None: + """Test if the differents icons appears correctly.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + user_add_video_in_playlist(self.playlist_user1, self.video) + user_add_video_in_playlist(get_favorite_playlist_for_user(self.user), self.video) + response = self.client.get(reverse("playlist:content", kwargs={ + 'slug': self.playlist_user1.slug})) + self.assertTrue( + 'class="bi bi-folder-minus"' in response.content.decode() + ) + response = self.client.get(self.url_fav_user1) + self.assertFalse( + 'class="bi bi-folder-minus"' in response.content.decode() + ) + self.client.logout() + print(" ---> test_folder_icon_in_video_links ok") + + def test_favorites_name_translate(self) -> None: + """Test if the favorites name is correctly translated.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url_fav_user1) + self.assertTrue( + f'{_("Playlist")} : {_(FAVORITE_PLAYLIST_NAME)}' in response.content.decode() + ) + self.client.logout() + print(" ---> test_folder_icon_in_video_links ok") + + def test_manage_section_for_editable_playlists(self) -> None: + """Test if the manage section appears correctly for an editable playlist.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(reverse("playlist:content", kwargs={ + 'slug': self.playlist_user1.slug})) + self.assertTrue( + 'id="card-manage-playlist"' in response.content.decode() + ) + response = self.client.get(self.url_fav_user1) + self.assertFalse( + 'id="card-manage-playlist"' in response.content.decode() + ) + self.client.logout() + print(" ---> test_manage_section_for_editable_playlists ok") + + +class TestStatsInfoTestCase(TestCase): + """Statistics informations test case.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + self.user = User.objects.create(username="pod", password="pod1234pod") + self.user2 = User.objects.create(username="pod2", password="pod1234pod2") + self.video = Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video2 = Video.objects.create( + title="Video2", + owner=self.user, + video="test2.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video3 = Video.objects.create( + title="Video3", + owner=self.user2, + video="test3.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.playlist_user1 = Playlist.objects.create( + name="Playlist1", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + self.playlist_user2 = Playlist.objects.create( + name="Playlist2", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user2 + ) + user_add_video_in_playlist(get_favorite_playlist_for_user(self.user), self.video) + user_add_video_in_playlist(get_favorite_playlist_for_user(self.user2), self.video) + user_add_video_in_playlist(self.playlist_user1, self.video) + user_add_video_in_playlist(self.playlist_user2, self.video) + user_add_video_in_playlist(get_favorite_playlist_for_user(self.user), self.video2) + # Video 1 -> 2 favorites and in 4 playlists (2 favs and playlist1, playlist2) + # Video 2 -> 1 favorite and in 1 playlists (1 fav) + # Video 3 -> 0 + + self.url_video1 = reverse("video:video", args=[self.video.slug]) + self.url_video2 = reverse("video:video", args=[self.video2.slug]) + self.url_video3 = reverse("video:video", args=[self.video3.slug]) + + def test_favorites_count(self) -> None: + """Test if the favorites counter works correctly.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url_video1) + self.assertTrue( + '2' in response.content.decode() + ) + response = self.client.get(self.url_video2) + self.assertTrue( + '1' in response.content.decode() + ) + response = self.client.get(self.url_video3) + self.assertTrue( + '0' in response.content.decode() + ) + self.client.logout() + print(" ---> test_favorites_count ok") + + def test_playlists_count(self) -> None: + """Test if the playlists counter works correctly.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get(self.url_video1) + self.assertTrue( + '4' in response.content.decode() + ) + response = self.client.get(self.url_video2) + self.assertTrue( + '1' in response.content.decode() + ) + response = self.client.get(self.url_video3) + self.assertTrue( + '0' in response.content.decode() + ) + self.client.logout() + print(" ---> test_playlists_count ok") + + def test_navbar_user_menu_counters(self) -> None: + """Test test_navbar_user_menu_counters works correctly.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get("/") + + self.assertTrue( + '2' in response.content.decode() + ) + self.assertTrue( + '2' in response.content.decode() + ) + self.client.logout() + + self.client.force_login(self.user2) + response = self.client.get("/") + + self.assertTrue( + '1' in response.content.decode() + ) + self.assertTrue( + '2' in response.content.decode() + ) + self.client.logout() + + print(" ---> test_navbar_user_menu_counters ok") + + +class TestPrivatePlaylistTestCase(TestCase): + """Private playlist test case.""" + + fixtures = ["initial_data.json"] + + @override_settings(USE_PLAYLIST=True, USE_FAVORITES=True) + def setUp(self) -> None: + """Set up tests.""" + self.first_student = User.objects.create( + username="student", password="student1234student") + self.second_student = User.objects.create( + username="student2", password="student1234student") + self.url_private_playlist = reverse( + "playlist:content", + kwargs={ + 'slug': get_favorite_playlist_for_user(self.second_student).slug }, ) - self.assertEqual(response.status_code, 200) - result = Playlist.objects.all() - self.assertTrue(result) - self.assertTemplateUsed(response, "playlist.html") - self.assertContains(response, _("Editing the playlist")) - self.assertContains(response, "playlist1") - - print(" ---> test_playlist_create : OK!") - - def test_playlist_add(self): - owner = User.objects.get(id=1) - playlist = Playlist.objects.create( - title="playlist1", owner=owner, description="test", visible=False - ) - video1 = Video.objects.get(id=1) - video2 = Video.objects.get(id=2) - playlist_url = reverse("playlist:playlist_edit", kwargs={"slug": playlist.slug}) - response = self.client.get(playlist_url) + + @override_settings(USE_PLAYLIST=True, USE_FAVORITES=True) + def test_user_redirect_if_private_playlist_playlists(self) -> None: + """Test if when an user try to browse a private playlist, he is redirected to the playlists page.""" + importlib.reload(context_processors) + self.client.force_login(self.first_student) + response = self.client.get(self.url_private_playlist) self.assertEqual(response.status_code, 302) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist.html") - self.assertContains(response, "playlist_form") - self.assertContains(response, _("Editing the playlist")) - self.assertContains(response, "playlist1") - response = self.client.post( - playlist_url, - data={"action": "add", "video": video1.slug}, - ) - self.assertEqual(response.status_code, 400) - response = self.client.post( - playlist_url, - {"action": "add", "video": video1.slug}, - HTTP_X_REQUESTED_WITH="XMLHttpRequest", + self.client.logout() + print(" ---> test_user_redirect_if_private_playlist_playlists ok") + + +class TestPlaylistPlayerTestCase(TestCase): + """Playlist player test case.""" + + fixtures = ["initial_data.json"] + + def setUp(self) -> None: + """Set up tests.""" + self.first_student = User.objects.create( + username="student", password="student1234student") + self.second_student = User.objects.create( + username="student2", password="student1234student") + self.super_user = User.objects.create(username="admin", password="admin1234admin") + self.video_first_student = Video.objects.create( + title="Video First Student", + owner=self.first_student, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), ) - self.assertEqual(response.status_code, 200) - self.assertContains(response, "success") - result = PlaylistElement.objects.get(playlist=playlist, video=video1, position=1) - self.assertTrue(result) - response = self.client.post( - playlist_url, - {"action": "add", "video": video2.slug}, - HTTP_X_REQUESTED_WITH="XMLHttpRequest", + self.video_first_student_draft = Video.objects.create( + title="Video First Student Draft", + owner=self.first_student, + video="test.mp4", + is_draft=True, + type=Type.objects.get(id=1), ) + self.video_second_student = Video.objects.create( + title="Video Second Student", + owner=self.second_student, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video_second_student_draft = Video.objects.create( + title="Video Second Student Draft", + owner=self.second_student, + video="test.mp4", + is_draft=True, + type=Type.objects.get(id=1), + ) + self.video_super_user = Video.objects.create( + title="Video Second Student Draft", + owner=self.super_user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video_super_user = Video.objects.create( + title="Video Super User", + owner=self.super_user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video_super_user_draft = Video.objects.create( + title="Video Super User Draft", + owner=self.super_user, + video="test.mp4", + is_draft=True, + type=Type.objects.get(id=1), + ) + self.playlist_first_video_is_disabled = Playlist.objects.create( + name="Playlist first video is blocked", + description="The first video of this playlist is blocked.", + visibility="public", + autoplay=True, + owner=self.first_student, + ) + self.simple_playlist = Playlist.objects.create( + name="Simple Playlist", + description="This playlist is simple.", + visibility="public", + autoplay=True, + owner=self.first_student + ) + self.big_playlist = Playlist.objects.create( + name="Big Playlist", + description="This playlist is big.", + visibility="public", + autoplay=True, + owner=self.first_student, + ) + # TODO Make a for boucle to don't repeat function call + tuples_to_link = [ + (self.playlist_first_video_is_disabled, self.video_second_student_draft), + (self.playlist_first_video_is_disabled, self.video_first_student), + (self.simple_playlist, self.video_first_student), + (self.simple_playlist, self.video_first_student_draft), + (self.big_playlist, self.video_first_student), + (self.big_playlist, self.video_first_student_draft), + (self.big_playlist, self.video_second_student), + (self.big_playlist, self.video_second_student_draft), + (self.big_playlist, self.video_super_user), + (self.big_playlist, self.video_super_user_draft), + ] + for tuple in tuples_to_link: + user_add_video_in_playlist(tuple[0], tuple[1]) + + @override_settings(USE_PLAYLIST=True) + def test_switch_video_in_playlist_player(self) -> None: + """Test if the video switch correctly when the user click on an other video.""" + importlib.reload(context_processors) + self.client.force_login(self.first_student) + response = self.client.get( + f'{reverse("video:video", kwargs={"slug": self.video_first_student.slug})}?playlist={self.simple_playlist.slug}') + next_video_url = f'{reverse("video:video", kwargs={"slug": self.video_first_student_draft.slug})}?playlist={self.simple_playlist.slug}' self.assertEqual(response.status_code, 200) - self.assertContains(response, "success") - result = PlaylistElement.objects.get(playlist=playlist, video=video2, position=2) - self.assertTrue(result) - - print(" ---> test_playlist_add : OK!") - - def test_playlist_remove(self): - owner = User.objects.get(id=1) - playlist = Playlist.objects.create( - title="playlist1", owner=owner, description="test", visible=False - ) - video1 = Video.objects.get(id=1) - video2 = Video.objects.get(id=2) - PlaylistElement.objects.create(playlist=playlist, video=video1, position=1) - PlaylistElement.objects.create(playlist=playlist, video=video2, position=2) - playlist_url = reverse("playlist:playlist_edit", kwargs={"slug": playlist.slug}) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 302) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist.html") - self.assertContains(response, "playlist_form") - self.assertContains(response, _("Editing the playlist")) - self.assertContains(response, "playlist1") - self.assertContains(response, "video1") - self.assertContains(response, "video2") - response = self.client.post( - playlist_url, - data={"action": "remove", "video": video1.slug}, - ) - self.assertEqual(response.status_code, 400) - response = self.client.post( - playlist_url, - {"action": "remove", "video": video1.slug}, - HTTP_X_REQUESTED_WITH="XMLHttpRequest", - ) - self.assertTrue(response.status_code, 200) - self.assertContains(response, "success") - result = PlaylistElement.objects.all() - self.assertTrue(result.count() == 1) - self.assertEqual(result.first().position, 1) - - print(" ---> test_playlist_remove : OK!") - print(" [ END PLAYLIST VIEWS ] ") - - def test_playlist_move(self): - owner = User.objects.get(id=1) - playlist = Playlist.objects.create( - title="playlist1", owner=owner, description="test", visible=False - ) - video1 = Video.objects.get(id=1) - video2 = Video.objects.get(id=2) - PlaylistElement.objects.create(playlist=playlist, video=video1, position=1) - PlaylistElement.objects.create(playlist=playlist, video=video2, position=2) - playlist_url = reverse("playlist:playlist_edit", kwargs={"slug": playlist.slug}) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 302) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(playlist_url) + soup = BeautifulSoup(response.content, 'html.parser') + next_video_html_element = soup.find_all(attrs={ + "href": next_video_url, + }) + self.assertIsNotNone(next_video_html_element) + self.client.logout() + print(" ---> test_switch_video_in_playlist_player ok") + + @override_settings(USE_PLAYLIST=True) + def test_draft_videos_in_playlist_player(self) -> None: + """Test if the draft videos are correctly disabled in the playlist player.""" + importlib.reload(context_processors) + self.client.force_login(self.second_student) + next_video_url = f'{reverse("video:video", kwargs={"slug": self.video_first_student_draft.slug})}?playlist={self.simple_playlist.slug}' + response = self.client.get( + f'{reverse("video:video", kwargs={"slug": self.video_first_student.slug})}?playlist={self.simple_playlist.slug}') self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist.html") - self.assertContains(response, "playlist_form") - self.assertContains(response, _("Editing the playlist")) - self.assertContains(response, "playlist1") - self.assertContains(response, "video1") - self.assertContains(response, "video2") - response = self.client.post( - playlist_url, - data={"action": "move", "videos": {"video1": 2, "video2": 1}}, - ) - self.assertEqual(response.status_code, 400) - json_data = json.dumps({video1.slug: 2, video2.slug: 1}) - response = self.client.post( - playlist_url, - data={"action": "move", "videos": json_data}, - HTTP_X_REQUESTED_WITH="XMLHttpRequest", - ) + soup = BeautifulSoup(response.content, 'html.parser') + next_video_html_elements = soup.find_all(attrs={ + "href": next_video_url, + }) + self.assertEqual(next_video_html_elements, []) + self.client.logout() + print(" ---> test_draft_videos_in_playlist_player ok") + + @override_settings(USE_PLAYLIST=True) + def test_scrollbar_is_present_in_playlist_player_box(self) -> None: + """Test if the scrollbar is correctly present in the playlist player box when it has more than 5 videos.""" + importlib.reload(context_processors) + self.client.force_login(self.first_student) + response = self.client.get( + f'{reverse("video:video", kwargs={"slug": self.video_first_student.slug})}?playlist={self.big_playlist.slug}') self.assertEqual(response.status_code, 200) - self.assertContains(response, "success") - result = PlaylistElement.objects.get(playlist=playlist, video=video1) - self.assertEqual(result.position, 2) - result = PlaylistElement.objects.get(playlist=playlist, video=video2) - self.assertEqual(result.position, 1) - - print(" ---> test_playlist_move : OK!") - - def test_playlist_delete(self): - owner = User.objects.get(id=1) - playlist = Playlist.objects.create( - title="playlist1", owner=owner, description="test", visible=False - ) - video1 = Video.objects.get(id=1) - PlaylistElement.objects.create(playlist=playlist, video=video1, position=1) - playlist_url = reverse("playlist:playlist_edit", kwargs={"slug": playlist.slug}) - response = self.client.get(playlist_url) - self.assertEqual(response.status_code, 302) - authenticate(username="test", password="hello") - login = self.client.login(username="test", password="hello") - self.assertTrue(login) - response = self.client.get(playlist_url) + self.assertTrue("scroll-container" in response.content.decode()) + self.client.logout() + print(" ---> test_scrollbar_is_present_in_playlist_player_box ok") + + @override_settings(USE_PLAYLIST=True) + def test_scrollbar_is_not_present_in_playlist_player_box(self) -> None: + """Test if the scrollbar is not present in the playlist player box when it has less than 6 videos.""" + importlib.reload(context_processors) + self.client.force_login(self.first_student) + response = self.client.get( + f'{reverse("video:video", kwargs={"slug": self.video_first_student.slug})}?playlist={self.simple_playlist.slug}') self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "playlist.html") - self.assertContains(response, "playlist_form") - self.assertContains(response, _("Editing the playlist")) - self.assertContains(response, "playlist1") - self.assertContains(response, "video1") - response = self.client.post(playlist_url, data={"action": "delete"}) - self.assertEqual(response.status_code, 400) - response = self.client.post( - playlist_url, - {"action": "delete"}, - HTTP_X_REQUESTED_WITH="XMLHttpRequest", + self.assertFalse("scroll-container" in response.content.decode()) + self.client.logout() + print(" ---> test_scrollbar_is_not_present_in_playlist_player_box ok") + + +class StartPlaylistViewTest(TestCase): + """Start playlist tests.""" + + fixtures = ["initial_data.json"] + + def setUp(self): + self.user = User.objects.create(username="pod", password="pod1234pod") + self.user2 = User.objects.create(username="pod2", password="pod1234pod2") + self.video = Video.objects.create( + title="Video1", + owner=self.user, + video="test.mp4", + is_draft=False, + type=Type.objects.get(id=1), ) - self.assertEqual(response.status_code, 200) - result = Playlist.objects.all() - self.assertFalse(result) - result = PlaylistElement.objects.all() - self.assertFalse(result) + self.video2 = Video.objects.create( + title="Video2", + owner=self.user, + video="test2.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.video3 = Video.objects.create( + title="Video3", + owner=self.user2, + video="test3.mp4", + is_draft=False, + type=Type.objects.get(id=1), + ) + self.public_playlist_user1 = Playlist.objects.create( + name="Playlist1", + description="Ma description", + visibility="public", + autoplay=True, + owner=self.user + ) + self.protected_playlist_user1 = Playlist.objects.create( + name="Playlist2", + description="Ma description", + visibility="protected", + password="password", + autoplay=True, + owner=self.user + ) + self.private_playlist_user1 = Playlist.objects.create( + name="Playlist2", + description="Ma description", + visibility="private", + autoplay=True, + owner=self.user + ) + user_add_video_in_playlist(self.public_playlist_user1, self.video) + user_add_video_in_playlist(self.public_playlist_user1, self.video2) + user_add_video_in_playlist(self.public_playlist_user1, self.video3) + + user_add_video_in_playlist(self.protected_playlist_user1, self.video) + user_add_video_in_playlist(self.protected_playlist_user1, self.video2) + user_add_video_in_playlist(self.protected_playlist_user1, self.video3) + + user_add_video_in_playlist(self.private_playlist_user1, self.video) + user_add_video_in_playlist(self.private_playlist_user1, self.video2) + user_add_video_in_playlist(self.private_playlist_user1, self.video3) + + def test_start_playlist_public(self): + """Test if start a public playlist works.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get( + reverse("playlist:start-playlist", kwargs={"slug": self.public_playlist_user1.slug})) + expected_url = get_link_to_start_playlist( + self.client.request, self.public_playlist_user1) + self.assertRedirects(response, expected_url) + self.client.logout() + print(" ---> test_start_playlist_public ok") + + def test_start_playlist_private_owner(self): + """Test if start a private playlist when owner of it works.""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get( + reverse("playlist:start-playlist", kwargs={"slug": self.private_playlist_user1.slug})) + expected_url = get_link_to_start_playlist( + self.client.request, self.private_playlist_user1) + self.assertRedirects(response, expected_url) + self.client.logout() + print(" ---> test_start_playlist_private_owner ok") + + def test_start_playlist_private_not_owner(self): + """Test if start a private playlist don't works if not owner of it.""" + importlib.reload(context_processors) + self.client.force_login(self.user2) + response = self.client.get( + reverse("playlist:start-playlist", kwargs={"slug": self.private_playlist_user1.slug})) + expected_url = reverse("playlist:list") + self.assertRedirects(response, expected_url) + self.client.logout() + print(" ---> test_start_playlist_private_not_owner ok") + + def test_start_playlist_protected_get_request_not_owner(self): + """Test if form password is present when not owner of a protected playlist""" + importlib.reload(context_processors) + self.client.force_login(self.user2) + response = self.client.get( + reverse("playlist:start-playlist", kwargs={"slug": self.protected_playlist_user1.slug})) + self.assertTemplateUsed(response, "playlist/protected-playlist-form.html") + print(" ---> test_start_playlist_protected_get_request_not_owner ok") - print(" ---> test_playlist_delete : OK!") + def test_start_playlist_protected_get_request_owner(self): + """Test if form password is not present when owner of a protected playlist""" + importlib.reload(context_processors) + self.client.force_login(self.user) + response = self.client.get( + reverse("playlist:start-playlist", kwargs={"slug": self.protected_playlist_user1.slug})) + expected_url = get_link_to_start_playlist( + self.client.request, self.protected_playlist_user1) + self.assertRedirects(response, expected_url) + self.assertTemplateNotUsed(response, "playlist/protected-playlist-form.html") + print(" ---> test_start_playlist_protected_get_request_owner ok") diff --git a/pod/playlist/urls.py b/pod/playlist/urls.py index 273e092d2b..67afa852e6 100644 --- a/pod/playlist/urls.py +++ b/pod/playlist/urls.py @@ -1,13 +1,43 @@ -from django.conf.urls import url -from pod.playlist.views import my_playlists -from pod.playlist.views import playlist_play -from pod.playlist.views import playlist +from django.urls import path + +from .views import ( + add_or_edit, + add_video_in_playlist, + playlist_content, + playlist_list, + remove_playlist_view, + remove_video_in_playlist, + favorites_save_reorganisation, + start_playlist, +) app_name = "playlist" urlpatterns = [ - url(r"^edit/$", playlist, name="playlist_edit"), - url(r"^edit/(?P[\-\d\w]+)/$", playlist, name="playlist_edit"), - url(r"^my/$", my_playlists, name="my_playlists"), - url(r"^(?P[\-\d\w]+)/$", playlist_play, name="playlist"), + path("", playlist_list, name="list"), + path("add/", add_or_edit, name="add"), + path("edit//", add_or_edit, name="edit"), + path("remove//", remove_playlist_view, name="remove"), + path( + "remove///", + remove_video_in_playlist, + name="remove-video" + ), + path( + "add///", + add_video_in_playlist, + name="add-video", + ), + path("/", playlist_content, name="content"), + path( + "/save-reorganisation/", + favorites_save_reorganisation, + name="save-reorganisation" + ), + path("start-playlist/", start_playlist, name="start-playlist"), + path( + "start-playlist//", + start_playlist, + name="start-playlist" + ), ] diff --git a/pod/playlist/utils.py b/pod/playlist/utils.py new file mode 100644 index 0000000000..9daf1121ab --- /dev/null +++ b/pod/playlist/utils.py @@ -0,0 +1,400 @@ +"""Esup-Pod playlist utilities.""" +from django.contrib.auth.models import User +from django.db.models import Max +from django.urls import reverse +from django.core.handlers.wsgi import WSGIRequest + +from pod.video.models import Video +from django.conf import settings +from django.utils.translation import ugettext_lazy as _ +from django.contrib.sites.models import Site + +from .apps import FAVORITE_PLAYLIST_NAME +from .models import Playlist, PlaylistContent + +import hashlib + + +def check_video_in_playlist(playlist: Playlist, video: Video) -> bool: + """ + Verify if a video is present in a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + video (:class:`pod.video.models.Video`): The video object + + Returns: + bool: True if the video is on the playlist, False otherwise + """ + return PlaylistContent.objects.filter(playlist=playlist, video=video).exists() + + +def user_add_video_in_playlist(playlist: Playlist, video: Video) -> str: + """ + Add a video in playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + video (:class:`pod.video.models.Video`): The video object + + Returns: + str: The status message + """ + if not check_video_in_playlist(playlist, video): + PlaylistContent.objects.create( + playlist=playlist, + video=video, + rank=get_next_rank(playlist) + ) + + +def user_remove_video_from_playlist(playlist: Playlist, video: Video) -> str: + """ + Remove a video from playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + video (:class:`pod.video.models.Video`): The video object + + Returns: + str: The status message + """ + if check_video_in_playlist(playlist, video): + PlaylistContent.objects.filter(playlist=playlist, video=video).delete() + + +def get_next_rank(playlist: Playlist) -> int: + """ + Get the next rank in playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + + Returns: + int: The next rank + """ + last_rank = PlaylistContent.objects.filter( + playlist=playlist).aggregate(Max("rank"))["rank__max"] + return last_rank + 1 if last_rank is not None else 1 + + +def get_number_playlist(user: User) -> int: + """ + Get the number of playlist for a user. + + Args: + user (:class:`django.contrib.auth.models.User`): The user object + + Returns: + int: The number of playlist + """ + return Playlist.objects.filter(owner=user).count() + + +def get_number_video_in_playlist(playlist: Playlist) -> int: + """ + Get the number of video in a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + + Returns: + int: The number of video in the playlist + """ + return PlaylistContent.objects.filter(playlist=playlist).count() + + +def get_number_video_added_in_playlist(video: Video) -> int: + """ + Get the number of times a video has been added to a playlist + + Args: + video (:class:`pod.video.models.Video`): The video object + + Returns: + int: The number of times a video has been added to a playlist + """ + return PlaylistContent.objects.filter(video=video).count() + + +def get_number_video_added_in_specific_playlist(playlist: Playlist) -> int: + """ + Get the number of times a video has been added to a specific playlist + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + + Returns: + int: The number of times a video has been added to the specific playlist + """ + return PlaylistContent.objects.filter(playlist=playlist).count() + + +def get_all_playlists() -> list: + """ + Get all playslist in the application. + + Returns: + list(:class:`pod.playlist.models.Playlist`): A list of all playlist + """ + return Playlist.objects.filter() # TODO site=Site.objects.get_current() + + +def get_public_playlist() -> list: + """ + Get all public playlists in the application. + + Returns: + list(:class:`pod.playlist.models.Playlist`): The public playlist list + """ + return Playlist.objects.filter(visibility="public") + + +def get_promoted_playlist() -> list: + """ + Get all promoted playlists in the application. + + Returns: + list(:class:`pod.playlist.models.Playlist`): The public playlist list + """ + return Playlist.objects.filter(promoted=True) + + +def get_playlist_list_for_user(user: User) -> list: + """ + Get all playlist for a user. + + Args: + user (:class:`django.contrib.auth.models.User`): The user object + + Returns: + list(:class:`pod.playlist.models.Playlist`): The playlist list for a user + """ + if getattr(settings, "USE_FAVORITES", True): + return Playlist.objects.filter(owner=user) + else: + return Playlist.objects.filter(owner=user).exclude(name="Favorites") + + +def get_video_list_for_playlist(playlist: Playlist) -> list: + """ + Get all videos for a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + + Returns: + list(:class:`pod.video.models.Video`): The video list for a playlist + """ + playlist_content = PlaylistContent.objects.filter(playlist=playlist) + videos_id = playlist_content.values_list("video_id", flat=True) + video_list = Video.objects.filter(id__in=videos_id).extra( + select={"rank": "playlist_playlistcontent.rank"}, + tables=["playlist_playlistcontent"], + where=[ + "playlist_playlistcontent.video_id=video_video.id", + "playlist_playlistcontent.playlist_id=%s" + ], + params=[playlist.id] + ) + return video_list + + +def get_playlist(slug: str) -> Playlist: + """ + Get a playlist with a slug + + Args: + slug (str): The slug of the playlist + + Returns: + Playlist(:class:`pod.playlist.models.Playlist`): The playlist object + """ + return Playlist.objects.get(slug=slug) + + +def get_favorite_playlist_for_user(user: User) -> Playlist: + """ + Get the favorite playlist of a user. + + Args: + user (:class:`django.contrib.auth.models.User`): The user object + + Returns: + Playlist: The favorite playlist + """ + return Playlist.objects.get(name=FAVORITE_PLAYLIST_NAME, owner=user) + + +def remove_playlist(user: User, playlist: Playlist) -> None: + """ + Remove playlist if the user has right to do it. + + Args: + user (:class:`django.contrib.auth.models.User`): The user object + playlist (:class:`pod.playlist.models.Playlist`): The playlist objet + """ + if playlist.owner == user or user.is_staff: + playlist.delete() + + +def get_playlists_for_additional_owner(user: User) -> list: + """ + Get playlist list for a specific additional owner. + + Args: + user (:class:`django.contrib.auth.models.User`): The specific onwer + + Returns: + list (:class:`list(pod.playlist.models.Playlist)`): The list of playlist + """ + return Playlist.objects.filter(additional_owners=user) + + +def get_additional_owners(playlist: Playlist) -> list: + """ + Get additional owners list. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist objet + + Returns: + list (:class:`list(pod.authentication.models.Owner)`): The list of additional owners + """ + return playlist.additional_owners.all() + + +def get_link_to_start_playlist(request: WSGIRequest, playlist: Playlist, video=None) -> str: + """ + Get the link to start a specific playlist. + + Args: + request (WSGIRequest): The WSGIRequest + playlist (:class:`pod.playlist.models.Playlist`): The specific playlist + video (:class:`pod.video.models.Video`): The video object, optionnal. Default to None + + Returns: + str: Link to start the playlist. + """ + first_video = playlist.get_first_video(request) + if video: + return f"{reverse('video:video', kwargs={'slug': video})}?playlist={playlist.slug}" + elif first_video: + return f"{reverse('video:video', kwargs={'slug': first_video.slug})}?playlist={playlist.slug}" + else: + return "" + + +def get_total_favorites_video(video: Video) -> int: + """ + Get the number of videos added in favorites playlist. + + Args: + video (:class:`pod.video.models.Video`): The video object + + Returns: + int: The number of videos added in favorites playlist. + """ + favorites_playlists = Playlist.objects.filter(name=FAVORITE_PLAYLIST_NAME) + favorite_contents = PlaylistContent.objects.filter( + playlist__in=favorites_playlists, video=video) + count = favorite_contents.count() + return count + + +def get_count_video_added_in_playlist(video: Video) -> int: + """ + Get the number of video added in any playlist (including favorites). + + Args: + video (:class:`pod.video.models.Video`): The video object + + Returns: + int: The number of videos added in playlists. + """ + return PlaylistContent.objects.filter(video=video).count() + + +def user_can_see_playlist_video(request: WSGIRequest, video: Video) -> bool: + """ + Check if the authenticated can see the playlist video. + + Args: + request (WSGIRequest): The WSGIRequest + video (:class:`pod.video.models.Video`): The video object + + Returns: + bool: True if the user can see the playlist video. False otherwise + """ + is_password_protected = video.password is not None and video.password != "" + if is_password_protected or video.is_draft: + if not request.user.is_authenticated: + return False + return ( + (video.owner == request.user) + or (request.user in video.additional_owners.all()) + or (request.user.is_staff) + ) + else: + return True + + +def sort_playlist_list(playlist_list: list, sort_field: str, sort_direction="") -> list: + """ + Return playlist list sorted by specific column name and ascending or descending direction. + + Args: + playlist_list (:class:`list(pod.playlist.models.Playlist)`): The list of playlist + sort_field (str): The specific column name to sort + sort_direction (str): The direction of sort (ascending or descending) + + Returns: + list (:class:`list(pod.playlist.models.Playlist)`): The list of playlist + """ + if sort_field and sort_field in [ + "id", + "name", + "visibility", + "slug", + "owner", + "date_created", + "date_updated", + ]: + if not sort_direction: + sort_field = "-" + sort_field + playlist_list = playlist_list.order_by(sort_field) + return playlist_list.distinct() + + +def check_password(form_password: str, playlist: Playlist) -> bool: + """ + Check if the form password is correct for the playlist. + + Args: + form_password (str): Password provided by user + playlist (:class:`pod.playlist.models.Playlist`): The specific playlist + + + Returns: + bool: True if the password provided matches the playlist password, False otherwise. + """ + hashed_password = hashlib.sha256(form_password.encode("utf-8")).hexdigest() + return hashed_password == playlist.password + + +def playlist_visibility(playlist: Playlist) -> str: + """ + Get the playlist visibility. The visibility can be : public, password-protected or private. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist object + + Returns: + str: The translated playlist visibility. + """ + if playlist.visibility == "public": + return _("Public") + elif playlist.visibility == "protected": + return _("Password-protected") + elif playlist.visibility == "private": + return _("Private") diff --git a/pod/playlist/views.py b/pod/playlist/views.py index c914e89dd3..bb3aa8c56b 100644 --- a/pod/playlist/views.py +++ b/pod/playlist/views.py @@ -1,281 +1,449 @@ -from django.core.paginator import Paginator -from django.core.paginator import EmptyPage -from django.core.paginator import PageNotAnInteger from django.contrib import messages from django.contrib.auth.decorators import login_required -from django.core.exceptions import PermissionDenied -from django.http import HttpResponse -from django.http import HttpResponseBadRequest -from django.shortcuts import render -from django.shortcuts import get_object_or_404 +from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator +from django.http import HttpResponseRedirect +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ngettext -from django.views.decorators.csrf import csrf_protect -from django.db.models import Q -from pod.playlist.models import Playlist -from pod.playlist.models import PlaylistElement -from pod.playlist.forms import PlaylistForm -from pod.video.models import Video, AdvancedNotes -from django.contrib.sites.shortcuts import get_current_site -import json +from django.shortcuts import get_object_or_404, redirect, render +from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie +from django.http import Http404, HttpResponseBadRequest, JsonResponse +from django.db import transaction + from pod.main.utils import is_ajax +from pod.main.views import in_maintenance +from pod.video.views import CURSUS_CODES, get_owners_has_instances +from pod.video.models import Video +from pod.video.utils import sort_videos_list -__AVAILABLE_ACTIONS__ = ["add", "edit", "move", "remove", "delete"] +from .models import Playlist, PlaylistContent +from .forms import PlaylistForm, PlaylistPasswordForm, PlaylistRemoveForm +from pod.playlist.templatetags.favorites_playlist import get_playlist_name +from .utils import ( + check_password, + get_additional_owners, + get_favorite_playlist_for_user, + get_link_to_start_playlist, + get_playlist, + get_playlist_list_for_user, + get_playlists_for_additional_owner, + get_promoted_playlist, + get_public_playlist, + get_video_list_for_playlist, + remove_playlist, + sort_playlist_list, + user_add_video_in_playlist, + user_remove_video_from_playlist, +) + +import json +import hashlib @login_required(redirect_field_name="referrer") -@csrf_protect -def my_playlists(request): - playlists = request.user.playlist_set.all() - page = request.GET.get("page", 1) +def playlist_list(request): + """Render playlists page.""" + visibility = request.GET.get("visibility", "all") + if visibility in ["private", "protected", "public"]: + playlists = get_playlist_list_for_user(request.user).filter(visibility=visibility) + elif visibility == "additional": + playlists = get_playlists_for_additional_owner(request.user) + elif visibility == "allpublic": + playlists = get_public_playlist() + elif visibility == "allmy": + playlists = get_playlist_list_for_user(request.user) + elif visibility == "all": + playlists = (get_playlist_list_for_user(request.user) | get_public_playlist( + ) | get_playlists_for_additional_owner(request.user)) + elif visibility == "promoted": + playlists = get_promoted_playlist() + else: + return redirect(reverse('playlist:list')) - full_path = "" - if page: - full_path = ( - request.get_full_path() - .replace("?page={0}".format(page), "") - .replace("&page={0}".format(page), "") - ) - paginator = Paginator(playlists, 12) - try: - playlists = paginator.page(page) - except PageNotAnInteger: - playlists = paginator.page(1) - except EmptyPage: - playlists = paginator.page(paginator.num_pages) + sort_field = request.GET.get("sort") + sort_direction = request.GET.get("sort_direction") + + playlists = sort_playlist_list(playlists, sort_field, sort_direction) return render( request, - "my_playlists.html", - {"playlists": playlists, "full_path": full_path, "page_title": _("My playlists")}, + "playlist/playlists.html", + { + "page_title": _("Playlists"), + "playlists": playlists, + "sort_field": sort_field, + "sort_direction": sort_direction, + } ) -@login_required -@csrf_protect -def playlist(request, slug=None): - if slug: - playlist = get_object_or_404(Playlist, slug=slug) - list_videos = playlist.playlistelement_set.all() - else: - playlist = None - list_videos = None +@login_required(redirect_field_name="referrer") +def playlist_content(request, slug): + """Render the videos list of a playlist.""" + sort_field = request.GET.get("sort", "rank") + sort_direction = request.GET.get("sort_direction") + playlist = get_playlist(slug) if ( - playlist - and request.user != playlist.owner - and not ( - request.user.is_superuser or request.user.has_perm("playlist.change_playlist") + playlist.visibility == "public" + or playlist.visibility == "protected" or ( + playlist.owner == request.user + or playlist in get_playlists_for_additional_owner(request.user) + or request.user.is_staff ) ): - messages.add_message(request, messages.ERROR, _("You cannot edit this playlist.")) - raise PermissionDenied - form = PlaylistForm(instance=playlist, initial={"owner": request.user}) - action = request.POST.get("action", "").lower() + return render_playlist(request, playlist, sort_field, sort_direction) + else: + return HttpResponseRedirect(reverse('playlist:list')) + + +def render_playlist_page(request, playlist, videos, in_favorites_playlist, count_videos, sort_field, sort_direction, form=None): + """Render playlist page with the videos list of this.""" + page_title = _("Playlist") + " : " + get_playlist_name(playlist) + types = request.GET.getlist("type") + owners = request.GET.getlist("owner") + disciplines = request.GET.getlist("discipline") + tags_slug = request.GET.getlist("tag") + cursus_selected = request.GET.getlist("cursus") + additional_owners = get_additional_owners(playlist) + full_path = ( + request.get_full_path().replace("?page=%s" % request.GET.get("page", 1), "").replace( + "&page=%s" % request.GET.get("page", 1), "") + ) + ownersInstances = get_owners_has_instances(request.GET.getlist("owner")) + cursus_list = CURSUS_CODES + sort_field = sort_field + sort_direction = sort_direction + + context = { + "page_title": page_title, + "videos": videos, + "playlist": playlist, + "in_favorites_playlist": in_favorites_playlist, + "count_videos": count_videos, + "types": types, + "owners": owners, + "disciplines": disciplines, + "tags_slug": tags_slug, + "cursus_selected": cursus_selected, + "additional_owners": additional_owners, + "full_path": full_path, + "ownersInstances": ownersInstances, + "cursus_list": cursus_list, + "sort_field": sort_field, + "sort_direction": sort_direction, + "form": form + } + + return render(request, "playlist/playlist.html", context) + + +def toggle_render_playlist_user_has_right( + request, + playlist, + videos, + in_favorites_playlist, + count_videos, + sort_field, + sort_direction, +): + """Toggle render_playlist() when the user has right.""" if request.method == "POST": - action = request.POST.get("action", "").lower() - if action in __AVAILABLE_ACTIONS__: - return eval("playlist_{0}(request, playlist)".format(action)) + form = PlaylistPasswordForm(request.POST) + form_password = request.POST.get("password") + if form_password and check_password(form_password, playlist): + return render_playlist_page( + request, + playlist, + videos, + in_favorites_playlist, + count_videos, + sort_field, + sort_direction, + form + ) + else: + messages.add_message( + request, + messages.ERROR, + _("The password is incorrect."), + ) + return redirect(request.META["HTTP_REFERER"]) else: + form = PlaylistPasswordForm() return render( - request, "playlist.html", {"form": form, "list_videos": list_videos} + request, + "playlist/protected-playlist-form.html", + { + "form": form, + "playlist": playlist, + } ) -# @login_required -# @csrf_protect - +@login_required(redirect_field_name="referrer") +def render_playlist( + request: dict, + playlist: Playlist, + sort_field: str, + sort_direction: str +): + """Render playlist page with the videos list of this.""" + videos_list = sort_videos_list( + get_video_list_for_playlist(playlist), sort_field, sort_direction + ) + count_videos = len(videos_list) + page = request.GET.get("page", 1) + full_path = "" + if page: + full_path = ( + request.get_full_path() + .replace("?page=%s" % page, "") + .replace("&page=%s" % page, "") + ) + paginator = Paginator(videos_list, 12) + try: + videos = paginator.page(page) + except PageNotAnInteger: + videos = paginator.page(1) + except EmptyPage: + videos = paginator.page(paginator.num_pages) -def playlist_play(request, slug=None): - template_video = ( - "playlist_player-iframe.html" - if (request.GET.get("is_iframe")) - else "playlist_player.html" + playlist_url = reverse( + "playlist:content", + kwargs={ + "slug": get_favorite_playlist_for_user(request.user).slug, + } ) - playlist = get_object_or_404(Playlist, slug=slug) if slug is not None else None - if playlist and request.user != playlist.owner and not playlist.visible: - # not (request.user.is_superuser or request.user.has_perm( - # "video.change_theme") - messages.add_message( + in_favorites_playlist = (playlist_url == request.path) + if playlist.visibility == "protected" and playlist.owner != request.user: + return toggle_render_playlist_user_has_right( request, - messages.ERROR, - _("You don't have access to this playlist."), + playlist, + videos, + in_favorites_playlist, + count_videos, + sort_field, + sort_direction, ) - raise PermissionDenied - video = None - position = ( - int(request.GET.get("p", 1)) - 1 - if request.GET.get("p", "1").isnumeric() - and int(request.GET.get("p", 1)) > 0 - and int(request.GET.get("p", 1)) <= playlist.playlistelement_set.all().count() - else 0 - ) - count = playlist.playlistelement_set.all().count() - if count > position: - video = list(playlist.playlistelement_set.all())[position].video - # video = playlist.playlistelement_set.first().video - else: - messages.add_message( + if is_ajax(request): + return render( request, - messages.ERROR, - _("You don't have access to this playlist."), + "playlist/playlist-videos-list.html", + { + "videos": videos, + "playlist": playlist, + "in_favorites_playlist": in_favorites_playlist, + "full_path": full_path, + "count_videos": count_videos + }, ) - raise PermissionDenied + return render_playlist_page( + request, + playlist, + videos, + in_favorites_playlist, + count_videos, + sort_field, + sort_direction + ) + + +@login_required(redirect_field_name="referrer") +def remove_video_in_playlist(request, slug, video_slug): + """Remove a video in playlist.""" + playlist = get_object_or_404(Playlist, slug=slug) + video = Video.objects.get(slug=video_slug) + user_remove_video_from_playlist(playlist, video) + if request.GET.get('json'): + return JsonResponse({ + 'state': 'out-playlist', + }) + return redirect(request.META["HTTP_REFERER"]) + + +@login_required(redirect_field_name="referrer") +def add_video_in_playlist(request, slug, video_slug): + """Add a video in playlist.""" + playlist = get_playlist(slug) + video = Video.objects.get(slug=video_slug) + user_add_video_in_playlist(playlist, video) + if request.GET.get('json'): + return JsonResponse({ + 'state': 'in-playlist', + }) + return redirect(request.META["HTTP_REFERER"]) - listNotes = get_video_adv_note_list(request, video) +@login_required(redirect_field_name="referrer") +def remove_playlist_view(request, slug: str): + """Remove playlist with form.""" + playlist = get_object_or_404(Playlist, slug=slug) + if in_maintenance(): + return redirect(reverse("maintenance")) + elif request.method == "POST": + form = PlaylistRemoveForm(request.POST) + if form.is_valid(): + remove_playlist(request.user, playlist) + messages.add_message( + request, + messages.INFO, + _("The playlist has been deleted."), + ) + return redirect(reverse("playlist:list")) + else: + messages.add_message( + request, + messages.ERROR, + _("One or more errors have been found in the form."), + ) + else: + form = PlaylistRemoveForm() return render( request, - template_video, - { - "playlist": playlist, - "video": video, - "listNotes": listNotes, - "page_title": ngettext( - "%(title)s (%(count)d video)", - "%(title)s (%(count)d videos)", - count, - ) - % {"count": count, "title": playlist.title}, - }, + "playlist/delete.html", + {"playlist": playlist, "form": form, + "page_title": f"{_('Delete the playlist')} \"{playlist.name}\""} ) -def get_video_adv_note_list(request, video): - """Return the list of AdvancedNotes of video that can be seen by the current user.""" - if request.user.is_authenticated: - filter = ( - Q(user=request.user) - | (Q(video__owner=request.user) & Q(status="1")) - | Q(status="2") +@login_required(redirect_field_name="referrer") +def handle_post_request_for_add_or_edit_function(request, playlist: Playlist) -> None: + """Handle post request for add_or_edit function.""" + page_title = "" + form = PlaylistForm( + request.POST, instance=playlist) if playlist else PlaylistForm(request.POST) + if form.is_valid(): + new_playlist = form.save(commit=False) if playlist is None else playlist + new_playlist.owner = request.user + password = request.POST.get("password") + if password: + hashed_password = hashlib.sha256(password.encode("utf-8")).hexdigest() + new_playlist.password = hashed_password + + new_playlist.save() + new_playlist.additional_owners.clear() + new_playlist.save() + if (request.POST.get("additional_owners")): + for o in request.POST.get("additional_owners"): + new_playlist.additional_owners.add(o) + new_playlist.save() + if request.GET.get("next"): + video_slug = request.GET.get("next").split("/")[2] + user_add_video_in_playlist( + new_playlist, Video.objects.get(slug=video_slug)) + messages.add_message( + request, + messages.INFO, + _("The playlist has been created and the video has been added in it."), + ) + return redirect(request.GET.get("next")) + return HttpResponseRedirect( + reverse("playlist:content", kwargs={"slug": new_playlist.slug}) ) - else: - filter = Q(status="2") - return ( - AdvancedNotes.objects.filter(video=video) - .filter(filter) - .order_by("timestamp", "added_on") - ) + return render(request, "playlist/add_or_edit.html", { + "form": form, + "page_title": page_title, + "options": "", + }) -def check_playlist_videos(playlist, data): - for slug in data: - element = get_object_or_404(PlaylistElement, video__slug=slug, playlist=playlist) - if element.video.is_draft: - return _("A video in draft mode cannot be added to a playlist.") - if element.video.password: - return _("A video with a password cannot be added to a playlist.") - return None +@login_required(redirect_field_name="referrer") +def handle_get_request_for_add_or_edit_function(request, slug: str) -> None: + """Handle get request for add_or_edit function.""" + if request.GET.get("next"): + options = f"?next={request.GET.get('next')}" + else: + options = "" + playlist = get_object_or_404(Playlist, slug=slug) if slug else None + if playlist: + if ( + (request.user == playlist.owner or request.user.is_staff) + and playlist.editable + ): + form = PlaylistForm(instance=playlist) + page_title = _("Edit the playlist") + f" \"{playlist.name}\"" + else: + return redirect(reverse("playlist:list")) + else: + form = PlaylistForm() + page_title = _("Add a playlist") + return render(request, "playlist/add_or_edit.html", { + "form": form, + "page_title": page_title, + "options": options, + }) -def playlist_move(request, playlist): - if is_ajax(request): - if request.POST.get("videos"): - data = json.loads(request.POST["videos"]) - err = check_playlist_videos(playlist, data) - if err: - some_data_to_dump = {"fail": "{0}".format(err)} - else: - for slug in data: - element = get_object_or_404( - PlaylistElement, video__slug=slug, playlist=playlist - ) - element.position = data[slug] - element.save() - some_data_to_dump = { - "success": "{0}".format(_("The playlist has been saved!")) - } - else: - some_data_to_dump = { - "fail": "{0}".format(_("The request is wrong. No video given.")) - } - data = json.dumps(some_data_to_dump) - return HttpResponse(data, content_type="application/json") - return HttpResponseBadRequest(_("Only ajax request are accepted for this action.")) +@csrf_protect +@ensure_csrf_cookie +@login_required(redirect_field_name="referrer") +def add_or_edit(request, slug: str = None): + """Add or edit view with form.""" + playlist = get_object_or_404(Playlist, slug=slug) if slug else None + if in_maintenance(): + return redirect(reverse("maintenance")) + elif request.method == "POST": + return handle_post_request_for_add_or_edit_function(request, playlist) + elif request.method == "GET": + return handle_get_request_for_add_or_edit_function(request, slug) -def playlist_remove(request, playlist): - if is_ajax(request): - if request.POST.get("video"): - slug = request.POST.get("video") - element = get_object_or_404( - PlaylistElement, video__slug=slug, playlist=playlist - ) - element.delete() - some_data_to_dump = { - "success": "{0}".format( - _("This video has been removed from your playlist.") +@csrf_protect +@login_required(redirect_field_name="referrer") +def favorites_save_reorganisation(request, slug: str): + """Save reorganization when the user click on save button.""" + if request.method == "POST": + json_data = request.POST.get("json-data") + try: + dict_data = json.loads(json_data) + except json.JSONDecodeError: + return HttpResponseBadRequest("JSON au mauvais format") + with transaction.atomic(): + for videos_tuple in dict_data.values(): + playlist_video_1 = PlaylistContent.objects.filter( + playlist=get_playlist(slug), + video_id=Video.objects.only("id").get(slug=videos_tuple[0]).id, + ) + playlist_video_2 = PlaylistContent.objects.filter( + playlist=get_playlist(slug), + video_id=Video.objects.only("id").get(slug=videos_tuple[1]).id, ) - } - else: - some_data_to_dump = { - "fail": "{0}".format(_("The request is wrong. No video given.")) - } - data = json.dumps(some_data_to_dump) - return HttpResponse(data, content_type="application/json") - return HttpResponseBadRequest(_("Only ajax request are accepted for this action.")) + with transaction.atomic(): + video_1_rank = playlist_video_1[0].rank + video_2_rank = playlist_video_2[0].rank + playlist_video_1.update(rank=video_2_rank) + playlist_video_2.update(rank=video_1_rank) -def playlist_edit(request, playlist): - if playlist: - list_videos = playlist.playlistelement_set.all() + return redirect(request.META["HTTP_REFERER"]) else: - list_videos = None - form = PlaylistForm(request.POST, instance=playlist) - if form.is_valid(): - playlist = form.save() - messages.add_message(request, messages.INFO, _("The playlist have been saved.")) - else: - messages.add_message( - request, - messages.ERROR, - _("One or more errors have been found in the form."), - ) - return render(request, "playlist.html", {"form": form, "list_videos": list_videos}) + raise Http404() -def playlist_add(request, playlist): - """Add a video (in POST) to the playlist. AJAX only.""" - if is_ajax(request): - if request.POST.get("video"): - video = get_object_or_404( - Video, slug=request.POST.get("video"), sites=get_current_site(request) - ) - msg = None - if video.is_draft: - msg = _("A video in draft mode cannot be added to a playlist.") - if video.password: - msg = _("A video with a password cannot be added to a playlist.") - - if msg: - some_data_to_dump = {"fail": "{0}".format(msg)} +def start_playlist(request, slug, video=None): + playlist = get_object_or_404(Playlist, slug=slug) + + if playlist.visibility == "public" or playlist.owner == request.user: + return redirect(get_link_to_start_playlist(request, playlist, video)) + elif playlist.visibility == "protected": + if request.method == "POST": + form = PlaylistPasswordForm(request.POST) + form_password = request.POST.get("password") + if form_password and check_password(form_password, playlist): + return redirect(get_link_to_start_playlist(request, playlist, video)) else: - new = PlaylistElement() - new.playlist = playlist - new.video = video - new.position = playlist.last() - new.save() - some_data_to_dump = { - "success": "{0}".format( - _("The video has been added to your playlist.") - ) - } + messages.add_message(request, messages.ERROR, + _("The password is incorrect.")) + return redirect(request.META["HTTP_REFERER"]) else: - some_data_to_dump = { - "fail": "{0}".format(_("The request is wrong. No video given.")) - } - data = json.dumps(some_data_to_dump) - return HttpResponse(data, content_type="application/json") - return HttpResponseBadRequest(_("Only ajax request are accepted for this action.")) - - -def playlist_delete(request, playlist): - if is_ajax(request): - if playlist: - playlist.delete() - some_data_to_dump = { - "success": "{0}".format(_("This playlist has been deleted.")) - } - data = json.dumps(some_data_to_dump) - return HttpResponse(data, content_type="application/json") - return HttpResponseBadRequest(_("Only ajax request are accepted for this action.")) + form = PlaylistPasswordForm() + return render( + request, + "playlist/protected-playlist-form.html", + { + "form": form, + "playlist": playlist, + } + ) + else: + return redirect(reverse("playlist:list")) diff --git a/pod/settings.py b/pod/settings.py index 1cbbc5a8f5..af7b963b21 100644 --- a/pod/settings.py +++ b/pod/settings.py @@ -61,8 +61,8 @@ "pod.bbb", "pod.meeting", "pod.cut", + "pod.stats", "pod.xapi", - "pod.favorite", "pod.video_encode_transcript", "pod.import_video", "pod.custom", @@ -119,7 +119,7 @@ "pod.video.context_processors.context_video_settings", "pod.authentication.context_processors.context_authentication_settings", "pod.recorder.context_processors.context_recorder_settings", - "pod.favorite.context_processors.context_settings", + "pod.playlist.context_processors.context_settings", "pod.import_video.context_processors.context_settings", ], }, diff --git a/pod/favorite/migrations/__init__.py b/pod/stats/__init__.py similarity index 100% rename from pod/favorite/migrations/__init__.py rename to pod/stats/__init__.py diff --git a/pod/stats/admin.py b/pod/stats/admin.py new file mode 100644 index 0000000000..8c38f3f3da --- /dev/null +++ b/pod/stats/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/pod/stats/apps.py b/pod/stats/apps.py new file mode 100644 index 0000000000..f09ba2d1fa --- /dev/null +++ b/pod/stats/apps.py @@ -0,0 +1,9 @@ +"""Esup-Pod Stats App.""" +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class StatsConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "pod.stats" + verbose_name = _("Statistics") diff --git a/pod/stats/models.py b/pod/stats/models.py new file mode 100644 index 0000000000..71a8362390 --- /dev/null +++ b/pod/stats/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/pod/stats/static/stats/css/stats.css b/pod/stats/static/stats/css/stats.css new file mode 100644 index 0000000000..a6ff7719fd --- /dev/null +++ b/pod/stats/static/stats/css/stats.css @@ -0,0 +1,20 @@ +.icon-large { + font-size: 3rem; + text-align: center; +} + +.number { + font-size: 1.6rem; + text-align: center; + margin-bottom: 0.5rem; +} + +.value { + font-size: 1.2rem; + text-align: center; + margin-bottom: 0.5rem; +} + +.label { + text-align: center; +} \ No newline at end of file diff --git a/pod/stats/static/stats/js/utils-stats.js b/pod/stats/static/stats/js/utils-stats.js new file mode 100644 index 0000000000..27e8e3ff78 --- /dev/null +++ b/pod/stats/static/stats/js/utils-stats.js @@ -0,0 +1,31 @@ +function fetchData(url, method, data) { + return new Promise(function (resolve, reject) { + $.ajax({ + url: url, + method: method, + dataType: "json", + data: data, + success: function (response) { + resolve(response); + }, + error: function (error) { + reject(error); + }, + }); + }); +} + +function exportDataToCSV(data, filename) { + let csvContent = "data:text/csv;charset=utf-8,"; + csvContent += data.headers.join(",") + "\n"; + for (let i = 0; i < data.rows.length; i++) { + let row = data.rows[i].join(",") + "\n"; + csvContent += row; + } + var encodedUri = encodeURI(csvContent); + var link = document.createElement("a"); + link.setAttribute("href", encodedUri); + link.setAttribute("download", filename); + document.body.appendChild(link); + link.click(); +} diff --git a/pod/stats/static/stats/js/video_stats_view.js b/pod/stats/static/stats/js/video_stats_view.js new file mode 100644 index 0000000000..73879f541b --- /dev/null +++ b/pod/stats/static/stats/js/video_stats_view.js @@ -0,0 +1,188 @@ +const defaultParams = { + startDateDefault: new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000) + .toISOString() + .split("T")[0], + endDateDefault: new Date().toISOString().split("T")[0], + tension: 0.5, + borderWidth: 2, + animationDuration: 2000, + animationDelay: 500, +}; + +let startDateDefault = defaultParams.startDateDefault; +let endDateDefault = defaultParams.endDateDefault; + +var dateChart; +var startDate; +var endDate; +let days = []; +let dailyViews = []; +let dailyFavorites = []; +let dailyPlaylistAdditions = []; + +const startDateInput = document.getElementById("start-date-" + graph_id); +const endDateInput = document.getElementById("end-date-" + graph_id); +const dataUrl = window.location.href; + +startDateInput.value = defaultParams.startDateDefault; +startDateInput.max = defaultParams.endDateDefault; +endDateInput.value = defaultParams.endDateDefault; +endDateInput.max = defaultParams.endDateDefault; + +if (startDate === undefined && endDate === undefined) { + startDate = defaultParams.startDateDefault; + endDate = defaultParams.endDateDefault; + updateChart(); +} + +startDateInput.addEventListener("change", function () { + startDate = parseInt(this.value); + endDateInput.min = startDate; + updateChart(); +}); + +endDateInput.addEventListener("change", function () { + endDate = parseInt(this.value); + startDateInput.max = endDate; + updateChart(); +}); + +function updateChart() { + days = []; + dailyViews = []; + dailyFavorites = []; + dailyPlaylistAdditions = []; + const requests = []; + + for ( + let currentDate = new Date(startDate); + currentDate <= new Date(endDate); + currentDate.setDate(currentDate.getDate() + 1) + ) { + let formattedDate = currentDate.toISOString().split("T")[0]; + days.push(formattedDate); + requests.push( + fetchData(dataUrl, "POST", { + csrfmiddlewaretoken: $("[name=csrfmiddlewaretoken]").val(), + periode: formattedDate, + }), + ); + } + + Promise.all(requests) + .then(function (responses) { + responses.forEach(function (response) { + const JSONResponse = JSON.parse(response); + const data = JSONResponse.datas; + dailyViews.push(data.views_day); + dailyFavorites.push(data.favorites_day); + dailyPlaylistAdditions.push(data.playlist_addition_day); + }); + + renderChart(); + }) + .catch((error) => console.error(error)); +} + +function renderChart() { + const ctx = document.getElementById(graph_id).getContext("2d"); + + if (dateChart) { + dateChart.destroy(); + } + + dateChart = new Chart(ctx, { + type: "line", + data: { + labels: days, + datasets: [ + { + label: gettext("Views"), + backgroundColor: "#ed184e", + borderColor: "#ed184e", + borderWidth: defaultParams.borderWidth, + data: dailyViews, + tension: defaultParams.tension, + }, + { + label: gettext("Favorites"), + backgroundColor: "#3871c1", + borderColor: "#3871c1", + borderWidth: defaultParams.borderWidth, + data: dailyFavorites, + tension: defaultParams.tension, + }, + { + label: gettext("Playlist additions"), + backgroundColor: "#1F7C85", + borderColor: "#1F7C85", + borderWidth: defaultParams.borderWidth, + data: dailyPlaylistAdditions, + tension: defaultParams.tension, + }, + ], + }, + options: { + spanGaps: true, + responsive: true, + plugins: { + title: { + display: true, + text: graph_title, + padding: { + top: 10, + bottom: 5, + }, + }, + }, + scales: { + x: { + display: true, + title: { + display: true, + text: gettext("Date"), + }, + }, + y: { + display: true, + title: { + display: true, + text: gettext("Value"), + }, + }, + }, + animation: { + duration: defaultParams.animationDuration, + delay: defaultParams.animationDelay, + easing: "easeInOutElastic", + }, + }, + }); + + document.getElementById("form-container" + graph_id).classList.remove("d-none"); + document.getElementById("graph-container" + graph_id).classList.remove("d-none"); +} +updateChart(); + +document + .getElementById("export-btn-" + graph_id) + .addEventListener("click", function () { + var dataForCSV = { + headers: [ + gettext("Date"), + gettext("Views"), + gettext("Favorites"), + gettext("Playlists_addition"), + ], + rows: [], + }; + for (let i = 0; i < daily.length; i++) { + dataForCSV.rows.push([ + daily[i], + dailyviews[i], + dailyfavo[i], + dailyPlaylists[i], + ]); + } + exportDataToCSV(dataForCSV, "stats-" + graph_title + ".csv"); // INCLURE DATE + }); diff --git a/pod/stats/static/stats/js/video_stats_view_global.js b/pod/stats/static/stats/js/video_stats_view_global.js new file mode 100644 index 0000000000..f27f74dd98 --- /dev/null +++ b/pod/stats/static/stats/js/video_stats_view_global.js @@ -0,0 +1,180 @@ +const defaultParams = { + startYear: new Date().getFullYear() - 5, + endYear: new Date().getFullYear(), + tension: 0.5, + borderWidth: 2, + animationDuration: 2000, + animationDelay: 500, +}; + +var yearChart; +let startYear = defaultParams.startYear; +let endYear = defaultParams.endYear; +let years = []; +let yearlyViews = []; +let yearlyFavorites = []; +let yearlyPlaylistAdditions = []; + +const startYearInput = document.getElementById("start-year-" + graph_id); +const endYearInput = document.getElementById("end-year-" + graph_id); +const dataUrl = window.location.href; + +startYearInput.max = defaultParams.endYear; +startYearInput.value = defaultParams.startYear; +endYearInput.max = defaultParams.endYear; +endYearInput.value = defaultParams.endYear; + +if (startYear === undefined && endYear === undefined) { + startYear = defaultParams.startYear; + endYear = defaultParams.endYear; + updateChart(); +} + +startYearInput.addEventListener("change", function () { + startYear = parseInt(this.value); + endYearInput.min = startYear; + updateChart(); +}); + +endYearInput.addEventListener("change", function () { + endYear = parseInt(this.value); + startYearInput.max = endYear; + updateChart(); +}); + +function updateChart() { + years = []; + yearlyViews = []; + yearlyFavorites = []; + yearlyPlaylistAdditions = []; + const requests = []; + + for (let year = startYear; year <= endYear; year++) { + requests.push( + fetchData(dataUrl, "POST", { + csrfmiddlewaretoken: $("[name=csrfmiddlewaretoken]").val(), + periode: year, + }), + ); + } + + Promise.all(requests) + .then(function (responses) { + responses.forEach(function (response) { + const JSONResponse = JSON.parse(response); + const year = JSONResponse.year; + const data = JSONResponse.datas; + + years.push(year); + yearlyViews.push(data.views_year); + yearlyFavorites.push(data.favorites_year); + yearlyPlaylistAdditions.push(data.playlist_addition_year); + }); + + renderChart(); + }) + .catch((error) => console.error(error)); +} + +function renderChart() { + const ctx = document.getElementById(graph_id).getContext("2d"); + + if (yearChart) { + yearChart.destroy(); + } + + yearChart = new Chart(ctx, { + type: "line", + data: { + labels: years, + datasets: [ + { + label: gettext("Views"), + backgroundColor: "#ed184e", + borderColor: "#ed184e", + borderWidth: defaultParams.borderWidth, + data: yearlyViews, + tension: defaultParams.tension, + }, + { + label: gettext("Favorites"), + backgroundColor: "#3871c1", + borderColor: "#3871c1", + borderWidth: defaultParams.borderWidth, + data: yearlyFavorites, + tension: defaultParams.tension, + }, + { + label: gettext("Playlist additions"), + backgroundColor: "#1F7C85", + borderColor: "#1F7C85", + borderWidth: defaultParams.borderWidth, + data: yearlyPlaylistAdditions, + tension: defaultParams.tension, + }, + ], + }, + options: { + spanGaps: true, + responsive: true, + plugins: { + title: { + display: true, + text: graph_title, + padding: { + top: 10, + bottom: 5, + }, + }, + }, + scales: { + x: { + display: true, + title: { + display: true, + text: gettext("Date"), + }, + }, + y: { + display: true, + title: { + display: true, + text: gettext("Value"), + }, + }, + }, + animation: { + duration: defaultParams.animationDuration, + delay: defaultParams.animationDelay, + easing: "easeInOutElastic", + }, + }, + }); + + document.getElementById("form-container" + graph_id).classList.remove("d-none"); + document.getElementById("graph-container" + graph_id).classList.remove("d-none"); +} +updateChart(); + +document + .getElementById("export-btn-" + graph_id) + .addEventListener("click", function () { + var dataForCSV = { + headers: [ + gettext("Years"), + gettext("Views"), + gettext("Favorites"), + gettext("Playlists_addition"), + ], + rows: [], + }; + for (let i = 0; i < years.length; i++) { + dataForCSV.rows.push([ + years[i], + yearlyViews[i], + yearlyFavorites[i], + yearlyFavorites[i], + ]); + } + exportDataToCSV(dataForCSV, "stats-" + graph_title + ".csv"); // INCLURE DATE + }); diff --git a/pod/stats/templates/stats/channel-stats-view.html b/pod/stats/templates/stats/channel-stats-view.html new file mode 100644 index 0000000000..2cabf1d6bf --- /dev/null +++ b/pod/stats/templates/stats/channel-stats-view.html @@ -0,0 +1,72 @@ +{% extends 'stats/utils/base-stats.html' %} +{% load static i18n %} +{% load user_stats %} +{% load channel_stats %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Statistics" %} + +
    • + {% if not channel%} +
  • + {% trans "Channels" %} +
    • + {% else %} +
  • + + {% trans "Channels" %} + +
    • + {% if not theme %} +
  • + {{ channel.title }} +
    • + {% else %} +
  • + + {{ channel.title }} + +
    • +
  • + {{ theme }} +
    • + {% endif %} + {% endif %} +{% endblock %} + +{% block stats_items %} + {% if channel %} + {% include "stats/utils/stats-item.html" with icon="bi bi-film" label=_("Number of videos") number=videos|length %} + + {% get_number_themes as get_number_themes %} + {% include "stats/utils/stats-item.html" with icon="bi bi-card-list" label=_("Number of themes") number=get_number_themes %} + {% else %} + {% get_number_channels as get_number_channels %} + {% include "stats/utils/stats-item.html" with icon="bi bi-play-btn" label=_("Number of channels") number=get_number_channels %} + {% endif %} +{% endblock stats_items %} + +{% block other_stats %} + {% if channel %} +
    +
    + {% trans "Graph of video evolution for the channel " as graph_title_prefix %} + {% include "stats/utils/years-video-stats.html" with graph_id="videosEvolutionChart" graph_title=graph_title_prefix|add:channel %} +
    +
    + {% trans "Breakdown of video status for the channel " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="statusChart" graph_data=status_datas graph_title=graph_title_prefix|add:channel %}
    +
    + {% else %} +

    {% trans "Statistics for playlists" %}

    +
    +
    + {% trans "Breakdown of channels visibility status " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="statusChart" graph_data=visibility_datas graph_title=graph_title_prefix %} +
    +
    + {% endif %} +{% endblock other_stats %} diff --git a/pod/stats/templates/stats/general-stats-view.html b/pod/stats/templates/stats/general-stats-view.html new file mode 100644 index 0000000000..5a39db5ea2 --- /dev/null +++ b/pod/stats/templates/stats/general-stats-view.html @@ -0,0 +1,61 @@ +{% extends 'stats/utils/base-stats.html' %} + +{% load static i18n %} +{% load user_stats %} +{% load general_stats %} +{% load favorites_playlist %} +{% load playlist_stats %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + {% trans "Statistics" %} +
    • +{% endblock %} + +{% block stats_items %} + + {% url 'video:my_videos' as url_for_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-film" url=url_for_videos label=_("Number of videos") number=videos|length %} + + {% get_total_time_videos videos as get_total_time_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-clock" label=_("Duration time of videos") number=get_total_time_videos %} + + {% if prefered_discipline %} + {% url 'videos:videos' as videos_url %} + {% with url_for_prefered_discipline=videos_url|add:"?discipline="|add:prefered_discipline.slug %} + {% include "stats/utils/stats-item.html" with icon="bi bi-book" url=url_for_prefered_discipline label=_("Most popular discipline") text=prefered_discipline %} + {% endwith %} + {% else %} + {% include "stats/utils/stats-item.html" with icon="bi bi-book" label=_("Most popular discipline") text=_("No popular discipline") %} + {% endif %} + + {% if prefered_type %} + {% url 'videos:videos' as videos_url %} + {% with url_for_prefered_type=videos_url|add:"?type="|add:prefered_type.slug %} + {% include "stats/utils/stats-item.html" with icon="bi bi-tv" url=url_for_prefered_type label=_("Most popular video type") text=prefered_type %} + {% endwith %} + {% else %} + {% include "stats/utils/stats-item.html" with icon="bi bi-tv" label=_("Most popular video type") text=_("No popular video type") %} + {% endif %} + + {% get_number_users as get_number_users %} + {% include "stats/utils/stats-item.html" with icon="bi bi-people" label=_("Number of users") number=get_number_users %} + +{% endblock stats_items %} + + +{% block other_stats %} +

    {% trans "Statistics of videos" %}

    + +
    +
    + {% trans "Graph of video evolution for " as graph_title_prefix %} + {% include "stats/utils/years-video-stats.html" with graph_id="videosEvolutionChart" graph_title=graph_title_prefix|add:TITLE_ETB %} +
    +
    + {% trans "Breakdown of video status for " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="statusChart" graph_data=status_datas graph_title=graph_title_prefix|add:TITLE_ETB %} +
    +
    +{% endblock other_stats %} diff --git a/pod/stats/templates/stats/meeting-stats-view.html b/pod/stats/templates/stats/meeting-stats-view.html new file mode 100644 index 0000000000..6558aee4df --- /dev/null +++ b/pod/stats/templates/stats/meeting-stats-view.html @@ -0,0 +1,36 @@ +{% extends 'stats/utils/base-stats.html' %} + +{% load static i18n %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Statistics" %} + +
    • + {% if not meeting %} +
  • + {% trans "Meetings" %} +
    • + {% else %} +
  • + + {% trans "Meetings" %} + +
    • +
  • + {{ meeting.name }} +
    • + {% endif %} +{% endblock %} + +{% block stats_items %} + + +{% endblock stats_items %} + + +{% block other_stats %} + +{% endblock other_stats %} diff --git a/pod/stats/templates/stats/playlist-stats-view.html b/pod/stats/templates/stats/playlist-stats-view.html new file mode 100644 index 0000000000..bf2104f864 --- /dev/null +++ b/pod/stats/templates/stats/playlist-stats-view.html @@ -0,0 +1,88 @@ +{% extends 'stats/utils/base-stats.html' %} +{% load static i18n %} +{% load playlist_stats %} +{% load general_stats %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Statistics" %} + +
    • + {% if not playlist %} +
  • + {% trans "Playlists" %} +
    • + {% else %} +
  • + + {% trans "Playlists" %} + +
    • +
  • + {{ playlist.name }} +
    • + {% endif %} +{% endblock %} + + +{% block stats_items %} + {% if playlist %} + {% get_number_video_in_playlist playlist as get_number_video_in_playlist %} + {% url 'playlist:content' playlist as url_for_video %} + {% include "stats/utils/stats-item.html" with icon="bi bi-film" url=url_for_video label=_("Number of videos") number=get_number_video_in_playlist %} + + {% get_total_time_videos videos as get_total_time_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-clock" label=_("Playlist playback time") number=get_total_time_videos %} + +
    +
    + {% include "playlist/playlist_visibility_icon.html" with playlist=playlist %} +
    +
    + {% trans "Right of access" %} +
    +
    {% get_playlist_visibility playlist %}
    +
    + + {% get_number_additional_owners_playlist playlist as get_number_additional_owners_playlist %} + {% include "stats/utils/stats-item.html" with icon="bi bi-people" label=_("Additional owners") number=get_number_additional_owners_playlist %} + + {% else %} + {% url 'playlist:list' as url_for_playlist %} + {% include "stats/utils/stats-item.html" with icon="bi bi-list-ul" url=url_for_playlist|add:'?visibility=all' label=_("Number of playlists") number=playlists|length %} + + {% endif %} + +{% endblock stats_items %} + +{% block other_stats %} + {% if playlist %} + {% if videos|length > 0 %} +

    {% trans "Playlist video statistics" %}

    +
    +
    + {% trans "Graph of video evolution " as graph_title_prefix %} + {% include "stats/utils/years-video-stats.html" with graph_id="videosEvolutionChart" graph_title=graph_title_prefix %} +
    +
    + {% trans "Breakdown of video status for the playlist " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="statusChart" graph_data=status_datas graph_title=graph_title_prefix|add:playlist.name %} +
    +
    + {% endif %} + {% else %} + {% if playlists|length > 0 %} + {% with user_str=request.user|stringformat:"s" %} +

    {% trans "Statistics for playlists" %}

    +
    +
    + {% trans "Breakdown of playlists visibilities for " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="visibilitiesStatusChart" graph_data=status_datas graph_title=graph_title_prefix|add:TITLE_ETB %} +
    +
    + {% endwith %} + {% endif %} + {% endif %} +{% endblock other_stats %} diff --git a/pod/stats/templates/stats/user-stats-view.html b/pod/stats/templates/stats/user-stats-view.html new file mode 100644 index 0000000000..b51b302e99 --- /dev/null +++ b/pod/stats/templates/stats/user-stats-view.html @@ -0,0 +1,84 @@ +{% extends 'stats/utils/base-stats.html' %} + +{% load static i18n %} +{% load user_stats %} +{% load general_stats %} +{% load favorites_playlist %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Statistics" %} + +
    • +
  • + {% trans "My statistics" %} +
    • +{% endblock %} + +{% block stats_items %} + {% url 'video:my_videos' as url_for_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-film" url=url_for_videos label=_("Number of videos") number=videos|length %} + + {% get_total_time_videos videos as get_total_time_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-clock" label=_("Duration time of videos") number=get_total_time_videos %} + + {% url 'podfile:home' as url_for_podfile %} + {% get_number_files_user as get_number_files_user %} + {% include "stats/utils/stats-item.html" with icon="bi bi-folder" url=url_for_podfile label=_("Number of files") number=get_number_files_user %} + + {% get_favorite_playlist user as playlist %} + {% url 'playlist:content' slug=playlist.slug as url_for_user_favorites %} + {% get_number_favorites_user as get_number_favorites_user %} + {% include "stats/utils/stats-item.html" with icon="bi bi-star" url=url_for_user_favorites label=_("Number of videos added in favorites") number=get_number_favorites_user %} + + {% url 'playlist:list' as url_for_user_playlists %} + {% get_number_playlist_user as get_number_playlist_user %} + {% include "stats/utils/stats-item.html" with icon="bi bi-list-ul" url=url_for_user_playlists label=_("Number of playlists") number=get_number_playlist_user %} + + {% url 'meeting:my_meetings' as url_for_user_meetings %} + {% get_number_meetings_user as get_number_meetings_user %} + {% include "stats/utils/stats-item.html" with icon="bi bi-person-video" url=url_for_user_meetings label=_("Number of meetings") number=get_number_meetings_user %} + + {% if prefered_discipline %} + {% url 'videos:videos' as videos_url %} + {% with url_for_prefered_discipline=videos_url|add:"?discipline="|add:prefered_discipline.slug %} + {% include "stats/utils/stats-item.html" with icon="bi bi-book" url=url_for_prefered_discipline label=_("Prefered discipline") text=prefered_discipline %} + {% endwith %} + {% else %} + {% include "stats/utils/stats-item.html" with icon="bi bi-book" label=_("Prefered discipline") text=_("No prefered discipline") %} + {% endif %} + + {% if prefered_type %} + {% url 'videos:videos' as videos_url %} + {% with url_for_prefered_type=videos_url|add:"?type="|add:prefered_type.slug %} + {% include "stats/utils/stats-item.html" with icon="bi bi-tv" url=url_for_prefered_type label=_("Prefered type") text=prefered_type %} + {% endwith %} + {% else %} + {% include "stats/utils/stats-item.html" with icon="bi bi-tv" label=_("Prefered type") text=_("No prefered type") %} + {% endif %} + + {% url 'channels:my_channels' as url_for_user_channels %} + {% get_number_channels target="user" as get_number_channels %} + {% include "stats/utils/stats-item.html" with icon="bi bi-play-btn" url=url_for_user_channels label=_("Number of channels") number=get_number_channels %} + +{% endblock stats_items %} + + +{% block other_stats %} +

    {% trans "Statistics of your videos" %}

    + +
    + {% with user_str=request.user|stringformat:"s" %} +
    + {% trans "Graph of video evolution for the user " as graph_title_prefix %} + {% include "stats/utils/years-video-stats.html" with graph_id="videosEvolutionChart" graph_title=graph_title_prefix|add:user_str %} +
    +
    + {% trans "Breakdown of video status for the user " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="statusChart" graph_data=status_datas graph_title=graph_title_prefix|add:user_str %} +
    + {% endwith %} +
    +{% endblock other_stats %} diff --git a/pod/stats/templates/stats/utils/base-stats.html b/pod/stats/templates/stats/utils/base-stats.html new file mode 100644 index 0000000000..afd2c91c03 --- /dev/null +++ b/pod/stats/templates/stats/utils/base-stats.html @@ -0,0 +1,36 @@ +{% extends 'base.html' %} +{% load static i18n %} + +{% block opengraph %} + {{ block.super }} + + + +{% endblock opengraph %} + +{% block page_title %}{{ title }}{% endblock page_title %} + +{% block page_extra_head %} + +{% endblock page_extra_head %} + +{% block page_content %} + {% if form %} + {% include "videos/video-form.html" %} + {% else %} +

    {{ title }}

    + +
    + {% block stats_items %}{% endblock stats_items %} +
    + {% endif %} +
    + {% block other_stats %}{% endblock other_stats %} +
    +{% endblock page_content %} +{% block collapse_page_aside %}{% endblock collapse_page_aside %} +{% block page_aside %}{% endblock page_aside %} + +{% block more_script %} + +{% endblock %} \ No newline at end of file diff --git a/pod/stats/templates/stats/utils/pie-chart.html b/pod/stats/templates/stats/utils/pie-chart.html new file mode 100644 index 0000000000..24ff94b4e0 --- /dev/null +++ b/pod/stats/templates/stats/utils/pie-chart.html @@ -0,0 +1,70 @@ +{% load static i18n %} +
    + + +
    +{% block more_script %} + + + + + +{% endblock %} diff --git a/pod/stats/templates/stats/utils/stats-item.html b/pod/stats/templates/stats/utils/stats-item.html new file mode 100644 index 0000000000..cc9f5d82f2 --- /dev/null +++ b/pod/stats/templates/stats/utils/stats-item.html @@ -0,0 +1,19 @@ +
    +
    + +
    +
    + {% if url is not None %} + + {{ label }} + + {% else %} + {{ label }} + {% endif %} +
    + {% if number is not None %} +
    {{ number }}
    + {% elif text is not None %} +
    {{ text }}
    + {% endif %} +
    \ No newline at end of file diff --git a/pod/stats/templates/stats/utils/video-stats.html b/pod/stats/templates/stats/utils/video-stats.html new file mode 100644 index 0000000000..14a0f095fe --- /dev/null +++ b/pod/stats/templates/stats/utils/video-stats.html @@ -0,0 +1,29 @@ +{% load static i18n %} + +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +{% block more_script %} + + + + + + +{% endblock %} \ No newline at end of file diff --git a/pod/stats/templates/stats/utils/years-video-stats.html b/pod/stats/templates/stats/utils/years-video-stats.html new file mode 100644 index 0000000000..8380680368 --- /dev/null +++ b/pod/stats/templates/stats/utils/years-video-stats.html @@ -0,0 +1,29 @@ +{% load static i18n %} + +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +{% block more_script %} + + + + + + +{% endblock %} \ No newline at end of file diff --git a/pod/stats/templates/stats/video-stats-view.html b/pod/stats/templates/stats/video-stats-view.html new file mode 100644 index 0000000000..8c396df215 --- /dev/null +++ b/pod/stats/templates/stats/video-stats-view.html @@ -0,0 +1,84 @@ +{% extends 'stats/utils/base-stats.html' %} +{% load static i18n %} +{% load playlist_stats %} +{% load general_stats %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + + {% trans "Statistics" %} + +
    • + {% if not slug %} +
  • + {% trans "Videos" %} +
    • + {% else %} +
  • + + {% trans "Videos" %} + +
    • +
  • + {{ video.title }} +
    • + {% endif %} +{% endblock %} + +{% block stats_items %} + {% if slug %} + {% get_total_favorites_video video as get_total_favorites_video %} + {% include "stats/utils/stats-item.html" with icon="bi bi-star" label=_("Number of favorites") number=get_total_favorites_video %} + + {% get_count_video_added_in_playlist video as get_count_video_added_in_playlist %} + {% include "stats/utils/stats-item.html" with icon="bi bi-list-ul" label=_("Addition in a playlist") number=get_count_video_added_in_playlist %} + + {% include "stats/utils/stats-item.html" with icon="bi bi-eye" label=_("Number of views") number=video.get_viewcount %} + + {% else %} + {% url 'video:my_videos' as url_for_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-film" url=url_for_videos label=_("Number of videos") number=videos|length %} + + {% get_total_time_videos videos as get_total_time_videos %} + {% include "stats/utils/stats-item.html" with icon="bi bi-clock" label=_("Duration time of videos") number=get_total_time_videos %} + + {% if prefered_discipline %} + {% url 'videos:videos' as videos_url %} + {% with url_for_prefered_discipline=videos_url|add:"?discipline="|add:prefered_discipline.slug %} + {% include "stats/utils/stats-item.html" with icon="bi bi-book" url=url_for_prefered_discipline label=_("Most popular discipline") text=prefered_discipline %} + {% endwith %} + {% else %} + {% include "stats/utils/stats-item.html" with icon="bi bi-book" label=_("Most popular discipline") text=_("No popular discipline") %} + {% endif %} + + {% if prefered_type %} + {% url 'videos:videos' as videos_url %} + {% with url_for_prefered_type=videos_url|add:"?type="|add:prefered_type.slug %} + {% include "stats/utils/stats-item.html" with icon="bi bi-tv" url=url_for_prefered_type label=_("Most popular video type") text=prefered_type %} + {% endwith %} + {% else %} + {% include "stats/utils/stats-item.html" with icon="bi bi-tv" label=_("Most popular video type") text=_("No popular video type") %} + {% endif %} + {% endif %} +{% endblock stats_items %} + +{% block other_stats %} +

    {% trans "Graphics of videos" %}

    + + {% if slug %} + {% trans "Graph of video evolution of " as graph_title_prefix %} + {% include "stats/utils/video-stats.html" with graph_id="videoEvolutionChart" graph_title=graph_title_prefix|add:slug %} + {% else %} +
    +
    + {% trans "Graph of video evolution " as graph_title_prefix %} + {% include "stats/utils/years-video-stats.html" with graph_id="videosEvolutionChart" graph_title=graph_title_prefix %} +
    +
    + {% trans "Breakdown of video status " as graph_title_prefix %} + {% include "stats/utils/pie-chart.html" with graph_id="statusChart" graph_data=status_datas graph_title=graph_title_prefix %} +
    +
    + {% endif %} +{% endblock other_stats %} diff --git a/pod/favorite/templatetags/__init__.py b/pod/stats/templatetags/__init__.py similarity index 100% rename from pod/favorite/templatetags/__init__.py rename to pod/stats/templatetags/__init__.py diff --git a/pod/stats/templatetags/channel_stats.py b/pod/stats/templatetags/channel_stats.py new file mode 100644 index 0000000000..7ec79113e3 --- /dev/null +++ b/pod/stats/templatetags/channel_stats.py @@ -0,0 +1,20 @@ +from django.template import Library + +from pod.stats.utils import number_themes +from pod.video.models import Channel + +register = Library() + + +@register.simple_tag(takes_context=False, name="get_number_themes") +def get_number_themes(channel: Channel = None) -> int: + """ + Get the total number of themes associated with a channel. + + Args: + channel (Channel, optional): The channel for which to retrieve the number of themes. Defaults to None. + + Returns: + int: The total number of themes associated with the channel. + """ + return number_themes(channel) diff --git a/pod/stats/templatetags/general_stats.py b/pod/stats/templatetags/general_stats.py new file mode 100644 index 0000000000..3273f93e86 --- /dev/null +++ b/pod/stats/templatetags/general_stats.py @@ -0,0 +1,50 @@ +from typing import List +from django.template import Library, RequestContext + +from pod.stats.utils import number_users, number_videos, total_time_videos +from pod.video.models import Video + +register = Library() + + +@register.simple_tag(takes_context=True, name="get_total_time_videos") +def get_total_time_videos(context: RequestContext, video_list: List[Video] = None) -> str: + """ + Get the total duration of videos in the specified list. + + Args: + context (RequestContext): The context. + video_list (List[Video], optional): The list of videos. Defaults to None. + + Returns: + str: The formatted total duration of videos in HH:MM:SS format. + """ + request = context["request"] + return total_time_videos(request, video_list) + + +@register.simple_tag(takes_context=True, name="get_number_videos") +def get_number_videos(context: RequestContext, video_list: List[Video] = None) -> int: + """ + Get the total number of videos in the specified list. + + Args: + context (RequestContext): The context. + video_list (List[Video], optional): The list of videos. Defaults to None. + + Returns: + int: The total number of videos. + """ + request = context["request"] + return number_videos(request, video_list) + + +@register.simple_tag(takes_context=False, name="get_number_users") +def get_number_users() -> int: + """ + Get the total number of users. + + Returns: + int: The total number of users. + """ + return number_users() diff --git a/pod/stats/templatetags/playlist_stats.py b/pod/stats/templatetags/playlist_stats.py new file mode 100644 index 0000000000..372af23c06 --- /dev/null +++ b/pod/stats/templatetags/playlist_stats.py @@ -0,0 +1,84 @@ +from django.template import Library +from pod.playlist.models import Playlist + +from pod.video.models import Video + +from pod.playlist.utils import ( + get_additional_owners, + get_count_video_added_in_playlist as total_additions_playlist_utils, + get_total_favorites_video as total_favorites_utils, + get_number_video_in_playlist as total_videos_in_playlist, + playlist_visibility, +) + +register = Library() + + +@register.simple_tag(name="get_total_favorites_video") +def get_total_favorites_video(video: Video) -> int: + """ + Get the total number of times a video has been marked as a favorite. + + Args: + video (:class:`pod.video.models.Video`): The video for which to retrieve the total number of favorites. + + Returns: + int: The total number of favorites for the video. + """ + return total_favorites_utils(video) + + +@register.simple_tag(name="get_count_video_added_in_playlist") +def get_count_video_added_in_playlist(video: Video) -> int: + """ + Get the total number of times a video has been added to playlists. + + Args: + video (:class:`pod.video.models.Video`): The video for which to retrieve the total number of additions to playlists. + + Returns: + int: The total number of additions to playlists for the video. + """ + return total_additions_playlist_utils(video) + + +@register.simple_tag(name="get_number_video_in_playlist") +def get_number_video_in_playlist(playlist: Playlist) -> int: + """ + Get the number of videos in a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist for which to retrieve the number of videos. + + Returns: + int: The number of videos in the playlist. + """ + return total_videos_in_playlist(playlist) + + +@register.simple_tag(name="get_number_additional_owners_playlist") +def get_number_additional_owners_playlist(playlist: Playlist) -> int: + """ + Get the number of additional owners of a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist for which to retrieve the number of additional owners. + + Returns: + int: The number of additional owners of the playlist. + """ + return get_additional_owners(playlist).count() + + +@register.simple_tag(name="get_playlist_visibility") +def get_playlist_visibility(playlist: Playlist) -> str: + """ + Get the visibility status of a playlist. + + Args: + playlist (:class:`pod.playlist.models.Playlist`): The playlist for which to retrieve the visibility status. + + Returns: + str: The visibility status of the playlist. + """ + return playlist_visibility(playlist) diff --git a/pod/stats/templatetags/user_stats.py b/pod/stats/templatetags/user_stats.py new file mode 100644 index 0000000000..f06a8a4762 --- /dev/null +++ b/pod/stats/templatetags/user_stats.py @@ -0,0 +1,106 @@ +from django.template import Library, RequestContext +from pod.playlist.utils import get_number_playlist + +from pod.stats.utils import ( + number_channels, + number_favorites, + number_files, + number_meetings, + number_videos, +) + +from pod.video.models import Video + +register = Library() + + +@register.simple_tag(takes_context=True, name="get_number_video_user") +def get_number_video_user(context: RequestContext) -> int: + """ + Get the number of videos for a user. + + Args: + context (RequestContext): The context. + + Returns: + int: The number of videos for the user. + """ + request = context["request"] + user_video_list = Video.objects.filter(owner=request.user) + return number_videos(request, user_video_list) + + +@register.simple_tag(takes_context=True, name="get_number_playlist_user") +def get_number_playlist_user(context: RequestContext): + """ + Get the number of playlists for a user. + + Args: + context (RequestContext): The context. + + Returns: + int: The number of playlists for the user. + """ + request = context["request"] + return get_number_playlist(request.user) + + +@register.simple_tag(takes_context=True, name="get_number_files_user") +def get_number_files_user(context: RequestContext): + """ + Get the number of files for a user. + + Args: + context (RequestContext): The context. + + Returns: + int: The number of files for the user. + """ + request = context["request"] + return number_files(request.user) + + +@register.simple_tag(takes_context=True, name="get_number_favorites_user") +def get_number_favorites_user(context: RequestContext): + """ + Get the number of favorites for a user. + + Args: + context (RequestContext): The context. + + Returns: + int: The number of favorites for user. + """ + request = context["request"] + return number_favorites(request.user) + + +@register.simple_tag(takes_context=True, name="get_number_meetings_user") +def get_number_meetings_user(context: RequestContext): + """ + Get the number of meetings for a user. + + Args: + context (RequestContext): The context. + + Returns: + int: The number of meetings for user. + """ + request = context["request"] + return number_meetings(request.user) + + +@register.simple_tag(takes_context=True, name="get_number_channels") +def get_number_channels(context: RequestContext, target: str = None): + """ + Get the number of channels for a user. + + Args: + context (RequestContext): The context. + target (str, optional): The target can be "user" or "None". Defaults to None. + + Returns: + int: The number of channels for user if the target is "user", or the number of all channels if target is "None". + """ + request = context["request"] + return number_channels(request, target) diff --git a/pod/stats/tests.py b/pod/stats/tests.py new file mode 100644 index 0000000000..7ce503c2dd --- /dev/null +++ b/pod/stats/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/pod/stats/urls.py b/pod/stats/urls.py new file mode 100644 index 0000000000..6940ba8e66 --- /dev/null +++ b/pod/stats/urls.py @@ -0,0 +1,38 @@ +from django.urls import path +from django.conf import settings + +from .views import ( + channel_stats_view, + general_stats_view, + meeting_stats_view, + playlist_stats_view, + to_do, + user_stats_view, + video_stats_view, +) + +app_name = "stats" + +if getattr(settings, "USE_STATS_VIEW", False): + urlpatterns = [ + path("", general_stats_view, name="general-stats"), + # USERS + path("my-stats/", user_stats_view, name="my-stats"), + # VIDEOS + path("videos/", video_stats_view, name="video-stats"), + path("videos/", video_stats_view, name="video-stats"), + # CHANNELS + path("channels/", channel_stats_view, name="channels-stats"), + path("channels/", channel_stats_view, name="channels-stats"), + path( + "channels//", + channel_stats_view, + name="channels-stats", + ), + # PLAYLISTS + path("playlists/", playlist_stats_view, name="playlist-stats"), + path("playlists/", playlist_stats_view, name="playlist-stats"), + # MEETINGS + path("meetings/", meeting_stats_view, name="meeting-stats"), + path("meetings/", meeting_stats_view, name="meeting-stats"), + ] diff --git a/pod/stats/utils.py b/pod/stats/utils.py new file mode 100644 index 0000000000..6323e450d0 --- /dev/null +++ b/pod/stats/utils.py @@ -0,0 +1,469 @@ +"""Esup-Pod stats utilities.""" +from collections import Counter +from typing import List +from datetime import date, timedelta + +from django.http import HttpRequest +from django.shortcuts import get_object_or_404 +from django.db.models import Sum +from django.core.cache import cache +from django.contrib.auth.models import User +from django.contrib.sites.shortcuts import get_current_site +from django.conf import settings + +from pod.meeting.models import Meeting +from pod.playlist.models import Playlist, PlaylistContent +from pod.playlist.apps import FAVORITE_PLAYLIST_NAME +from pod.playlist.utils import ( + get_favorite_playlist_for_user, + get_number_video_in_playlist, +) +from pod.podfile.models import UserFolder +from pod.video.context_processors import get_available_videos +from pod.video.models import Channel, Theme, Video, ViewCount + +from json import dumps + +CACHE_EXPIRATION = 300 # Cache expiration time in seconds + + +def get_videos_stats( + video_list: List[Video], date_filter: date, mode: str = None +) -> dict: + """ + Get aggregated statistics data for a list of videos based on the specified date filter and mode. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of video objects. + date_filter (date): The date filter to apply. + mode (str, optional): The mode for data aggregation. Defaults to None. + + Returns: + dict: A dictionary containing the aggregated statistics data. + """ + if not mode: + video_stats = get_days_videos_stats(video_list, date_filter) + elif mode == "year": + video_stats = get_years_videos_stats(video_list, date_filter) + return video_stats + + +def get_views_count( + video_list: List[Video], + date_filter: date = date.today(), + years_only: bool = False, + day_only: bool = False, +) -> dict: + """ + Get the total views count for a list of videos based on the specified date filter and options. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of video objects. + date_filter (date, optional): The date filter to apply. Defaults to today's date. + years_only (bool, optional): If True, calculate views count for years only. Defaults to False. + day_only (bool, optional): If True, calculate views count for a specific day only. Defaults to False. + + Returns: + dict: A dictionary containing the aggregated views count data. + """ + cache_key = f"views_count_{date_filter}_{years_only}_{day_only}" + all_views = cache.get(cache_key) + + if all_views is None: + all_views = {} + if day_only: + all_views["views_day"] = ( + ViewCount.objects.filter( + video_id__in=video_list, date=date_filter + ).aggregate(Sum("count"))["count__sum"] + or 0 + ) + elif years_only: + all_views["views_year"] = ( + ViewCount.objects.filter( + date__year=date_filter.year, video_id__in=video_list + ).aggregate(Sum("count"))["count__sum"] + or 0 + ) + else: + # view count since video was created + all_views["views_since_created"] = ( + ViewCount.objects.filter(video_id__in=video_list).aggregate(Sum("count"))[ + "count__sum" + ] + or 0 + ) + + cache.set(cache_key, all_views, CACHE_EXPIRATION) + + return all_views + + +def get_playlists_count( + video_list: List[Video], + date_filter: date = date.today(), + years_only: bool = False, + day_only: bool = False, +) -> dict: + """ + Get the total playlists count for a list of videos based on the specified date filter and options. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of video objects. + date_filter (date, optional): The date filter to apply. Defaults to today's date. + years_only (bool, optional): If True, calculate playlist addition for years only. Defaults to False. + day_only (bool, optional): If True, calculate playlist addition for a specific day only. Defaults to False. + + Returns: + dict: A dictionary containing the aggregated playlists count data. + """ + cache_key = f"playlists_count_{date_filter}_{years_only}_{day_only}" + all_playlists = cache.get(cache_key) + + if all_playlists is None: + all_playlists = {} + if day_only: + all_playlists["playlist_addition_day"] = PlaylistContent.objects.filter( + video_id__in=video_list, date_added__date=date_filter + ).count() + elif years_only: + all_playlists["playlist_addition_year"] = PlaylistContent.objects.filter( + video_id__in=video_list, date_added__year=date_filter.year + ).count() + else: + # playlist addition since video was created + all_playlists[ + "playlist_addition_since_created" + ] = PlaylistContent.objects.filter(video_id__in=video_list).count() + + cache.set(cache_key, all_playlists, CACHE_EXPIRATION) + + return all_playlists + + +def get_favorites_count( + video_list: List[Video], + date_filter: date = date.today(), + years_only: bool = False, + day_only: bool = False, +) -> dict: + """ + Get the total favorites count for a list of videos based on the specified date filter and options. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of video objects. + date_filter (date, optional): The date filter to apply. Defaults to today's date. + years_only (bool, optional): If True, calculate favorites count for years only. Defaults to False. + day_only (bool, optional): If True, calculate favorites count for a specific day only. Defaults to False. + + Returns: + dict: A dictionary containing the aggregated favorites count data. + """ + cache_key = f"favorites_count_{date_filter}_{years_only}_{day_only}" + all_favorites = cache.get(cache_key) + + if all_favorites is None: + all_favorites = {} + favorites_playlists = Playlist.objects.filter(name=FAVORITE_PLAYLIST_NAME) + if day_only: + all_favorites["favorites_day"] = PlaylistContent.objects.filter( + playlist__in=favorites_playlists, + video_id__in=video_list, + date_added__date=date_filter, + ).count() + elif years_only: + all_favorites["favorites_year"] = PlaylistContent.objects.filter( + playlist__in=favorites_playlists, + video_id__in=video_list, + date_added__year=date_filter.year, + ).count() + else: + all_favorites["favorites_since_created"] = PlaylistContent.objects.filter( + playlist__in=favorites_playlists, video_id__in=video_list + ).count() + + cache.set(cache_key, all_favorites, CACHE_EXPIRATION) + + return all_favorites + + +def get_days_videos_stats( + video_list: List[Video], date_filter: date = date.today() +) -> str: + """ + Get daily aggregated statistics data for a list of videos based on the specified date filter. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of video objects. + date_filter (date, optional): The date filter to apply. Defaults to today's date. + + Returns: + str: A JSON-encoded string containing the aggregated daily statistics data. + """ + all_video_stats = {"date": str(date_filter), "datas": {}} + + all_video_stats["datas"].update( + get_views_count(video_list, date_filter, day_only=True) + ) + if getattr(settings, "USE_PLAYLIST", True): + all_video_stats["datas"].update( + get_playlists_count(video_list, date_filter, day_only=True) + ) + if getattr(settings, "USE_PLAYLIST", True) and getattr( + settings, "USE_FAVORITES", True + ): + all_video_stats["datas"].update( + get_favorites_count(video_list, date_filter, day_only=True) + ) + + return dumps(all_video_stats) + + +def get_years_videos_stats( + video_list: List[Video], date_filter: date = date.today() +) -> str: + """ + Get yearly aggregated statistics data for a list of videos based on the specified date filter. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of video objects. + date_filter (date, optional): The date filter to apply. Defaults to today's date. + + Returns: + str: A JSON-encoded string containing the aggregated yearly statistics data. + """ + all_years_videos_stats = {"year": date_filter.year, "datas": {}} + + all_years_videos_stats["datas"].update( + get_views_count(video_list, date_filter, years_only=True) + ) + if getattr(settings, "USE_PLAYLIST", True): + all_years_videos_stats["datas"].update( + get_playlists_count(video_list, date_filter, years_only=True) + ) + if getattr(settings, "USE_PLAYLIST", True) and getattr( + settings, "USE_FAVORITES", True + ): + all_years_videos_stats["datas"].update( + get_favorites_count(video_list, date_filter, years_only=True) + ) + + return dumps(all_years_videos_stats) + + +def get_videos_status_stats(video_list: List[Video]) -> str: + """ + Get statistics for the status of videos in the given list. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of Video objects. + + Returns: + str: JSON-encoded statistics for different video statuses. + """ + stats = {} + number_videos = len(video_list) + draft_number = Video.objects.filter(id__in=video_list, is_draft=True).count() + restricted_number = Video.objects.filter( + id__in=video_list, is_restricted=True + ).count() + password_number = Video.objects.filter( + id__in=video_list, password__isnull=False + ).count() + public_number = number_videos - draft_number - restricted_number - password_number + + stats["public"] = public_number + stats["draft"] = draft_number + stats["restricted"] = restricted_number + stats["password"] = password_number + return dumps(stats) + + +def get_playlists_status_stats(playlist_list: List[Playlist]) -> str: + """ + Get statistics for the visibility statuses of playlists in the given list. + + Args: + playlist_list (List[:class:`pod.playlist.models.Playlist`]): List of Playlist objects. + + Returns: + str: JSON-encoded statistics for different playlist visibility statuses. + """ + stats = {} + visibility_list = list(playlist_list.values_list("visibility", flat=True)) + stats = Counter(visibility_list) + return dumps(stats) + + +def total_time_videos(request: HttpRequest, video_list: List[Video] = None) -> str: + """ + Get the total duration of videos in the specified list or for the user's available videos. + + Args: + request (HttpRequest): The HTTP request object. + video_list (List[:class:`pod.video.models.Video`], optional): List of Video objects. Defaults to None. + + Returns: + str: The formatted total duration of videos in HH:MM:SS format. + """ + if video_list: + total_duration = video_list.aggregate(Sum("duration"))["duration__sum"] + else: + total_duration = get_available_videos(request).aggregate(Sum("duration"))[ + "duration__sum" + ] + return str(timedelta(seconds=total_duration)) if total_duration else "0" + + +def number_videos(request: HttpRequest, video_list: List[Video] = None) -> int: + """ + Get the number of videos in the specified list or for the user's available videos. + + Args: + request (HttpRequest): The HTTP request object. + video_list (List[:class:`pod.video.models.Video`], optional): List of Video objects. Defaults to None. + + Returns: + int: The number of videos. + """ + if video_list: + number_videos = video_list.count() + else: + number_videos = get_available_videos(request).count() + return number_videos + + +def number_files(user: User) -> int: + """ + Get the number of files in the user's home folder. + + Args: + user (:class:`django.contrib.auth.models.User`): The User object. + + Returns: + int: The number of files. + """ + user_home_folder = get_object_or_404(UserFolder, name="home", owner=user) + return len(user_home_folder.get_all_files()) + + +def number_favorites(user: User) -> int: + """ + Get the number of videos in the user's favorite playlist. + + Args: + user (:class:`django.contrib.auth.models.User`): The User object. + + Returns: + int: The number of videos in the favorite playlist. + """ + favorites = get_favorite_playlist_for_user(user) + return get_number_video_in_playlist(favorites) + + +def number_meetings(user: User) -> int: + """ + Get the number of meetings owned by the user. + + Args: + user (:class:`django.contrib.auth.models.User`): The User object. + + Returns: + int: The number of meetings. + """ + return Meeting.objects.filter(owner=user).count() + + +def number_channels(request: HttpRequest, target: str = None) -> int: + """ + Get the number of channels for the user or in total. + + Args: + request (HttpRequest): The HTTP request object. + target (str, optional): The target for counting channels. Defaults to None. + + Returns: + int: The number of channels. + """ + site = get_current_site(request) + if target == "user": + return request.user.owners_channels.all().filter(site=site).count() + return Channel.objects.all().filter(site=site).distinct().count() + + +def get_channels_visibility_stats(channel_list: List[Channel]) -> str: + """ + Get statistics for the visibility statuses of channels in the given list. + + Args: + channel_list (List[:class:`pod.video.models.Channel`]): List of Channel objects. + + Returns: + str: JSON-encoded statistics for different channel visibility statuses. + """ + stats = {} + number_channels = len(channel_list) + + visible_channels = channel_list.filter(visible=True).count() + private_channels = number_channels - visible_channels + + stats["visible"] = visible_channels + stats["private"] = private_channels + return dumps(stats) + + +def get_most_common_type_discipline(video_list: List[Video]): + """ + Get the most common video type and discipline from the given list of videos. + + Args: + video_list (List[:class:`pod.video.models.Video`]): List of Video objects. + + Returns: + Tuple[Type, Discipline]: The most common video type and discipline. + """ + if len(video_list) > 0: + type_counter = Counter() + discipline_counter = Counter() + + for video in video_list: + if video.type and video.type.slug != "other": + type_counter[video.type] += 1 + if video.discipline.exists(): + for discipline in video.discipline.all(): + discipline_counter[discipline] += 1 + + most_common_type = type_counter.most_common(1)[0][0] if type_counter else None + most_common_discipline = ( + discipline_counter.most_common(1)[0][0] if discipline_counter else None + ) + else: + most_common_type = None + most_common_discipline = None + return most_common_type, most_common_discipline + + +def number_users() -> int: + """ + Get the total number of users. + + Returns: + int: The number of users. + """ + return User.objects.all().distinct().count() + + +def number_themes(channel: Channel = None) -> int: + """ + Get the number of themes for the specified channel or in total. + + Args: + channel (:class:`pod.video.models.Channel`, optional): The Channel object. Defaults to None. + + Returns: + int: The number of themes. + """ + if channel: + return Theme.objects.filter(channel=channel).distinct().count() + else: + return Theme.objects.all().distinct().count() diff --git a/pod/stats/views.py b/pod/stats/views.py new file mode 100644 index 0000000000..4c5fc7248b --- /dev/null +++ b/pod/stats/views.py @@ -0,0 +1,464 @@ +"""Esup-Pod stats views.""" +import json +from datetime import date +from dateutil.parser import parse +from typing import List + +from django.conf import settings +from django.contrib.auth.decorators import user_passes_test +from django.contrib.auth.models import User +from django.contrib.sites.shortcuts import get_current_site +from django.http import HttpRequest, HttpResponseNotFound, JsonResponse +from django.shortcuts import get_object_or_404, render +from django.utils.translation import gettext_lazy as _ +from pod.meeting.models import Meeting + +from pod.playlist.utils import ( + get_all_playlists, + get_favorite_playlist_for_user, + get_playlist, + get_video_list_for_playlist, +) +from pod.stats.utils import ( + get_channels_visibility_stats, + get_most_common_type_discipline, + get_playlists_status_stats, + get_videos_stats, + get_videos_status_stats, +) +from pod.video.context_processors import get_available_videos +from pod.video.forms import VideoPasswordForm +from pod.video.models import Channel, Theme, Video +from pod.video.views import get_video_access + +VIEW_STATS_AUTH = getattr(settings, "VIEW_STATS_AUTH", False) + + +def view_stats_if_authenticated(user: User) -> bool: + """ + Check if the user is authenticated and has permission to view statistics. + + + Args: + user (:class:`django.contrib.auth.models.User`): The user object to check. + + + Returns: + bool: False if the user is not authenticated or VIEW_STATS_AUTH is False, else True. + """ + return user.is_authenticated and VIEW_STATS_AUTH + + +STATS_VIEWS = { + "videos": { + "filter_func": lambda kwargs: Video.objects.filter(slug=kwargs.get("video_slug")) + if kwargs.get("video_slug") + else kwargs["available_videos"], + "title_func": lambda kwargs: _("Video statistics: %s") + % kwargs["video_founded"].title.capitalize() + if kwargs["video_founded"] + else _("Site video statistics"), + }, + "channel": { + "filter_func": lambda kwargs: Video.objects.filter( + channel=kwargs["channel_obj"], theme=kwargs["theme_obj"] + ) + if kwargs.get("theme_obj") + else Video.objects.filter(channel=kwargs["channel_obj"]), + "title_func": lambda kwargs: _("Video statistics for the theme %s") + % kwargs["theme_obj"].title + if kwargs.get("theme_obj") + else _("Video statistics for the channel %s") % kwargs["channel_obj"].title + if kwargs["channel_obj"] + else _("Statistics for channels"), + }, + "user": { + "filter_func": lambda kwargs: Video.objects.filter(owner=kwargs["user"]), + "title_func": lambda kwargs: _("Statistics for user %s") % kwargs["user"], + }, + "general": { + "filter_func": lambda kwargs: kwargs["available_videos"], + "title_func": lambda kwargs: _("Site statistics"), + }, + "playlist": { + "filter_func": lambda kwargs: Video.objects.filter( + playlistcontent__playlist=kwargs["playlist_obj"] + ), + "title_func": lambda kwargs: _("Statistics for the playlist %s") + % kwargs["playlist_obj"].name + if kwargs["playlist_obj"] + else _("Statistics for playlists"), + }, +} + + +def get_videos( + request: HttpRequest, + target: str, + video_slug=None, + channel=None, + theme=None, + playlist=None, +): + """ + Get a list of videos based on the specified target and filters. + + + Args: + request (HttpRequest): The HTTP request object. + target (str): The target of the statistics view. + video_slug (str, optional): The slug of the video. Defaults to None. + channel (str, optional): The slug of the channel. Defaults to None. + theme (str, optional): The slug of the theme. Defaults to None. + playlist (str, optional): The slug of the playlist. Defaults to None. + + + Returns: + Tuple[List[Video], str]: A tuple containing a list of videos and the title for the view. + """ + title = _("Video statistics") + available_videos = get_available_videos() + videos = [] + + if target.lower() in STATS_VIEWS: + config = STATS_VIEWS[target.lower()] + filter_args = { + "video_slug": video_slug, + "channel": channel, + "theme": theme, + "playlist": playlist, + "available_videos": available_videos, + "user": request.user if target.lower() == "user" else None, + "channel_obj": get_object_or_404(Channel, slug=channel) if channel else None, + "theme_obj": get_object_or_404(Theme, slug=theme) if theme else None, + "video_founded": Video.objects.filter(slug=video_slug).first() + if video_slug + else None, + "playlist_obj": get_playlist(playlist) if playlist else None, + } + videos = config["filter_func"](filter_args) + title = config["title_func"](filter_args) + + return videos, title + + +def manage_post_request( + request: HttpRequest, videos: List[Video], video: Video = None +) -> JsonResponse: + """ + Process a POST request to fetch video statistics data. + + + Args: + request (HttpRequest): The HTTP request object. + videos (List[Video]): A list of video objects to fetch statistics for. + video (Video, optional): A specific video object for which to fetch statistics. Defaults to None. + + + Returns: + JsonResponse: A JSON response containing the fetched video statistics data. + """ + date_filter = request.POST.get("periode", date.today()) + if isinstance(date_filter, str): + date_filter = parse(date_filter).date() + if video: # For one video + data = get_videos_stats(videos, date_filter) + else: # For some videos + data = get_videos_stats(videos, date_filter, mode="year") + return JsonResponse(data, safe=False) + + +@user_passes_test(view_stats_if_authenticated) +def video_stats_view(request: HttpRequest, video: str = None): + """ + Display video statistics view based on user's authentication status. + + + Args: + request (HttpRequest): The HTTP request object. + video (str, optional): The video slug. Defaults to None. + + + Returns: + HttpResponse: A response containing the rendered video statistics view. + """ + target = "videos" + videos, title = get_videos(request=request, target=target, video_slug=video) + + if not videos: + return HttpResponseNotFound(_("The following video does not exist: %s") % video) + + if request.method == "GET": + if video and videos: + return manage_access_rights_stats_video(request, videos[0], title) + + status_datas_json = get_videos_status_stats(videos) + status_datas = json.loads(status_datas_json) + status_datas.pop("draft", None) + prefered_type, prefered_discipline = get_most_common_type_discipline(videos) + + return render( + request, + "stats/video-stats-view.html", + { + "title": title, + "videos": videos, + "status_datas": json.dumps(status_datas), + "prefered_type": prefered_type, + "prefered_discipline": prefered_discipline, + }, + ) + if request.method == "POST": + return manage_post_request(request, videos, video) + + +def manage_access_rights_stats_video(request: HttpRequest, video: Video, page_title): + """ + Manage access rights to the video statistics view based on user permissions. + + + Args: + request (HttpRequest): The HTTP request object. + video (Video): The video object for which to manage access rights. + page_title (str): The title of the page. + + + Returns: + HttpResponse: A response containing the rendered video statistics view or an error message. + """ + video_access_ok = get_video_access(request, video, slug_private=None) + is_password_protected = video.password is not None and video.password != "" + has_rights = ( + request.user == video.owner + or request.user.is_superuser + or request.user.has_perm("video.change_viewcount") + or request.user in video.additional_owners.all() + ) + if not has_rights and is_password_protected: + form = VideoPasswordForm() + return render( + request, + "stats/video-stats-view.html", + {"form": form, "title": page_title}, + ) + elif ( + (not has_rights and video_access_ok and not is_password_protected) + or (video_access_ok and not is_password_protected) + or has_rights + ): + return render( + request, + "stats/video-stats-view.html", + { + "title": page_title, + "video": video, + "slug": video.slug, + }, + ) + return HttpResponseNotFound( + _("You do not have access rights to this video: %s" % video.slug) + ) + + +def to_do(): + ... + + +@user_passes_test(view_stats_if_authenticated) +def channel_stats_view(request: HttpRequest, channel: str = None, theme: str = None): + """ + Display channel statistics view based on user's authentication status. + + Args: + request (HttpRequest): The HTTP request object. + channel (str): The channel slug. Defaults to None. + theme (str): The theme slug. Defaults to None. + + Returns: + HttpResponse: A response containing the rendered channel statistics view. + """ + target = "channel" + videos, title = get_videos( + request=request, target=target, channel=channel, theme=theme + ) + + if request.method == "GET": + if channel: + status_datas = get_videos_status_stats(videos) + return render( + request, + "stats/channel-stats-view.html", + { + "title": title, + "channel": channel, + "theme": theme, + "status_datas": status_datas, + "videos": videos, + "date": date.today(), + }, + ) + else: + site = get_current_site(request) + channels = Channel.objects.all().filter(site=site).distinct() + visibility_datas = get_channels_visibility_stats(channels) + return render( + request, + "stats/channel-stats-view.html", + { + "title": title, + "visibility_datas": visibility_datas, + }, + ) + + elif request.method == "POST": + return manage_post_request(request, videos) + + +@user_passes_test(view_stats_if_authenticated) +def user_stats_view(request: HttpRequest): + """ + Display user statistics view based on user's authentication status. + + Args: + request (HttpRequest): The HTTP request object. + + Returns: + HttpResponse: A response containing the rendered user statistics view. + """ + target = "user" + videos, title = get_videos(request=request, target=target) + + if request.method == "GET": + status_datas = get_videos_status_stats(videos) + prefered_type, prefered_discipline = get_most_common_type_discipline( + get_video_list_for_playlist(get_favorite_playlist_for_user(request.user)) + ) + return render( + request, + "stats/user-stats-view.html", + { + "title": title, + "videos": videos, + "status_datas": status_datas, + "prefered_type": prefered_type, + "prefered_discipline": prefered_discipline, + }, + ) + elif request.method == "POST": + return manage_post_request(request, videos) + + +@user_passes_test(view_stats_if_authenticated) +def general_stats_view(request: HttpRequest): + """ + Display general statistics view based on user's authentication status. + + Args: + request (HttpRequest): The HTTP request object. + + Returns: + HttpResponse: A response containing the rendered general statistics view. + """ + target = "general" + videos, title = get_videos(request=request, target=target) + + if request.method == "GET": + status_datas_json = get_videos_status_stats(videos) + status_datas = json.loads(status_datas_json) + status_datas.pop("draft", None) + prefered_type, prefered_discipline = get_most_common_type_discipline(videos) + return render( + request, + "stats/general-stats-view.html", + { + "title": title, + "videos": videos, + "status_datas": json.dumps(status_datas), + "prefered_type": prefered_type, + "prefered_discipline": prefered_discipline, + }, + ) + elif request.method == "POST": + return manage_post_request(request, videos) + + +@user_passes_test(view_stats_if_authenticated) +def playlist_stats_view(request: HttpRequest, playlist: str = None): + """ + Display playlist statistics view based on user's authentication status. + + Args: + request (HttpRequest): The HTTP request object. + playlist (str, optional): The playlist slug. Defaults to None. + + Returns: + HttpResponse: A response containing the rendered playlist statistics view. + """ + target = "playlist" + videos, title = get_videos(request=request, target=target, playlist=playlist) + + if request.method == "GET": + if playlist: + status_datas = get_videos_status_stats(videos) + prefered_type, prefered_discipline = get_most_common_type_discipline(videos) + playlist = get_playlist(playlist) + return render( + request, + "stats/playlist-stats-view.html", + { + "title": title, + "videos": videos, + "status_datas": status_datas, + "prefered_type": prefered_type, + "prefered_discipline": prefered_discipline, + "playlist": playlist, + }, + ) + else: + playlists = get_all_playlists() + status_datas = get_playlists_status_stats(playlists) + return render( + request, + "stats/playlist-stats-view.html", + { + "title": title, + "playlists": playlists, + "status_datas": status_datas, + }, + ) + elif request.method == "POST": + return manage_post_request(request, videos) + +@user_passes_test(view_stats_if_authenticated) +def meeting_stats_view(request: HttpRequest, meeting: str = None): + """ + Display meetings statistics view based on user's authentication status. + + Args: + request (HttpRequest): The HTTP request object. + meeting (str, optional): The meeting slug. Defaults to None. + + Returns: + HttpResponse: A response containing the rendered meeting statistics view. + """ + target = "meeting" + # Récupérer les vidéos de réupload de la meeting ?? + + if meeting: + meeting = get_object_or_404(Meeting, meeting_id=meeting) + return render( + request, + "stats/meeting-stats-view.html", + { + "title": _("Statistics for the meeting %s") % meeting.name, + "meeting": meeting + } + ) + else: + return render( + request, + "stats/meeting-stats-view.html", + { + "title": _("Statistics for meetings"), + } + ) diff --git a/pod/urls.py b/pod/urls.py index c39d60191e..d10d86b059 100644 --- a/pod/urls.py +++ b/pod/urls.py @@ -80,10 +80,6 @@ # cut url(r"^cut/", include("pod.cut.urls")), ] -# PLAYLIST -urlpatterns += [ - path("playlist/", include("pod.playlist.urls", namespace="playlist")), -] # CAS if USE_CAS: @@ -128,10 +124,10 @@ url(r"^" + apps + "/", include("pod.%s.urls" % apps, namespace=apps)), ] -# FAVORITE -if getattr(settings, "USE_FAVORITES", True): +# PLAYLIST +if getattr(settings, "USE_PLAYLIST", True): urlpatterns += [ - path("favorite/", include("pod.favorite.urls", namespace="favorite")), + path("playlist/", include("pod.playlist.urls", namespace="playlist")), ] # IMPORT_VIDEO @@ -142,6 +138,12 @@ ), ] +# STATISTICS +if getattr(settings, "USE_STATS_VIEW", True): + urlpatterns += [ + path("stats/", include("pod.stats.urls", namespace="stats")) + ] + if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if importlib.util.find_spec("debug_toolbar") is not None: diff --git a/pod/video/context_processors.py b/pod/video/context_processors.py index 6c3240822d..b65223a6fc 100644 --- a/pod/video/context_processors.py +++ b/pod/video/context_processors.py @@ -6,13 +6,12 @@ from pod.video.models import Discipline from pod.video.models import Video -from django.db.models import Count, Sum +from django.db.models import Count from django.db.models import Prefetch from django.db.models import Q from django.db.models import Exists from django.db.models import OuterRef -from datetime import timedelta from django.contrib.sites.shortcuts import get_current_site from pod.main.models import AdditionalChannelTab from pod.video_encode_transcript.models import EncodingVideo @@ -142,20 +141,10 @@ def context_navbar(request): .annotate(video_count=Count("video", distinct=True)) ) - list_videos = get_available_videos(request) - VIDEOS_COUNT = list_videos.count() - VIDEOS_DURATION = ( - str(timedelta(seconds=list_videos.aggregate(Sum("duration"))["duration__sum"])) - if list_videos.aggregate(Sum("duration"))["duration__sum"] - else 0 - ) - return { "ALL_CHANNELS": all_channels, "ADD_CHANNELS_TAB": add_channels_tab, "CHANNELS": channels, "TYPES": types, "DISCIPLINES": disciplines, - "VIDEOS_COUNT": VIDEOS_COUNT, - "VIDEOS_DURATION": VIDEOS_DURATION, } diff --git a/pod/video/static/css/video_stats_view.css b/pod/video/static/css/video_stats_view.css deleted file mode 100644 index f46edc2513..0000000000 --- a/pod/video/static/css/video_stats_view.css +++ /dev/null @@ -1,71 +0,0 @@ -.grid-container{ - padding-top: 4em; - display: flex; - align-items: center; - flex-direction: column; - min-height: calc(100vh - 255px); -} -/*.grid-container h1.title{ - margin-bottom: 1em; - font-size: 24px; - padding: 0 .8em; - color: var(--pod-primary) !important; -} -.ui-jqgrid tr.jqgrow td{ - height: 30px; - white-space: normal; - padding: .5em; -} -.ui-state-default .ui-icon{ - background-image: url("/static/img/ui-icons_6da8d5_256x240.png"); -} -.ui-icon .ui-widget-content .ui-icon{ - background-image: url("/static/img/ui-icons_469bdd_256x240.png"); -} -.ui-state-default .ui-icon { - background-image: url("/static/img/ui-icons_6da8d5_256x240.png"); -} -ui-icon, .ui-widget-content .ui-icon { - background-image: url("/static/img/ui-icons_469bdd_256x240.png"); -}*/ - -/* Override jqgrid default css background-image */ -/*.ui-widget-content, -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default, -.ui-state-hover, -.ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus{ - background-image:none; -}*/ - - -/*.stat-form-group{ - display: flex; - justify-content: flex-start; - max-width: 755px; - align-items: center; -} -.stat-form-group .col-form-label{ - font-weight: 700; - color: var(--secondary); -} -.stat-form-group .col-form-label, -.stat-form-group .col-date{ - width: auto; - flex: none; - max-width: unset; -} -@media only screen and (max-width: 512px){ - .stat-form-group{ - flex-direction: column; - width: 100%; - } - .stat-form-group .col-date{ - width: calc(100% - 2em); - } -}*/ diff --git a/pod/video/static/js/filter_aside_video_list_refresh.js b/pod/video/static/js/filter_aside_video_list_refresh.js index 1ee5253b16..461194f418 100644 --- a/pod/video/static/js/filter_aside_video_list_refresh.js +++ b/pod/video/static/js/filter_aside_video_list_refresh.js @@ -1,11 +1,6 @@ var infinite; var checkedInputs = []; var listUser; -var sortDirectionChars = ["8600", "8599"]; -var sortDirectionTitle = [ - gettext("Descending sort"), - gettext("Ascending sort"), -]; let loader = document.querySelector(".lds-ring"); let infinite_loading = document.querySelector(".infinite-loading"); @@ -107,6 +102,15 @@ function refreshVideosSearch() { }); } +// Add trigger event to manage sort direction. +document + .getElementById("sort_direction_label") + .addEventListener("click", function (e) { + e.preventDefault(); + toggleSortDirection(); + refreshVideosSearch(); +}); + // Return url with filter and sort parameters function getUrlForRefresh() { let newUrl = window.location.pathname; @@ -208,38 +212,6 @@ document.getElementById("resetFilters").addEventListener("click", function () { refreshVideosSearch(); }); -// Add trigger event to manage sort direction -document - .getElementById("sort_direction_label") - .addEventListener("click", function (e) { - e.preventDefault(); - toggleSortDirection(); - refreshVideosSearch(); - }); - -// Update arrow char of ascending or descending sort order -function updateSortDirectionChar(sortDirectionAsc) { - document.getElementById("sort_direction_label").innerHTML = - "&#" + sortDirectionChars[+sortDirectionAsc].toString(); -} - -// Update title for input sort direction -function updateSortDirectionTitle(sortDirectionAsc) { - let newTitle = sortDirectionTitle[+sortDirectionAsc]; - document - .getElementById("sort_direction_label") - .setAttribute("title", newTitle); -} - -// Toggle direction of sort -function toggleSortDirection() { - document.getElementById("sort_direction").checked = - !document.getElementById("sort_direction").checked; - const direction = document.getElementById("sort_direction").checked; - updateSortDirectionChar(direction); - updateSortDirectionTitle(direction); -} - // Enable / Disable toggle inputs to prevent user actions during loading function disabledInputs(value) { document @@ -260,7 +232,7 @@ document .querySelectorAll("input[type=checkbox]:checked[class=form-check-input]") .forEach((e) => { checkedInputs.push(e); - }); +}); // First launch of the infinite scroll infinite = new InfiniteLoader( diff --git a/pod/video/static/js/video_stats_view.js b/pod/video/static/js/video_stats_view.js deleted file mode 100644 index 02a8e29ebf..0000000000 --- a/pod/video/static/js/video_stats_view.js +++ /dev/null @@ -1,102 +0,0 @@ -function linkedCell(cellValue, options, rowObject) { - return ( - "" + - cellValue + - "" - ); -} -$(() => { - let data_url = window.location.href; - $("#grid").jqGrid({ - url: data_url, - datatype: "json", - mtype: "POST", - styleUI: "Bootstrap5", - iconSet: "Bootstrap5", - colNames: [ - gettext("Title"), - gettext("View during the day"), - gettext("View during the month"), - gettext("View during the year"), - gettext("Total view from creation"), - gettext("Favorite additions during the day"), - gettext("Favorite additions during the month"), - gettext("Favorite additions during the year"), - gettext("Total favorite additions from creation"), - gettext("Slug"), - ], - colModel: [ - { - name: "title", - align: "center", - sortable: true, - sorttype: "text", - formatter: linkedCell, - }, - { name: "day", align: "center", sortable: true, sorttype: "int" }, - { name: "month", align: "center", sortable: true, sorttype: "int" }, - { name: "year", align: "center", sortable: true, sorttype: "int" }, - { - name: "since_created", - align: "center", - sortable: true, - sorttype: "int", - }, - { name: "fav_day", align: "center", sortable: true, sorttype: "int" }, - { name: "fav_month", align: "center", sortable: true, sorttype: "int" }, - { name: "fav_year", align: "center", sortable: true, sorttype: "int" }, - { - name: "fav_since_created", - align: "center", - sortable: true, - sorttype: "int", - }, - { - name: "slug", - align: "center", - sortable: true, - sorttype: "text", - hidden: true, - }, - ], - loadonce: true, - rowNum: 10, - rowList: [10, 15, 20, 25, 30, 50, 100], - gridview: true, - autoencode: true, - pager: "#pager", - sortorder: "asc", - beforeProcessing: function (data) { - // Set min date - let min_date = data.filter((obj) => { - return obj.min_date != undefined; - }); - // remove date_min in data - data.pop(); - document.querySelector("#jsperiode").min = min_date[0].min_date; - }, - postData: { - csrfmiddlewaretoken: $("[name=csrfmiddlewaretoken]").val(), - }, - }); - let today = new Date().toISOString().split("T")[0]; - $("#jsperiode").val(today); // set date input value to today - document.querySelector("#jsperiode").max = today; - - $("#jsperiode").on("change paste keyup", function (e) { - if ($(this).val() != undefined && $(this).val().trim() !== "") { - try { - let data = { periode: $(this).val() }; - $("#grid") - .jqGrid("setGridParam", { datatype: "json", postData: data }) - .trigger("reloadGrid"); - } catch (e) { - console.log(e); - } - } - }); -}); diff --git a/pod/video/templates/channel/channel.html b/pod/video/templates/channel/channel.html index c873d69776..7141bb2b00 100644 --- a/pod/video/templates/channel/channel.html +++ b/pod/video/templates/channel/channel.html @@ -56,11 +56,11 @@

    {% if parent_title %} {{parent_title}} {% else %} {{title}} {% endif %} - {% if USE_STATS_VIEW %} + {% if USE_STATS_VIEW %}{% comment "TODO STATS" %}{% endcomment %} {% if theme %} - {% trans 'Statistics views' %} + {% trans 'Theme statistics' %} {% else %} -  {% trans 'Statistics views' %} +  {% trans 'Channel statistics' %} {% endif %} {% endif %} {% if theme %} @@ -147,13 +147,13 @@

    {% if theme %} {% if USE_STATS_VIEW %} - {% trans 'Statistics views' %} + {% trans 'Theme statistics' %} {% endif %}  Video  Audio {% else %} {% if USE_STATS_VIEW %} - {% trans 'Statistics views' %} + {% trans 'Channel statistics' %} {% endif %}  Video  Audio diff --git a/pod/video/templates/videos/card.html b/pod/video/templates/videos/card.html index 3a420d2e5a..9bf2b2066c 100644 --- a/pod/video/templates/videos/card.html +++ b/pod/video/templates/videos/card.html @@ -1,6 +1,12 @@ {% load i18n %} +{% load playlist_buttons %} + {% spaceless %} -
    +{% if playlist %} + {% load playlist_buttons %} + {% can_see_playlist_video video as can_see_video %} +{% endif %} +
    @@ -34,17 +40,25 @@
    - + " + {% endif %} + > {{video.get_thumbnail_card|safe}}
    @@ -57,7 +71,17 @@ {% endif %} - {% if channel %} + {% if playlist %} + {% if can_see_video %} + 43 %}title="{{video.title|capfirst}}"{% endif %}> + {{video.title|capfirst|truncatechars:43}} + + {% else %} + 43 %}title="{{video.title|capfirst}}"{% endif %}> + {{video.title|capfirst|truncatechars:43}} + + {% endif %} + {% elif channel %} {% if theme %} 43 %}title="{{video.title|capfirst}}"{% endif %}> {{video.title|capfirst|truncatechars:43}} diff --git a/pod/video/templates/videos/link_video.html b/pod/video/templates/videos/link_video.html index 3296c97d93..726b205cb4 100644 --- a/pod/video/templates/videos/link_video.html +++ b/pod/video/templates/videos/link_video.html @@ -1,16 +1,31 @@ {% load i18n %} -{% load favorite_info %} +{% load favorites_playlist %} +{% load playlist_buttons %} + {% spaceless %} -{% is_favorite video as is_fav %} -{% if USE_FAVORITES and video.is_draft is False and not hide_favorite_link is True %} -
    - {% csrf_token %} - - -
    +{% if playlist %} + {% user_can_edit_or_remove playlist as can_edit_or_remove %} + {% if not in_favorites_playlist and can_edit_or_remove%} +     + + + {% endif %} +{% endif %} + +{% is_favorite user video as is_favorite %} +{% get_favorite_playlist user as fav_playlist %} +{% if USE_PLAYLIST and USE_FAVORITES and video.is_draft is False and not hide_favorite_link is True %} + {% if is_favorite %} + + + + {% else %} + + + + {% endif %} + {% endif %} {% if video.owner == request.user or request.user.is_superuser or request.user in video.additional_owners.all or perms.video.change_video %} diff --git a/pod/video/templates/videos/my_videos.html b/pod/video/templates/videos/my_videos.html index 8f4af9db8c..c0346900b3 100644 --- a/pod/video/templates/videos/my_videos.html +++ b/pod/video/templates/videos/my_videos.html @@ -54,7 +54,8 @@

    {% blocktrans count counter=count_ {% endif %} - + + {% if use_category %} - - + +{% if USE_PLAYLIST and USE_FAVORITES %} + + +{% endif %} @@ -82,8 +85,7 @@ {% endif %} {% if request.user.playlist_set.all %} - - + {% endif %} {% if video.is_360 %} diff --git a/pod/video/templates/videos/video-info.html b/pod/video/templates/videos/video-info.html index a943c1e107..6a6130bae0 100644 --- a/pod/video/templates/videos/video-info.html +++ b/pod/video/templates/videos/video-info.html @@ -3,7 +3,9 @@ {% load tagging_tags %} {% load thumbnail %} {% load video_tags %} -{% load favorite_info %} +{% load playlist_stats %} +{% load favorites_playlist %} +
    @@ -12,33 +14,52 @@
    {% trans 'Number of views' %} - {% if USE_STATS_VIEW and not video.encoding_in_progress %} + {% if USE_STATS_VIEW and not video.encoding_in_progress %} {{ video.get_viewcount }} {% else %} {{ video.get_viewcount }} {% endif %}
    - {% if USE_FAVORITES %} + {% if USE_PLAYLIST %} +
    + {% trans 'Addition in a playlist' %} + {% if USE_STATS_VIEW and not video.encoding_in_progress %} + {% get_count_video_added_in_playlist video %} + {% else %} + {% get_count_video_added_in_playlist video %} + {% endif %} +
    + {% endif %} + {% if USE_PLAYLIST and USE_FAVORITES %}
    {% trans 'Number of favorites' %} - {% if USE_STATS_VIEW and not video.encoding_in_progress %} - {% number_favorites video %} + {% if USE_STATS_VIEW and not video.encoding_in_progress %} + {% get_total_favorites_video video %} {% else %} - {% number_favorites video %} + {% get_total_favorites_video video %} {% endif %}
    {% endif %}
    - {% if user.is_authenticated and not video.is_draft %} - {% is_favorite video as is_fav %} - {% if USE_FAVORITES %} -
    - {% csrf_token %} - - -
    + {% if USE_PLAYLIST and user.is_authenticated and not video.is_draft %} + + {% include "playlist/playlist-list-modal.html" %} + + {% is_favorite user video as is_favorite %} + {% get_favorite_playlist user as fav_playlist %} + {% if USE_PLAYLIST and USE_FAVORITES and video.is_draft is False and not hide_favorite_link is True %} + {% if is_favorite %} + + + + {% else %} + + + + {% endif %} + {% endif %} {% endif %} {% if video.is_draft == False or video.owner == request.user or request.user in video.additional_owners.all %} @@ -268,7 +289,7 @@

    -{% if video.is_draft == False or video.owner == request.user or request.user in video.additional_owners.all%} +{% if video.is_draft == False or video.owner == request.user or request.user in video.additional_owners.all%}