[RELEASE] Pod 4.0.1

[RELEASE] Pod 4.0.1
* Fix some bugs (Aristote notify, Live truncate chars, Recorder max_length to 200, Migrate BBB recordings, Search: Display the right number of results)
* Bump Django to 4.2.24 to prevent SQL injection in FilteredRelation with column aliases
* Bump djangorestframework-simplejwt from 5.3.1 to 5.5.1

Author: Badatos

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 # Before sending your pull request, make sure the following are done
 
 * [ ] You have read our [contribution guidelines](https://github.com/EsupPortail/Esup-Pod/blob/master/CONTRIBUTING.md).
-* [ ] Your PR targets the `main` branch.
+* [ ] Your PR targets the `dev_v4` branch.
 * [ ] Your PR status is in `draft` if it's still a work in progress.

pod/ai_enhancement/utils.py

@@ -5,16 +5,17 @@
 import requests
 import logging
 from django.conf import settings
-from requests import Response
+from django.core.mail import EmailMultiAlternatives
+from django.core.mail import mail_managers
+from django.core.mail import send_mail
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from pod.ai_enhancement.models import AIEnhancement
 from pod.main.utils import extract_json_from_str
+from pod.progressive_web_app.utils import notify_user as pwa_notify_user
 from pod.video.models import Discipline, Video
+from requests import Response
 from webpush.models import PushInformation
-from django.core.mail import send_mail
-from django.core.mail import mail_managers
-from django.core.mail import EmailMultiAlternatives
 
 DEBUG = getattr(settings, "DEBUG", True)
 DEFAULT_FROM_EMAIL = getattr(settings, "DEFAULT_FROM_EMAIL", "[email protected]")
@@ -279,7 +280,7 @@ def send_notification_enhancement(video):
         "site_title": __TITLE_SITE__,
     }
 
-    notify_user(
+    pwa_notify_user(
         video.owner,
         subject,
         message,

pod/live/templates/live/event_card.html

@@ -57,13 +57,13 @@
         <a href="{{event.get_absolute_url}}
            {% if playlist %}?playlist={{playlist.slug}}{% endif %}"
            title="{% blocktrans with title=event.title %}See the event “{{ title }}”.{% endblocktrans %}">
-            {{event.title|capfirst|truncatechars:70}}
+            {{event.title|capfirst|truncatechars:55}}
         </a>
         </br>
         {% if event.start_date|date:"d/m/Y" == event.end_date|date:"d/m/Y" %}
-          {% blocktrans with start_date=event.start_date|date:"d/m/Y" start_time=event.start_date|time:"H:i" end_time=event.end_date|time:"H:i" %}The {{start_date}} from {{start_time}} to {{end_time}}{% endblocktrans %}
+          {% blocktrans with start_date=event.start_date|date:"d/m/y" start_time=event.start_date|time:"H:i" end_time=event.end_date|time:"H:i" %}The {{start_date}} from {{start_time}} to {{end_time}}{% endblocktrans %}
         {% else %}
-          {% blocktrans with start_date=event.start_date|date:"d/m/Y" end_date=event.end_date|date:"d/m/Y" %}from {{start_date}} to {{end_date}}{% endblocktrans %}
+          {% blocktrans with start_date=event.start_date|date:"d/m/y" end_date=event.end_date|date:"d/m/y" %}from {{start_date}} to {{end_date}}{% endblocktrans %}
         {% endif %}
         {% if display_broadcaster_name %}
           <br>{{event.broadcaster.name|capfirst|truncatechars:20}}

pod/recorder/models.py

@@ -387,6 +387,7 @@ class RecordingFileTreatment(models.Model):
         recursive=True,
         unique=True,
         help_text=_("Source file of the published video."),
+        max_length=200
     )
     file_size = models.BigIntegerField(_("File size"), default=0)
     recorder = models.ForeignKey(

pod/settings.py

@@ -19,7 +19,7 @@
 ##
 # Version of the project
 #
-VERSION = "4.0.0"
+VERSION = "4.0.1"
 
 ##
 # Installed applications list

pod/video/management/commands/migrate_bbb_recordings.py

@@ -4,7 +4,10 @@
 Typically, when moving from a local architecture to the
 French Ministry of Higher Education and Research (ESR) BBB architecture.
 
-More information on this module at: https://www.esup-portail.org/wiki/x/C4CFUQ
+This script can also be used to backup BBB recordings. For example, in the case of a
+backup of the BBB records of the ESR infrastructure, as they are only kept for one year.
+
+More information on this module at: https://esupportail.github.io/Esup-Pod/4.x/Installation/optional/bbb-infrastructure-migration-install_fr
 
 Reminder of constraints:
  - no use of Pod's old BBB module (this module will be phased out in the near future)
@@ -99,7 +102,6 @@
 from django.core.management.base import BaseCommand
 from django.template.defaultfilters import slugify
 from pod.import_video.utils import manage_download, parse_remote_file
-from pod.import_video.utils import manage_recording_url, check_url_exists
 from pod.import_video.models import ExternalRecording
 from pod.import_video.views import start_bbb_encode_presentation_and_move_to_destination
 from pod.meeting.models import Meeting
@@ -110,8 +112,6 @@
 # Moodle database engine (postgresql, mysql or None)
 MOODLE_DB_TYPE = None
 
-MOODLE_DB_TYPE = "postgresql"
-
 if MOODLE_DB_TYPE == "postgresql":
     # For PostgreSQL database #
     # Don't forget to run the following command the 1st time
@@ -487,7 +487,7 @@ def get_recording(recording) -> Generic_recording:
         # Not other format like "screenshare" or "podcast"
 
         # Check playback data
-        presentation_url, video_url = get_recording_urls()
+        presentation_url, video_url = get_recording_urls(recording, internal_meeting_id)
 
         # Define the result with the Generic_recording class
         generic_recording = Generic_recording(
@@ -556,13 +556,13 @@ def download_bbb_video_file(source_url: str, dest_file: str) -> None:
     session = requests.Session()
     # Download and parse the remote HTML file (BBB specific)
     video_file_add = parse_remote_file(session, source_url)
-    # Verify that video exists
-    source_video_url = manage_recording_url(source_url, video_file_add)
-    if check_url_exists(source_video_url):
+    try:
         # Download the video file
         source_video_url = manage_download(session, source_url, video_file_add, dest_file)
-    else:
-        print("Unable to download %s: video file doesn't exist." % source_url)
+        print("  > Video %s downloaded." % source_video_url)
+    except Exception as e:
+        err = ("Unable to download %s: %s. %s " % (source_url, str(e), traceback.format_exc()))
+        print(err)
 
 
 def process_recording_to_claim(options, generic_recording) -> None:

pod/video/views.py

@@ -358,7 +358,7 @@ def paginator(videos_list, page):
 def channel(request, slug_c, slug_t=None):
     channel = get_object_or_404(Channel, slug=slug_c, site=get_current_site(request))
     videos_list = get_available_videos().filter(channel=channel)
-    videos_list = sort_videos_list(videos_list, "date_added", "on")
+    videos_list = sort_videos_list(videos_list, "date_added")
     channel.video_count = videos_list.count()
 
     theme = None

pod/video_search/views.py

@@ -212,10 +212,10 @@ def search_videos(request):
 
     # add cursus and main_lang 'cursus', 'main_lang',
     bodysearch["aggs"]["cursus"] = {
-        "terms": {"field": "cursus", "size": 5, "order": {"_count": "desc"}}
+        "terms": {"field": "cursus.keyword", "size": 5, "order": {"_count": "desc"}}
     }
     bodysearch["aggs"]["main_lang"] = {
-        "terms": {"field": "main_lang", "size": 5, "order": {"_count": "desc"}}
+        "terms": {"field": "main_lang.keyword", "size": 5, "order": {"_count": "desc"}}
     }
 
     # if settings.DEBUG:
@@ -239,9 +239,8 @@ def search_videos(request):
     videos = Video.objects.filter(id__in=list_videos_id)
     num_result = 0
     # In case of desynchronization with Elasticsearch, this result could be false.
-    # num_result = result["hits"]["total"]["value"]
-    # With this code, the result is always correct
-    num_result = len(videos)
+    # So, don't forget to reindex if necessary
+    num_result = result["hits"]["total"]["value"]
     videos.has_next = ((page + 1) * size) < num_result
     videos.next_page_number = page + 1
 

requirements.txt

@@ -28,10 +28,10 @@ qrcode
 ralph-malph==5.0.1
 pydantic==2.10.2
 bleach==6.2.0
-pytubefix==8.12.0
+pytubefix==9.4.1
 django-redis-sessions
 paramiko~=3.5.0
-djangorestframework-simplejwt==5.3.1
+djangorestframework-simplejwt==5.5.1
 django-pwa==2.0.1
 django-webpush==0.3.6
 defusedxml==0.7.1