From 4b30f22b30f3526f674a92757fa75cddd73891a9 Mon Sep 17 00:00:00 2001 From: Olivier Bado Date: Wed, 17 May 2023 15:21:30 +0200 Subject: [PATCH 01/63] Remove the trailing slash on html single elements to remove a W3C warning (
, etc...) "Trailing slash on void elements has no effect and interacts badly with unquoted attribute values." --- .../templates/userpicture/userpicture.html | 4 +- pod/bbb/templates/bbb/list_meeting.html | 8 +-- pod/bbb/templates/bbb/live_card.html | 2 +- pod/bbb/templates/bbb/live_list_meeting.html | 8 +-- .../templates/bbb/live_publish_meeting.html | 6 +-- pod/bbb/templates/bbb/publish_meeting.html | 2 +- pod/chapter/static/js/chapters.js | 2 +- .../templates/chapter/form_chapter.html | 20 +++---- .../templates/chapter/list_chapter.html | 12 ++--- pod/chapter/templates/video_chapter.html | 6 +-- pod/completion/static/js/caption_maker.js | 2 +- .../contributor/form_contributor.html | 10 ++-- .../contributor/list_contributor.html | 12 ++--- .../templates/document/form_document.html | 10 ++-- .../templates/document/list_document.html | 12 ++--- .../templates/overlay/form_overlay.html | 10 ++-- .../templates/overlay/list_overlay.html | 12 ++--- .../templates/track/form_track.html | 10 ++-- .../templates/track/list_track.html | 24 ++++----- .../templates/video_caption_maker.html | 14 ++--- .../templates/video_completion.html | 22 ++++---- pod/cut/templates/video_cut.html | 4 +- .../templates/enrichment/edit_enrichment.html | 10 ++-- .../templates/enrichment/form_enrichment.html | 8 +-- .../enrichment/group_enrichment.html | 2 +- .../templates/enrichment/list_enrichment.html | 14 ++--- .../enrichment/video_enrichment.html | 8 +-- .../templates/favorite/favorite_videos.html | 14 ++--- pod/live/admin.py | 2 +- pod/live/templates/live/direct.html | 2 +- pod/live/templates/live/directs.html | 2 +- pod/live/templates/live/event-info.html | 20 +++---- pod/live/templates/live/event_card.html | 2 +- pod/live/templates/live/event_delete.html | 2 +- pod/live/templates/live/event_edit.html | 8 +-- .../templates/live/event_immediate_edit.html | 2 +- pod/live/templates/live/events.html | 2 +- pod/live/templates/live/filter_aside.html | 2 +- pod/live/templates/live/my_events.html | 2 +- pod/live/utils.py | 2 +- pod/live/views.py | 2 +- .../templates/lti_provider/assignment.html | 8 +-- .../commands/createconfiguration.py | 4 +- pod/main/static/js/main.js | 4 +- pod/main/templates/base.html | 18 +++---- pod/main/templates/contact_us.html | 2 +- pod/main/templates/flatpages/default.html | 14 ++--- pod/main/templates/navbar.html | 10 ++-- pod/main/templates/navbar_collapse.html | 2 +- pod/main/views.py | 4 +- .../templates/meeting/add_or_edit.html | 10 ++-- .../templates/meeting/meeting_card.html | 6 +-- .../templates/meeting/my_meetings.html | 2 +- pod/meeting/templates/meeting/recordings.html | 14 ++--- pod/meeting/views.py | 10 ++-- pod/playlist/static/js/playlist_player.js | 4 +- pod/playlist/templates/playlist.html | 8 +-- .../templates/playlist_player-iframe.html | 4 +- pod/podfile/static/podfile/js/filewidget.js | 26 ++++----- .../templates/podfile/customfilewidget.html | 4 +- .../templates/podfile/home_content.html | 12 ++--- .../templates/recorder/record_delete.html | 2 +- pod/recorder/views.py | 4 +- .../commands/check_obsolete_videos.py | 18 +++---- pod/video/management/commands/recorder.py | 48 ++++++++--------- pod/video/models.py | 4 +- pod/video/templates/channel/channel.html | 28 +++++----- pod/video/templates/channel/channel_edit.html | 4 +- pod/video/templates/channel/form_theme.html | 14 ++--- pod/video/templates/channel/list_theme.html | 12 ++--- pod/video/templates/channel/theme_edit.html | 10 ++-- pod/video/templates/videos/add_video.html | 4 +- .../templates/videos/change_video_owner.html | 12 ++--- pod/video/templates/videos/filter_aside.html | 4 +- pod/video/templates/videos/link_video.html | 4 +- pod/video/templates/videos/video-header.html | 6 +-- pod/video/templates/videos/video-iframe.html | 8 +-- pod/video/templates/videos/video-info.html | 30 +++++------ pod/video/templates/videos/video.html | 28 +++++----- .../templates/videos/video_collaborate.html | 4 +- pod/video/templates/videos/video_delete.html | 2 +- pod/video/templates/videos/video_edit.html | 8 +-- .../videos/video_note_comments_display.html | 54 +++++++++---------- .../templates/videos/video_note_display.html | 24 ++++----- pod/video/templates/videos/video_notes.html | 16 +++--- pod/video/templates/videos/videos.html | 14 ++--- pod/video/tests/test_stats_view.py | 12 ++--- pod/video/utils.py | 8 +-- pod/video_search/templates/search/search.html | 14 ++--- 89 files changed, 437 insertions(+), 443 deletions(-) diff --git a/pod/authentication/templates/userpicture/userpicture.html b/pod/authentication/templates/userpicture/userpicture.html index b80ff98484..b04ac623d3 100644 --- a/pod/authentication/templates/userpicture/userpicture.html +++ b/pod/authentication/templates/userpicture/userpicture.html @@ -40,10 +40,10 @@

{% trans "No record found"%}

{% trans 'There are no BigBlueButton records.'%}

{% else %}

{% blocktrans count counter=records.paginator.count %}{{ counter }} record found{% plural %}{{ counter }} records found{% endblocktrans %}

- {% trans "This is the list of the recorded BigBlueButton sessions for which you were moderator. This module allows you to create a video from a BigBlueButton presentation." %}
- {% trans "Shortly after the presentation is published, the corresponding video will appear in your videos." %}
+ {% trans "This is the list of the recorded BigBlueButton sessions for which you were moderator. This module allows you to create a video from a BigBlueButton presentation." %}
+ {% trans "Shortly after the presentation is published, the corresponding video will appear in your videos." %}
{% trans "Please note: a BigBlueButton presentation can be encoded by another moderator." %} {% trans "If such a case occurs, this information will be displayed directly in the list. You can then contact this user directly to ask him/her to share the video with you, or even to put you as additional owner of the video." %} -
+
{% include "bbb/record_list.html" %} {% endif %} diff --git a/pod/bbb/templates/bbb/live_card.html b/pod/bbb/templates/bbb/live_card.html index 7d116eabb9..f0bc97ed0a 100644 --- a/pod/bbb/templates/bbb/live_card.html +++ b/pod/bbb/templates/bbb/live_card.html @@ -11,7 +11,7 @@
{% if not record.live %} -
+
{% if not max_limit_reached %} {% trans "Perform a BigBlueButton live"%} diff --git a/pod/bbb/templates/bbb/live_list_meeting.html b/pod/bbb/templates/bbb/live_list_meeting.html index f419ec912e..3e7e8c9488 100644 --- a/pod/bbb/templates/bbb/live_list_meeting.html +++ b/pod/bbb/templates/bbb/live_list_meeting.html @@ -3,7 +3,7 @@ {% load static %} {% block page_extra_head %} - + @@ -26,9 +26,9 @@

{% blocktrans count counter=records.paginator.count %}{{ counter }} BigBlueB {% endif %} {% trans "This is the list of current BigBlueButton sessions for which you are moderator. This module allows you to make a live stream from this BigBlueButton session (useful if there are more than 100 users)." %} - {% trans "Remember to not use breakout rooms in this case and end the meeting once it is over." %}
- {% trans 'Shortly after clicking the "Perform a BigBlueButton live" button, and select the desired options, the live stream will be available to users on the Lives page.' %}
-
+ {% trans "Remember to not use breakout rooms in this case and end the meeting once it is over." %}
+ {% trans 'Shortly after clicking the "Perform a BigBlueButton live" button, and select the desired options, the live stream will be available to users on the Lives page.' %}
+
{% if records.paginator.count == 0 %}

{% trans 'There are no BigBlueButton sessions in progress.'%}

diff --git a/pod/bbb/templates/bbb/live_publish_meeting.html b/pod/bbb/templates/bbb/live_publish_meeting.html index dc8389391a..614a29f32f 100644 --- a/pod/bbb/templates/bbb/live_publish_meeting.html +++ b/pod/bbb/templates/bbb/live_publish_meeting.html @@ -36,7 +36,7 @@

{% trans "Are you sure you want to perform a BigBlueButton live?" %}

{% csrf_token %}
- {% trans 'Select the desired options than validate this form by clicking "Perform a BigBlueButton live".' %}
+ {% trans 'Select the desired options than validate this form by clicking "Perform a BigBlueButton live".' %}

{% trans "This live will be stopped automatically when BigBlueButton session ends." %}

@@ -77,7 +77,7 @@

{% trans "Are you sure you want to perform a BigBlueButton live?" %}

{% endspaceless %} {% endfor %} - {% trans 'Please note: shortly after clicking the "Perform a BigBlueButton live" button, the live stream will be available to users on the Lives page.' %}
+ {% trans 'Please note: shortly after clicking the "Perform a BigBlueButton live" button, the live stream will be available to users on the Lives page.' %}
@@ -86,11 +86,9 @@

{% trans "Are you sure you want to perform a BigBlueButton live?" %}

{% endblock page_content %} {% block collapse_page_aside %} - {% endblock collapse_page_aside %} {% block page_aside %} - {% endblock page_aside %} {% block more_script %} diff --git a/pod/bbb/templates/bbb/publish_meeting.html b/pod/bbb/templates/bbb/publish_meeting.html index 87a2992fab..65f4c8627f 100644 --- a/pod/bbb/templates/bbb/publish_meeting.html +++ b/pod/bbb/templates/bbb/publish_meeting.html @@ -69,7 +69,7 @@

{% trans "Are you sure you want to publish this BigBlueButton presentation?" {% endspaceless %} {% endfor %} - {% trans "A video will be created from the BigBlueButton presentation and will be available on this platform." %}
+ {% trans "A video will be created from the BigBlueButton presentation and will be available on this platform." %}
{% trans "Please note: this treatment can take a long time. You will receive an email when this treatment is completed." %}

diff --git a/pod/chapter/static/js/chapters.js b/pod/chapter/static/js/chapters.js index 305c0a1112..75a97e813f 100644 --- a/pod/chapter/static/js/chapters.js +++ b/pod/chapter/static/js/chapters.js @@ -274,7 +274,7 @@ function overlaptest() { li.getAttribute("data-title") + '" ' + gettext("starts at the same time."); - msg += "
" + text; + msg += "
" + text; } }); return msg; diff --git a/pod/chapter/templates/chapter/form_chapter.html b/pod/chapter/templates/chapter/form_chapter.html index 0e07964cfc..978c25f37e 100644 --- a/pod/chapter/templates/chapter/form_chapter.html +++ b/pod/chapter/templates/chapter/form_chapter.html @@ -10,9 +10,9 @@

{% trans 'Create / Edit chapters' %}

{% csrf_token %}
{% if form_chapter.errors or form_chapter.non_field_errors %} - {% trans 'One or more errors have been found in the form:' %}
+ {% trans 'One or more errors have been found in the form:' %}
{% for error in form_chapter.non_field_errors %} - - {{error}}
+ - {{error}}
{% endfor %} {% endif %} {% for field_hidden in form_chapter.hidden_fields %} @@ -25,12 +25,12 @@

{% trans 'Create / Edit chapters' %}

{% endfor %} {% if form_chapter.instance %} - + {% endif %} - +
- - + +
@@ -43,9 +43,9 @@

{% trans 'Import chapters' %}

{% csrf_token %}
{% if form_import.errors or form_import.non_field_errors %} - {% trans 'One or more errors have been found in the form:' %}
+ {% trans 'One or more errors have been found in the form:' %}
{% for error in form_import.non_field_errors %} - - {{error}}
+ - {{error}}
{% endfor %} {% endif %} {% for field_hidden in form_import.hidden_fields %} @@ -62,10 +62,10 @@

{% trans 'Import chapters' %}

{% endfor %} {% endfor %} - + {% trans 'The file must be in VTT format.' %}
- +
diff --git a/pod/chapter/templates/chapter/list_chapter.html b/pod/chapter/templates/chapter/list_chapter.html index 873d2fb547..9f319ad3ae 100644 --- a/pod/chapter/templates/chapter/list_chapter.html +++ b/pod/chapter/templates/chapter/list_chapter.html @@ -22,15 +22,15 @@

{% trans 'List of chapters' %} ({
{% csrf_token %} - - - + + +
{% csrf_token %} - - - + + +
diff --git a/pod/chapter/templates/video_chapter.html b/pod/chapter/templates/video_chapter.html index 6b99317eae..8cd60f2d28 100644 --- a/pod/chapter/templates/video_chapter.html +++ b/pod/chapter/templates/video_chapter.html @@ -27,7 +27,7 @@ {% include 'videos/video-element.html' %} -
+
@@ -46,8 +46,8 @@ {% if not form_chapter %}
{% csrf_token %} - - + +
{% endif %}
diff --git a/pod/completion/static/js/caption_maker.js b/pod/completion/static/js/caption_maker.js index 454527ef47..3500845f52 100644 --- a/pod/completion/static/js/caption_maker.js +++ b/pod/completion/static/js/caption_maker.js @@ -161,7 +161,7 @@ const send_form_save_captions = function () { gettext("error during exchange") + "(" + error + - ")
" + + ")
" + gettext("no data could be stored."), "alert-danger" ); diff --git a/pod/completion/templates/contributor/form_contributor.html b/pod/completion/templates/contributor/form_contributor.html index cec75b0d52..52b73901a0 100644 --- a/pod/completion/templates/contributor/form_contributor.html +++ b/pod/completion/templates/contributor/form_contributor.html @@ -5,9 +5,9 @@ {% csrf_token %}
{% if form_contributor.errors or form_contributor.non_field_errors %} - {% trans 'Your form contains errors:' %}
+ {% trans 'Your form contains errors:' %}
{% for error in form_contributor.non_field_errors %} - - {{error}}
+ - {{error}}
{% endfor %} {% endif %} {% for field_hidden in form_contributor.hidden_fields %} @@ -22,10 +22,10 @@ {% if form_contributor.instance %} {% endif %} - +
- - + +
diff --git a/pod/completion/templates/contributor/list_contributor.html b/pod/completion/templates/contributor/list_contributor.html index 91206dde0f..d05172f978 100644 --- a/pod/completion/templates/contributor/list_contributor.html +++ b/pod/completion/templates/contributor/list_contributor.html @@ -24,15 +24,15 @@

{% trans 'List of contributors' %} (
{% csrf_token %} - - - + + +
{% csrf_token %} - - - + + +
diff --git a/pod/completion/templates/document/form_document.html b/pod/completion/templates/document/form_document.html index 319e38ac46..8016c0fbff 100644 --- a/pod/completion/templates/document/form_document.html +++ b/pod/completion/templates/document/form_document.html @@ -6,9 +6,9 @@ {% csrf_token %}
{% if form_document.errors or form_document.non_field_errors %} - {% trans 'Your form contains errors:' %}
+ {% trans 'Your form contains errors:' %}
{% for error in form_document.non_field_errors %} - - {{error}}
+ - {{error}}
{% endfor %} {% endif %} {% for field_hidden in form_document.hidden_fields %} @@ -20,10 +20,10 @@
{{field}}
{% endfor %} - +
- - + +

diff --git a/pod/completion/templates/document/list_document.html b/pod/completion/templates/document/list_document.html index db57d9af52..8f358c55d4 100644 --- a/pod/completion/templates/document/list_document.html +++ b/pod/completion/templates/document/list_document.html @@ -18,15 +18,15 @@

{% trans 'List of additional resources' %
{% csrf_token %} - - - + + +
{% csrf_token %} - - - + + +
diff --git a/pod/completion/templates/overlay/form_overlay.html b/pod/completion/templates/overlay/form_overlay.html index 1e51a207f6..bf7109db38 100644 --- a/pod/completion/templates/overlay/form_overlay.html +++ b/pod/completion/templates/overlay/form_overlay.html @@ -6,9 +6,9 @@
{% if form_overlay.errors or form_overlay.non_field_errors %}
- {% trans 'Your form contains errors:' %}
+ {% trans 'Your form contains errors:' %}
{% for error in form_overlay.non_field_errors %} - - {{error}}
+ - {{error}}
{% endfor %}
{% endif %} @@ -24,9 +24,9 @@ {% if form_overlay.instance %} {% endif %} - - - + + +

diff --git a/pod/completion/templates/overlay/list_overlay.html b/pod/completion/templates/overlay/list_overlay.html index a5f2652261..7224481e07 100644 --- a/pod/completion/templates/overlay/list_overlay.html +++ b/pod/completion/templates/overlay/list_overlay.html @@ -24,15 +24,15 @@

{% trans 'List of overlays' %} ({{li
{% csrf_token %} - - - + + +
{% csrf_token %} - - - + + +
diff --git a/pod/completion/templates/track/form_track.html b/pod/completion/templates/track/form_track.html index 96ccfbd451..6c5b5e35c7 100644 --- a/pod/completion/templates/track/form_track.html +++ b/pod/completion/templates/track/form_track.html @@ -6,9 +6,9 @@ {% csrf_token %}
{% if form_track.errors or form_track.non_field_errors %} - {% trans 'Your form contains errors:' %}
+ {% trans 'Your form contains errors:' %}
{% for error in form_track.non_field_errors %} - - {{error}}
+ - {{error}}
{% endfor %} {% endif %} {% for field_hidden in form_track.hidden_fields %} @@ -23,9 +23,9 @@ {% if form_track.instance %} {% endif %} - - - + + +
{{form_track.media}} diff --git a/pod/completion/templates/track/list_track.html b/pod/completion/templates/track/list_track.html index 94f62f1720..0042119bdc 100644 --- a/pod/completion/templates/track/list_track.html +++ b/pod/completion/templates/track/list_track.html @@ -16,16 +16,16 @@

{% trans 'List of subtitle or caption fil
{% csrf_token %} - - - + + +
{% trans 'Modify' %}
{% csrf_token %} - - - + + +
- {% if active_model_enrich %} {% trans 'Enrich Model' %} {% endif %} + {% if active_model_enrich %} {% trans 'Enrich Model' %} {% endif %}
diff --git a/pod/completion/templates/video_completion.html b/pod/completion/templates/video_completion.html index 9f8a939186..73304d9f92 100644 --- a/pod/completion/templates/video_completion.html +++ b/pod/completion/templates/video_completion.html @@ -6,7 +6,7 @@ {% block page_extra_head %} - + {% endblock page_extra_head %} {% block breadcrumbs %} @@ -41,8 +41,8 @@
{% csrf_token %} - - + +
  @@ -66,8 +66,8 @@
{% csrf_token %} - - + + {% trans 'The file must be in VTT format.' %}
@@ -90,8 +90,8 @@
{% csrf_token %} - - + +
  @@ -112,8 +112,8 @@
{% csrf_token %} - - + +
  @@ -154,10 +154,10 @@

{% trans "Help"%}

{% trans 'You will need the URL of this video to make subtitles and/or captions. This URL is a direct access to this video. Please do not communicate it outside of this site to avoid any misuse.' %}

diff --git a/pod/cut/templates/video_cut.html b/pod/cut/templates/video_cut.html index cdb59c2987..22abace6be 100644 --- a/pod/cut/templates/video_cut.html +++ b/pod/cut/templates/video_cut.html @@ -22,7 +22,7 @@ -
  • +
  • {% trans 'Cut the video' %}
    • @@ -67,7 +67,7 @@  {% trans 'Reset' %} -
    +
    diff --git a/pod/enrichment/templates/enrichment/edit_enrichment.html b/pod/enrichment/templates/enrichment/edit_enrichment.html index b2411b8898..85ad9c56f9 100644 --- a/pod/enrichment/templates/enrichment/edit_enrichment.html +++ b/pod/enrichment/templates/enrichment/edit_enrichment.html @@ -4,7 +4,7 @@ +> - + {{form.media}} {% endblock more_script %} diff --git a/pod/enrichment/templates/enrichment/list_enrichment.html b/pod/enrichment/templates/enrichment/list_enrichment.html index 6194c0a9d0..185d7c1ca2 100644 --- a/pod/enrichment/templates/enrichment/list_enrichment.html +++ b/pod/enrichment/templates/enrichment/list_enrichment.html @@ -24,19 +24,19 @@

    {% trans 'List of the enrichments' %}&nbs
    {% csrf_token %} - - - + + +
    {% csrf_token %} - - - + + +
    {% endfor %} -

    \ No newline at end of file +
    diff --git a/pod/enrichment/templates/enrichment/video_enrichment.html b/pod/enrichment/templates/enrichment/video_enrichment.html index e962e9873a..8ac576c6ed 100644 --- a/pod/enrichment/templates/enrichment/video_enrichment.html +++ b/pod/enrichment/templates/enrichment/video_enrichment.html @@ -6,8 +6,8 @@ {% block opengraph %} {% if OEMBED %} - - + + {% endif %} @@ -16,8 +16,8 @@ - - + + diff --git a/pod/favorite/templates/favorite/favorite_videos.html b/pod/favorite/templates/favorite/favorite_videos.html index 0b10990d48..6768184c48 100644 --- a/pod/favorite/templates/favorite/favorite_videos.html +++ b/pod/favorite/templates/favorite/favorite_videos.html @@ -3,14 +3,14 @@ {% load static %} {% block opengraph %}{% load video_filters %} - + - - - - - - + + + + + + {% endblock %} {% block page_extra_head %} diff --git a/pod/live/admin.py b/pod/live/admin.py index 5d33680b98..2f6f8682a2 100644 --- a/pod/live/admin.py +++ b/pod/live/admin.py @@ -221,7 +221,7 @@ def get_thumbnail_admin(self, instance): thumbnail_url = static(DEFAULT_EVENT_THUMBNAIL) return format_html( '%s' + 'src="%s" alt="%s" loading="lazy">' % ( thumbnail_url, instance.title.replace("{", "").replace("}", "").replace('"', "'"), diff --git a/pod/live/templates/live/direct.html b/pod/live/templates/live/direct.html index 0088caace6..82e8158d60 100644 --- a/pod/live/templates/live/direct.html +++ b/pod/live/templates/live/direct.html @@ -119,7 +119,7 @@

    {% trans 'Headband' %} {{ broadcaster.building.name }} + loading="lazy">

    {% endif %} {% for otherbroadcaster in broadcaster.building.broadcaster_set.all %} diff --git a/pod/live/templates/live/directs.html b/pod/live/templates/live/directs.html index c55f4c6308..177f0b4de8 100644 --- a/pod/live/templates/live/directs.html +++ b/pod/live/templates/live/directs.html @@ -17,7 +17,7 @@ {% block page_content %}

     {{building.name}}

    {% if building.headband %} -{{building.name}} +{{building.name}} {% endif %}
    diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html index c08d893b23..581885a125 100644 --- a/pod/live/templates/live/event-info.html +++ b/pod/live/templates/live/event-info.html @@ -7,7 +7,7 @@ {% if event.description %}

     {% trans 'Summary' %}

    -
    +

    {{ event.description|safe }}

    {% endif %} @@ -20,7 +20,7 @@

     {% trans 'Summary' %} - +

    • {% trans 'Broadcasted on:' %}

      @@ -70,7 +70,7 @@
    -
    +
    {% endif %}
     {% trans 'Share the link' %}
    - +
    -

    - - - + + + + {% endif %} diff --git a/pod/live/templates/live/event_card.html b/pod/live/templates/live/event_card.html index 969cdb94fa..d9fa4ed7f3 100644 --- a/pod/live/templates/live/event_card.html +++ b/pod/live/templates/live/event_card.html @@ -68,7 +68,7 @@ {% blocktrans with start_date=event.start_date end_date=event.end_date %}from {{start_date}} to {{end_date}}{% endblocktrans %} {% endif %} {% if display_broadcaster_name %} -
    {{event.broadcaster.name|capfirst|truncatechars:20}} +
    {{event.broadcaster.name|capfirst|truncatechars:20}} {% endif %}

    diff --git a/pod/live/templates/live/event_delete.html b/pod/live/templates/live/event_delete.html index 5897d13b32..c3b180bd21 100644 --- a/pod/live/templates/live/event_delete.html +++ b/pod/live/templates/live/event_delete.html @@ -53,7 +53,7 @@

    {% blocktrans with vtitle=event.title %}Deleting the event "{{ vtitle }}"{% {% else %} {% if "form-control-file" in field.field.widget.attrs.class and form.instance.event %} -
    {% endif %} +
    {% endif %} {{ field }} {% endif %} {% if field.help_text %} diff --git a/pod/live/templates/live/event_edit.html b/pod/live/templates/live/event_edit.html index 5d117bb444..2877239528 100644 --- a/pod/live/templates/live/event_edit.html +++ b/pod/live/templates/live/event_edit.html @@ -3,7 +3,7 @@ {% load static %} {% block more_style %} - + {% endblock %} diff --git a/pod/live/templates/live/events.html b/pod/live/templates/live/events.html index d20a8286c5..3cf8eab40e 100644 --- a/pod/live/templates/live/events.html +++ b/pod/live/templates/live/events.html @@ -3,7 +3,7 @@ {% load static %} {% block more_style %} - + {% endblock more_style %} {% block breadcrumbs %}{{ block.super }}
  • {% trans "Events" %}
    • {% endblock %} diff --git a/pod/live/templates/live/filter_aside.html b/pod/live/templates/live/filter_aside.html index 25ad77887e..32961dd469 100644 --- a/pod/live/templates/live/filter_aside.html +++ b/pod/live/templates/live/filter_aside.html @@ -26,7 +26,7 @@

    {% if type.icon %} {{ type.title }} + loading="lazy"> {% else %} {% endif %} diff --git a/pod/live/templates/live/my_events.html b/pod/live/templates/live/my_events.html index f21709a5b1..cfb422a856 100644 --- a/pod/live/templates/live/my_events.html +++ b/pod/live/templates/live/my_events.html @@ -3,7 +3,7 @@ {% load static %} {% block more_style %} - + {% endblock more_style %} {% block breadcrumbs %}{{ block.super }} diff --git a/pod/live/utils.py b/pod/live/utils.py index b1f37afd6f..3ee1775e15 100644 --- a/pod/live/utils.py +++ b/pod/live/utils.py @@ -138,7 +138,7 @@ def send_establishment(event, subject, message, from_email, to_email, html_messa def send_managers(owner, subject, full_message, fail, html_message): - full_html_message = html_message + "
    %s%s" % ( + full_html_message = html_message + "
    %s%s" % ( _("Post by:"), owner, ) diff --git a/pod/live/views.py b/pod/live/views.py index 3776ddb50a..74a524dbb2 100644 --- a/pod/live/views.py +++ b/pod/live/views.py @@ -914,7 +914,7 @@ def event_video_transform(event_id, current_file, segment_number): video=dest_path, title=live_event.title + segment, owner=live_event.owner, - description=live_event.description + "
    " + adding_description, + description=live_event.description + "
    " + adding_description, is_draft=live_event.is_draft, type=live_event.type, ) diff --git a/pod/lti/templates/lti_provider/assignment.html b/pod/lti/templates/lti_provider/assignment.html index c7d56d795a..0748a698bd 100644 --- a/pod/lti/templates/lti_provider/assignment.html +++ b/pod/lti/templates/lti_provider/assignment.html @@ -43,15 +43,15 @@

    Logged In

    {{course_title}}

    Assignment #{{number}}

    video: {{iframe_url}}

    -
    +
    {% if not is_student %}

    Instructors cannot submit an assignment

    {% else %}
    - - - + + +
    {% endif %} diff --git a/pod/main/management/commands/createconfiguration.py b/pod/main/management/commands/createconfiguration.py index 224fdbb584..b92a028814 100644 --- a/pod/main/management/commands/createconfiguration.py +++ b/pod/main/management/commands/createconfiguration.py @@ -50,7 +50,7 @@ def get_information(self): msg += "\n## %s \n" % self.data[0]["information"]["title"][self.language] for line in self.data[0]["information"]["description"][self.language]: if line != "": - msg += "\n%s
    " % line + msg += "\n%s
    " % line else: msg += "\n" msg += self.get_settings(self.data[0]["information"]["settings"]) @@ -66,7 +66,7 @@ def get_configuration(self, app): msg += "\n\n### %s" % desc["title"][self.language] for line in desc["description"].get(self.language, []): if line != "": - msg += "\n%s
    " % line + msg += "\n%s
    " % line else: msg += "\n" msg += self.get_settings(desc["settings"]) diff --git a/pod/main/static/js/main.js b/pod/main/static/js/main.js index dccbbc4e77..a8c6027eca 100644 --- a/pod/main/static/js/main.js +++ b/pod/main/static/js/main.js @@ -724,7 +724,7 @@ var send_form_data = async function ( gettext("Error during exchange") + "(" + error + - ")
    " + + ")
    " + gettext("No data could be stored."), "alert-danger" ); @@ -786,7 +786,7 @@ var send_form_data_vanilla = function ( gettext("Error during exchange") + " (" + err + - ")
    " + + ")
    " + gettext("No data could be stored."), "alert-danger" ); diff --git a/pod/main/templates/base.html b/pod/main/templates/base.html index d668fb805e..9b5a05488f 100644 --- a/pod/main/templates/base.html +++ b/pod/main/templates/base.html @@ -5,17 +5,17 @@ {% spaceless %} - + {% block opengraph %} - - - - - - + + + + + + {% endblock %} {% if FAVICON %} @@ -35,7 +35,7 @@ {% endif %} {% if SHOW_EVENTS_ON_HOMEPAGE and "live" in THIRD_PARTY_APPS %} - + {% endif %} {% block more_style %} @@ -142,7 +142,7 @@

    {{page_title|capfirst}}

    - + {% trans 'We use third party cookies to personalize content, manage session and analyze site traffic.' %} {% if COOKIE_LEARN_MORE != "" %} {% trans 'Learn more' %} diff --git a/pod/main/templates/contact_us.html b/pod/main/templates/contact_us.html index 125e26e6d5..63eccd03ca 100644 --- a/pod/main/templates/contact_us.html +++ b/pod/main/templates/contact_us.html @@ -34,7 +34,7 @@
    {% else %} - {% if "form-control-file" in field.field.widget.attrs.class and form.instance.video %}
    {% endif %} + {% if "form-control-file" in field.field.widget.attrs.class and form.instance.video %}
    {% endif %} {{ field }} {% endif %} {% if field.help_text %} diff --git a/pod/main/templates/flatpages/default.html b/pod/main/templates/flatpages/default.html index c4dd12b9d4..85834e5065 100644 --- a/pod/main/templates/flatpages/default.html +++ b/pod/main/templates/flatpages/default.html @@ -1,14 +1,14 @@ {% extends 'base.html' %} {% block opengraph %}{% load video_filters static %} - + - - - - - - + + + + + + {% endblock %} diff --git a/pod/main/templates/navbar.html b/pod/main/templates/navbar.html index 8ccc80a222..2bbf12f065 100644 --- a/pod/main/templates/navbar.html +++ b/pod/main/templates/navbar.html @@ -17,7 +17,7 @@ - {{ TITLE_SITE }} + {{ TITLE_SITE }}
    @@ -73,7 +73,7 @@
    Menu
    {% if user.is_authenticated %} {% if MAINTENANCE_MODE %}
  • - {{MAINTENANCE_REASON}}
    {% trans "Some features are unavailable" %}     + {{MAINTENANCE_REASON}}
    {% trans "Some features are unavailable" %}
    • {% else %} {% show_video_buttons as video_buttons %} @@ -133,7 +133,7 @@
    {% trans 'Configuration'%}
    {% endif %} diff --git a/pod/video/templates/videos/video.html b/pod/video/templates/videos/video.html index 7ce65fdc85..2462915bee 100644 --- a/pod/video/templates/videos/video.html +++ b/pod/video/templates/videos/video.html @@ -9,8 +9,8 @@ {% block opengraph %} {% if OEMBED %} - - + + {% endif %} @@ -19,8 +19,8 @@ - - + + @@ -89,21 +89,21 @@
    - + {# uploadDate doit être au format 'c' - ISO 8601 (yyyy-mm-dd) #} - - - - - - - + + + + + + + {% if channel %}

    {% if channel.headband %} - {% trans 'Headband' %} {{ channel.title }} + {% trans 'Headband' %} {{ channel.title }} {% endif %} {{channel.title}} @@ -134,7 +134,7 @@

    {% if theme.headband %} - {% trans 'Headband' %} {{ theme.title }} + {% trans 'Headband' %} {{ theme.title }} {% endif %} {{theme.title}} diff --git a/pod/video/templates/videos/video_collaborate.html b/pod/video/templates/videos/video_collaborate.html index 7485ec288a..6e3f6cc396 100644 --- a/pod/video/templates/videos/video_collaborate.html +++ b/pod/video/templates/videos/video_collaborate.html @@ -56,8 +56,8 @@

    {% trans "Video Collaborate" %}

    {% trans "Tricks" %} :
    -

    {% trans "Start the video than click the + icon to write a comment at the choosen time. Video will be paused." %}
    - {% trans "Click on comment's timecode to go at this time in the video." %}
    +

    {% trans "Start the video than click the + icon to write a comment at the choosen time. Video will be paused." %}
    + {% trans "Click on comment's timecode to go at this time in the video." %}
    {% trans "Black notes are public. The clearest are private. The intermediary is visible to the owner of the video." %}

    diff --git a/pod/video/templates/videos/video_delete.html b/pod/video/templates/videos/video_delete.html index 7e8318cba9..9192005e49 100644 --- a/pod/video/templates/videos/video_delete.html +++ b/pod/video/templates/videos/video_delete.html @@ -40,7 +40,7 @@
    {% else %} - {% if "form-control-file" in field.field.widget.attrs.class and form.instance.video %}
    {% endif %} + {% if "form-control-file" in field.field.widget.attrs.class and form.instance.video %}
    {% endif %} {{ field }} {% endif %} {% if field.help_text %} diff --git a/pod/video/templates/videos/video_edit.html b/pod/video/templates/videos/video_edit.html index afe9459196..c0df6a503f 100644 --- a/pod/video/templates/videos/video_edit.html +++ b/pod/video/templates/videos/video_edit.html @@ -101,7 +101,7 @@

    {% else %} {% endif %} - {% if "form-control-file" in field.field.widget.attrs.class and form.instance.video %}
    {% endif %} + {% if "form-control-file" in field.field.widget.attrs.class and form.instance.video %}
    {% endif %} {{ field }} {% endif %} {% if field.help_text %} @@ -127,7 +127,7 @@

    {% endif %} - +
    {% endfor %} @@ -183,7 +183,7 @@

    {% trans 'Embed/Share
    - +
    @@ -238,7 +238,7 @@

    {% trans "Help for fo - + {{form.media}} - + {{ form.media }} From 0a6d8481d6f3a29031548bf3f4e984dea3543dc8 Mon Sep 17 00:00:00 2001 From: mattbild Date: Mon, 22 May 2023 11:13:25 +0200 Subject: [PATCH 02/63] =?UTF-8?q?refacto=20sans=20modif=20de=20fonctionnal?= =?UTF-8?q?it=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pod/live/pilotingInterface.py | 50 +++++---- pod/live/templates/live/event-script.html | 30 +++--- pod/live/tests/test_utils.py | 123 +++++++++++++++++++++- pod/live/tests/test_views.py | 17 +-- pod/live/utils.py | 90 +++++++++++++--- pod/live/views.py | 106 ++++++------------- 6 files changed, 281 insertions(+), 135 deletions(-) diff --git a/pod/live/pilotingInterface.py b/pod/live/pilotingInterface.py index ea87ae117f..2a183bf0c0 100644 --- a/pod/live/pilotingInterface.py +++ b/pod/live/pilotingInterface.py @@ -3,18 +3,20 @@ import logging import os import re +import requests + from abc import ABC as __ABC__, abstractmethod +from datetime import timedelta from typing import Optional - -import requests from django.conf import settings from .models import Broadcaster __EXISTING_BROADCASTER_IMPLEMENTATIONS__ = ["Wowza"] + DEFAULT_EVENT_PATH = getattr(settings, "DEFAULT_EVENT_PATH", "") -logger = logging.getLogger("pod.live") +logger = logging.getLogger(__name__) class PilotingInterface(__ABC__): @@ -64,6 +66,11 @@ def get_info_current_record(self) -> dict: """Get info of current record""" raise NotImplementedError + @abstractmethod + def copy_file_to_pod_dir(self, filename) -> bool: + """Copy the file from remote server to pod server""" + raise NotImplementedError + def get_piloting_implementation(broadcaster) -> Optional[PilotingInterface]: logger.debug("get_piloting_implementation") @@ -103,10 +110,10 @@ def get_piloting_implementation(broadcaster) -> Optional[PilotingInterface]: def is_recording_launched_by_pod(self) -> bool: - # Récupération du fichier associé à l'enregistrement du broadcaster + # Récupération du fichier associé à l'enregistrement current_record_info = self.get_info_current_record() if not current_record_info.get("currentFile"): - logging.error(" ... impossible to get recording file name") + logger.error(" ... impossible to get recording file name") return False filename = current_record_info.get("currentFile") @@ -114,7 +121,7 @@ def is_recording_launched_by_pod(self) -> bool: # Vérification qu'il existe bien pour cette instance ce Pod if not os.path.exists(full_file_name): - logging.debug(" ... is not on this POD recording filesystem : " + full_file_name) + logger.debug(" ... is not on this POD recording filesystem : " + full_file_name) return False return True @@ -134,10 +141,10 @@ def __init__(self, broadcaster: Broadcaster): ) def check_piloting_conf(self) -> bool: - logging.debug("Wowza - Check piloting conf") + logger.debug("Wowza - Check piloting conf") conf = self.broadcaster.piloting_conf if not conf: - logging.error( + logger.error( "'piloting_conf' value is not set for '" + self.broadcaster.name + "' broadcaster." @@ -146,14 +153,14 @@ def check_piloting_conf(self) -> bool: try: decoded = json.loads(conf) except Exception: - logging.error( + logger.error( "'piloting_conf' has not a valid Json format for '" + self.broadcaster.name + "' broadcaster." ) return False if not {"server_url", "application", "livestream"} <= decoded.keys(): - logging.error( + logger.error( "'piloting_conf' format value for '" + self.broadcaster.name + "' broadcaster must be like : " @@ -161,11 +168,11 @@ def check_piloting_conf(self) -> bool: ) return False - logging.debug("->piloting conf OK") + logger.debug("->piloting conf OK") return True def is_available_to_record(self) -> bool: - logging.debug("Wowza - Check availability") + logger.debug("Wowza - Check availability") json_conf = self.broadcaster.piloting_conf conf = json.loads(json_conf) url_state_live_stream_recording = ( @@ -187,7 +194,7 @@ def is_available_to_record(self) -> bool: return False def is_recording(self, with_file_check=False) -> bool: - logging.debug("Wowza - Check if is being recorded") + logger.debug("Wowza - Check if is being recorded") json_conf = self.broadcaster.piloting_conf conf = json.loads(json_conf) url_state_live_stream_recording = ( @@ -212,7 +219,7 @@ def is_recording(self, with_file_check=False) -> bool: return True def start(self, event_id=None, login=None) -> bool: - logging.debug("Wowza - Start record") + logger.debug("Wowza - Start record") json_conf = self.broadcaster.piloting_conf conf = json.loads(json_conf) url_start_record = ( @@ -267,7 +274,7 @@ def start(self, event_id=None, login=None) -> bool: return False def split(self) -> bool: - logging.debug("Wowza - Split record") + logger.debug("Wowza - Split record") json_conf = self.broadcaster.piloting_conf conf = json.loads(json_conf) url_split_record = ( @@ -288,7 +295,7 @@ def split(self) -> bool: return False def stop(self) -> bool: - logging.debug("Wowza - Stop_record") + logger.debug("Wowza - Stop_record") json_conf = self.broadcaster.piloting_conf conf = json.loads(json_conf) url_stop_record = ( @@ -309,7 +316,7 @@ def stop(self) -> bool: return False def get_info_current_record(self): - logging.debug("Wowza - Get info from current record") + logger.debug("Wowza - Get info from current record") json_conf = self.broadcaster.piloting_conf conf = json.loads(json_conf) url_state_live_stream_recording = ( @@ -327,7 +334,7 @@ def get_info_current_record(self): "currentFile": "", "segmentNumber": "", "outputPath": "", - "segmentDuration": "", + "durationInSeconds": "", } segment_number = "" @@ -342,9 +349,14 @@ def get_info_current_record(self): except Exception: pass + segment_duration = response.json().get("segmentDuration", 0) + elapsed_time = timedelta(milliseconds=int(segment_duration)).total_seconds() return { "currentFile": current_file, "segmentNumber": segment_number, "outputPath": response.json().get("outputPath"), - "segmentDuration": response.json().get("segmentDuration"), + "durationInSeconds": int(elapsed_time), } + + def copy_file_to_pod_dir(self, filename): + return False diff --git a/pod/live/templates/live/event-script.html b/pod/live/templates/live/event-script.html index f3f30360b4..98e52070cf 100644 --- a/pod/live/templates/live/event-script.html +++ b/pod/live/templates/live/event-script.html @@ -13,7 +13,7 @@ // Live seems stopped let stopped = false; let video_on_hold_is_displayed = false; - + let recordingDuration = 0; let options = { notSupportedMessage: "{% trans 'Please use different browser' %} (Mozilla Firefox, Google Chrome, Safari, Microsoft Edge)", language: "fr", //en or nl @@ -139,7 +139,6 @@ const stopButton = document.getElementById("stoprecord"); const splitButton = document.getElementById("splitrecord"); const durationClock = document.getElementById("recordingduration"); - let recordingDuration = 0; // Recording actions on the stream startButton.onclick = () => { @@ -295,12 +294,14 @@ // Display elapsed record time function displayRecordingDuration() { - let minutes = parseInt(recordingDuration / 60, 10); - let seconds = recordingDuration - minutes * 60; - minutes = minutes < 10 ? "0" + minutes : minutes; - seconds = seconds < 10 ? "0" + seconds : seconds; - durationClock.innerHTML = '{% trans "Recording duration" %} : ' + minutes + ":" + seconds; - recordingDuration++; + let hours = Math.floor(recordingDuration / 3600) + let minutes = Math.floor(recordingDuration / 60 - (hours * 60)) + let seconds = recordingDuration - minutes * 60 - hours * 3600 + hours = hours === 0 ? "" : hours + ":" + minutes = minutes < 10 ? "0" + minutes : minutes + seconds = seconds < 10 ? "0" + seconds : seconds + durationClock.innerHTML = '{% trans "Recording duration" %} : ' + hours + minutes + ':' + seconds; + recordingDuration++ } function getInfoCurrentRecord() { @@ -312,7 +313,6 @@ "Content-Type": "application/json", "X-CSRFToken": '{{ csrf_token }}' }, - dataType: "json", body: JSON.stringify({ "idevent": "{{ event.id }}", "idbroadcaster": "{{ event.broadcaster.id }}" @@ -505,13 +505,13 @@ // display the event's videos function show_transcription() { - var lastMod = null; - var lastModTime = 0; + let lastMod = null; + let lastModTime = 0; setInterval(function () { let tracks = player.textTracks(); - var track_live; - for (var i = 0; i < tracks.length; i++) { - var track = tracks[i]; + let track_live; + for (let i = 0; i < tracks.length; i++) { + let track = tracks[i]; if (track.kind === "subtitles" && track.language === "{{ event.broadcaster.main_lang }}") { track_live = tracks[i]; } @@ -555,7 +555,7 @@ newTrack.mode = 'showing'; }); // show all tracks - for (var i = 0; i < tracks.length; i++) { + for (let i = 0; i < tracks.length; i++) { if (tracks[i].kind === "subtitles" && tracks[i].language === "{{ event.broadcaster.main_lang }}") { tracks[i].mode = "showing"; } diff --git a/pod/live/tests/test_utils.py b/pod/live/tests/test_utils.py index d6052c624a..c718b20601 100644 --- a/pod/live/tests/test_utils.py +++ b/pod/live/tests/test_utils.py @@ -1,7 +1,13 @@ -from django.test import TestCase +import os + +from django.conf import settings from django.contrib.auth.models import User -from pod.video.models import Type +from django.test import TestCase, RequestFactory + from pod.live.models import Building, Broadcaster, Event +from pod.video.models import Type + +MEDIA_ROOT = getattr(settings, "MEDIA_ROOT", "") class LiveTestUtils(TestCase): @@ -23,7 +29,7 @@ def setUp(self): type=e_type, ) - def test_utils(self): + def test_send_email(self): from pod.live.utils import send_email_confirmation, get_bcc, get_cc event = Event.objects.get(id=1) @@ -54,3 +60,114 @@ def test_utils(self): # TODO test this for real send_email_confirmation(event) print(" ---> test_utils send_email_confirmation ok") + + def test_date_string_to_second(self): + from pod.live.utils import date_string_to_second + + self.assertEquals(0, date_string_to_second("a")) + self.assertEquals(0, date_string_to_second("1:1:1")) + self.assertEquals(0, date_string_to_second("00:00:61")) + self.assertEquals(0, date_string_to_second("00:61:00")) + self.assertEquals(0, date_string_to_second("24:00:00")) + self.assertEquals(0, date_string_to_second("00:00:00")) + self.assertEquals(1, date_string_to_second("00:00:01")) + self.assertEquals(60, date_string_to_second("00:01:00")) + self.assertEquals(3600, date_string_to_second("01:00:00")) + self.assertEquals(3661, date_string_to_second("01:01:01")) + self.assertEquals(86399, date_string_to_second("23:59:59")) + print(" ---> test_utils date_string_to_second ok") + + def test_get_event_id_and_broadcaster_id(self): + from pod.live.utils import get_event_id_and_broadcaster_id + + rf = RequestFactory() + + request = rf.post("/", data={}, content_type="application/json") + result = get_event_id_and_broadcaster_id(request) + self.assertEqual(result, (None, None)) + + request = rf.post("/", data={"idevent": 12}, content_type="application/json") + result = get_event_id_and_broadcaster_id(request) + self.assertEqual(result, (12, None)) + + request = rf.post( + "/", data={"idbroadcaster": 34}, content_type="application/json" + ) + result = get_event_id_and_broadcaster_id(request) + self.assertEqual(result, (None, 34)) + + request = rf.post( + "/", + data={"idevent": 12, "idbroadcaster": 34}, + content_type="application/json", + ) + result = get_event_id_and_broadcaster_id(request) + self.assertEqual(result, (12, 34)) + + print(" ---> test_utils test_get_event_id_and_broadcaster_id ok") + + def test_check_size_not_changing(self): + import threading + from pod.live.utils import check_size_not_changing + from time import sleep + + # Create a temporary file for testing + resource_path = "thread_test_file.txt" + with open(resource_path, "w") as file: + file.write("some content") + + self.assertIsNone(check_size_not_changing(resource_path)) + print(" ---> test_utils test_check_size_not_changing Ok") + + # Start a separate thread that modifies the file size every x seconds + def modify_file(): + modifications = 0 + + while modifications < 10: + with open(resource_path, "a+") as f: + f.write(" some more content " + str(modifications)) + modifications += 1 + sleep(0.8) + + # remove the temporary file + os.unlink(resource_path) + + # Start modifying the file in a separate thread + thread = threading.Thread(target=modify_file) + thread.start() + + # Call the function being tested + with self.assertRaises(Exception) as cm: + check_size_not_changing(resource_path) + print(" ---> test_utils test_check_size_not_changing Exception Ok") + + # Verify that the exception was raised + self.assertEqual(str(cm.exception), "checkFileSize aborted") + + def test_check_exists(self): + from pod.live.utils import check_exists, check_size_not_changing + + with self.assertRaises(Exception): + check_exists("dirname", True, 2) + print(" ---> test_exists checkDirExists exception: OK!") + + self.assertIsNone(check_exists(MEDIA_ROOT, True, 1)) + print(" ---> test_exists checkDirExists : OK!") + + test_file = os.path.join(MEDIA_ROOT, "test.log") + with self.assertRaises(Exception): + check_exists("filename", False, 2) + print(" ---> test_exists checkFileExists exception: OK!") + + open(test_file, "a").close() + self.assertIsNone(check_exists(test_file, False, 1)) + print(" ---> test_exists checkFileExists : OK!") + + self.assertIsNone(check_size_not_changing(test_file, 2)) + print(" ---> test_exists checkFileSize : OK!") + + os.unlink(test_file) + + def check_permission(self): + # already tested in test_views.py file + pass diff --git a/pod/live/tests/test_views.py b/pod/live/tests/test_views.py index 3ea93814df..290819b363 100644 --- a/pod/live/tests/test_views.py +++ b/pod/live/tests/test_views.py @@ -1444,7 +1444,7 @@ def response_info_current_record_ok(url, request): "currentFile": "file_10.mp3", "segmentNumber": "23", "outputPath": "aa", - "segmentDuration": "60", + "segmentDuration": "60000", }, ) @@ -1452,7 +1452,7 @@ def response_info_current_record_ok(url, request): "currentFile": "", "segmentNumber": "", "outputPath": "", - "segmentDuration": "", + "durationInSeconds": "", } response = get_info_current_record(broadcaster) self.assertEqual(response, expected_on_error) @@ -1471,7 +1471,7 @@ def response_info_current_record_ok(url, request): "currentFile": "file_10.mp3", "segmentNumber": "10", "outputPath": "aa", - "segmentDuration": "60", + "durationInSeconds": 60, }, ) print(" ---> test misc_broadcaster get_info_current_record ok: OK!") @@ -1502,17 +1502,6 @@ def test_event_video_cards(self): self.assertNotEqual(response.json(), {"content": ""}) print(" ---> test event_video_cards with videos: OK!") - def test_event_dir_exists(self): - from pod.live.views import checkDirExists, checkFileExists - - with self.assertRaises(Exception): - checkDirExists("dirname", 2) - print(" ---> test checkDirExists exception: OK!") - - with self.assertRaises(Exception): - checkFileExists("filename", 2) - print(" ---> test checkFileExists exception: OK!") - def test_immediate_event(self): self.client = Client() diff --git a/pod/live/utils.py b/pod/live/utils.py index b1f37afd6f..3037890ce4 100644 --- a/pod/live/utils.py +++ b/pod/live/utils.py @@ -1,14 +1,17 @@ -import bleach import json import logging +import os import os.path +import re +from datetime import datetime +from time import sleep +import bleach from django.conf import settings -from django.utils.translation import ugettext_lazy as _ -from django.core.mail import EmailMultiAlternatives, mail_managers -from time import sleep from django.contrib import messages from django.core.exceptions import PermissionDenied +from django.core.mail import EmailMultiAlternatives, mail_managers +from django.utils.translation import ugettext_lazy as _ SECURE_SSL_REDIRECT = getattr(settings, "SECURE_SSL_REDIRECT", False) @@ -45,7 +48,7 @@ DEBUG = getattr(settings, "DEBUG", True) -logger = logging.getLogger("pod.live") +logger = logging.getLogger(__name__) def send_email_confirmation(event): @@ -165,6 +168,26 @@ def send_email(subject, message, from_email, to_email, cc_email, html_message): msg.send() +def date_string_to_second(date_string): + """ + Calcul the number of seconds from a date string. + Args: + date_string: the format must be like "hh:mm:ss". + Returns: + number of seconds of 0 if format error. + """ + seconds = 0 + pattern = re.compile(r"^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$") + if pattern.match(date_string): + elapsed_time = datetime.strptime(date_string, "%H:%M:%S").time() + seconds = ( + (elapsed_time.hour * 3600) + (elapsed_time.minute * 60) + elapsed_time.second + ) + elif DEBUG: + print('Error date_string_to_second : Excepted format : "hh:mm:ss"') + return seconds + + def get_event_id_and_broadcaster_id(request): """ Extracts the event ID and broadcaster ID from the given HTTP request. @@ -181,24 +204,65 @@ def get_event_id_and_broadcaster_id(request): return event_id, broadcaster_id -def check_exists(resource_name, is_dir, max_attempt=6): - """Checks whether a file or directory exists.""" +def check_size_not_changing(resource_path, max_attempt=6): + """ + Checks if the size of a resource remains unchanged over a specified number of attempts. + Args: + resource_path: resource path and name. + max_attempt: number of attempt before aborting if the resource size still changes. + Raises: + Exception: if the number of attempt if reached. + OSError: if resource does not exist or is inaccessible. + """ + file_size = os.path.getsize(resource_path) + size_match = False + + attempt_number = 0 + while not size_match and attempt_number <= max_attempt: + sleep(1) + new_size = os.path.getsize(resource_path) + if file_size != new_size: + logger.warning( + f"File size of {resource_path} changing from " + f"{file_size} to {new_size}, attempt number {attempt_number} " + ) + file_size = new_size + attempt_number += 1 + if attempt_number == max_attempt: + logger.error(f"File: {resource_path} is still changing") + raise Exception("checkFileSize aborted") + else: + logger.info(f"Size checked for {resource_path} : {new_size}") + size_match = True + + +def check_exists(resource_path, is_dir, max_attempt=6): + """ + Checks whether a file or directory exists. + Args: + resource_path: resource path and name. + is_dir(bool): True for a dir, False for a file . + max_attempt: number of attempt. + Raises: + Exception: if the number of attempt if reached. + """ fct = os.path.isdir if is_dir else os.path.exists - type = "Dir" if is_dir else "File" + r_type = "Dir" if is_dir else "File" attempt_number = 1 - while not fct(resource_name) and attempt_number <= max_attempt: - logger.warning(f"{type} does not exists, attempt number {attempt_number} ") + while not fct(resource_path) and attempt_number <= max_attempt: + logger.warning(f"{r_type} does not exists, attempt number {attempt_number} ") if attempt_number == max_attempt: - logger.error(f"Impossible to get {type}: {resource_name}") - raise Exception(f"{type}: {resource_name} does not exists") + logger.error(f"Impossible to get {r_type}: {resource_path}") + raise Exception(f"{r_type}: {resource_path} does not exists") attempt_number = attempt_number + 1 sleep(1) def check_permission(request): - """Checks whether the current user has permission to view a page. + """ + Checks whether the current user has permission to view a page. Args: request: An HTTP request object. Raises: diff --git a/pod/live/views.py b/pod/live/views.py index 3776ddb50a..0955f7c197 100644 --- a/pod/live/views.py +++ b/pod/live/views.py @@ -2,15 +2,14 @@ import logging import os.path import re -from datetime import datetime, timedelta -from time import sleep +from datetime import datetime from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import login_required from django.contrib.sites.shortcuts import get_current_site -from django.core.exceptions import SuspiciousOperation from django.core.exceptions import PermissionDenied +from django.core.exceptions import SuspiciousOperation from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage from django.db.models import Prefetch from django.http import ( @@ -44,6 +43,7 @@ send_email_confirmation, get_event_id_and_broadcaster_id, check_exists, + check_size_not_changing, check_permission, ) from ..main.views import in_maintenance @@ -400,7 +400,7 @@ def my_events(request): ) past_events = [evt for evt in queryset if evt.is_past()] - past_events = sorted(past_events, key=lambda evt: (evt.start_date), reverse=True) + past_events = sorted(past_events, key=lambda evt: evt.start_date, reverse=True) coming_events = [evt for evt in queryset if not evt.is_past()] coming_events = sorted(coming_events, key=lambda evt: (evt.start_date, evt.end_date)) @@ -710,10 +710,10 @@ def event_startrecord(event_id, broadcaster_id): {"success": False, "error": "the broadcaster is already recording"} ) - if start_record(broadcaster, event_id): - return JsonResponse({"success": True}) + if not start_record(broadcaster, event_id): + return JsonResponse({"success": False, "error": ""}) - return JsonResponse({"success": False, "error": ""}) + return JsonResponse({"success": True}) @csrf_protect @@ -737,14 +737,14 @@ def event_splitrecord(event_id, broadcaster_id): # file infos before split is done current_record_info = get_info_current_record(broadcaster) - if split_record(broadcaster): - return event_video_transform( - event_id, - current_record_info.get("currentFile", None), - current_record_info.get("segmentNumber", None), - ) + if not split_record(broadcaster): + return JsonResponse({"success": False, "error": ""}) - return JsonResponse({"success": False, "error": ""}) + return event_video_transform( + event_id, + current_record_info.get("currentFile", None), + current_record_info.get("segmentNumber", None), + ) @csrf_protect @@ -765,19 +765,19 @@ def event_stoprecord(event_id, broadcaster_id): return res current_record_info = get_info_current_record(broadcaster) - if stop_record(broadcaster): - # change auto_start property so the recording does not start again - curr_event = Event.objects.get(pk=event_id) - curr_event.is_auto_start = False - curr_event.save() + if not stop_record(broadcaster): + return JsonResponse({"success": False, "error": ""}) - return event_video_transform( - event_id, - current_record_info.get("currentFile", None), - current_record_info.get("segmentNumber", None), - ) + # change auto_start property so the recording does not start again + curr_event = Event.objects.get(pk=event_id) + curr_event.is_auto_start = False + curr_event.save() - return JsonResponse({"success": False, "error": ""}) + return event_video_transform( + event_id, + current_record_info.get("currentFile", None), + current_record_info.get("segmentNumber", None), + ) @login_required(redirect_field_name="referrer") @@ -796,15 +796,11 @@ def event_info_record(event_id, broadcaster_id): return res current_record_info = get_info_current_record(broadcaster) - if current_record_info.get("segmentDuration") != "": + if current_record_info.get("durationInSeconds") != "": return JsonResponse( { "success": True, - "duration": int( - ( - timedelta(milliseconds=current_record_info.get("segmentDuration")) - ).total_seconds() - ), + "duration": int(current_record_info.get("durationInSeconds")), } ) @@ -863,14 +859,14 @@ def event_video_transform(event_id, current_file, segment_number): os.makedirs(dest_dir_name, exist_ok=True) try: - checkDirExists(dest_dir_name) + check_dir_exists(dest_dir_name) # file creation if not exists full_file_name = os.path.join(DEFAULT_EVENT_PATH, filename) - checkFileExists(full_file_name) + check_file_exists(full_file_name) # verif si la taille du fichier d'origine ne bouge plus - checkFileSize(full_file_name) + check_size_not_changing(full_file_name) # moving the file os.rename( @@ -879,7 +875,7 @@ def event_video_transform(event_id, current_file, segment_number): ) # verif si la taille du fichier copié ne bouge plus - checkFileSize(dest_file) + check_size_not_changing(dest_file) except Exception as exc: return JsonResponse( @@ -929,47 +925,15 @@ def event_video_transform(event_id, current_file, segment_number): live_event.videos.add(video) live_event.save() - videos = live_event.videos.all() - video_list = {} - for video in videos: - video_list[video.id] = { - "id": video.id, - "slug": video.slug, - "title": video.title, - "get_absolute_url": video.get_absolute_url(), - } - return JsonResponse({"success": True, "videos": video_list}) - - -def checkFileSize(full_file_name, max_attempt=6): - file_size = os.path.getsize(full_file_name) - size_match = False - - attempt_number = 1 - while not size_match and attempt_number <= max_attempt: - sleep(2) - new_size = os.path.getsize(full_file_name) - if file_size != new_size: - logger.warning( - f"File size of {full_file_name} changing from" - f"{file_size} to {new_size}, attempt number {attempt_number} " - ) - file_size = new_size - attempt_number = attempt_number + 1 - if attempt_number == max_attempt: - logger.error(f"File: {full_file_name} is still changing") - raise Exception("checkFileSize aborted") - else: - logger.info(f"Size checked for {full_file_name} : {new_size}") - size_match = True + return JsonResponse({"success": True}) -def checkDirExists(dest_dir_name, max_attempt=6): +def check_dir_exists(dest_dir_name, max_attempt=6): """Checks a directory exists.""" return check_exists(dest_dir_name, True, max_attempt) -def checkFileExists(full_file_name, max_attempt=6): +def check_file_exists(full_file_name, max_attempt=6): """Checks a file exists.""" return check_exists(full_file_name, False, max_attempt) @@ -1009,7 +973,7 @@ def get_info_current_record(broadcaster: Broadcaster) -> dict: "currentFile": "", "segmentNumber": "", "outputPath": "", - "segmentDuration": "", + "durationInSeconds": "", } return impl_class.get_info_current_record() From 534ab1b1833f4b987dee526c7e0ab9ec750e6d4f Mon Sep 17 00:00:00 2001 From: Olivier Bado Date: Mon, 22 May 2023 17:26:04 +0200 Subject: [PATCH 03/63] Replace "nextPage" and "nextPageNumber" attributes by dataset versions (data-nextPage & data-nextPageNumber) to avoid W3C errors like `Attribute nextpage not allowed on element div at this point.` --- .../templates/favorite/favorite_video_list.html | 4 ++-- pod/main/static/js/infinite.js | 6 +++--- pod/video/static/js/filter_aside_video_list_refresh.js | 4 ++-- pod/video/templates/videos/video_list.html | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pod/favorite/templates/favorite/favorite_video_list.html b/pod/favorite/templates/favorite/favorite_video_list.html index de336de8ea..777c4f8767 100644 --- a/pod/favorite/templates/favorite/favorite_video_list.html +++ b/pod/favorite/templates/favorite/favorite_video_list.html @@ -1,7 +1,7 @@ {% load i18n %} {% load static %} {% spaceless %} -
    +
    {% for video in videos %}
    @@ -19,7 +19,7 @@ style="display:none" class="infinite-more-link" href="{{ full_path }}{% if '?' in full_path %}&{% else %}?{% endif %}page={{ videos.next_page_number }}" - nextPageNumber = "{% if videos.has_next %}{{ videos.next_page_number }}{% else %}null{% endif %}" >{% trans "More" %} + data-nextPageNumber = "{% if videos.has_next %}{{ videos.next_page_number }}{% else %}null{% endif %}" >{% trans "More" %} {% endif %}