From ca1f085d2a299d3e272b77dfe9985f292e462b63 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Mon, 10 Feb 2020 20:39:57 +0100 Subject: [PATCH 01/33] add get file view to import file into video caption maker --- pod/podfile/urls.py | 7 ++++++- pod/podfile/views.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/pod/podfile/urls.py b/pod/podfile/urls.py index 2026b9dc08..5f03c641a9 100644 --- a/pod/podfile/urls.py +++ b/pod/podfile/urls.py @@ -5,7 +5,8 @@ from django.conf.urls import url -from .views import home, get_folder_files, editfolder, deletefolder +from .views import home, get_folder_files, get_file +from .views import editfolder, deletefolder from .views import uploadfiles, deletefile, changefile app_name = 'podfile' @@ -21,6 +22,10 @@ r'^get_folder_files/(?P[\d]+)/(?P[\-\d\w]+)/$', get_folder_files, name='get_folder_files'), + url( + r'^get_file/(?P[\-\d\w]+)/$', + get_file, + name='get_file'), url(r'^editfolder/$', editfolder, name='editfolder'), url(r'^deletefolder/$', deletefolder, name='deletefolder'), url(r'^deletefile/$', deletefile, name='deletefile'), diff --git a/pod/podfile/views.py b/pod/podfile/views.py index 341cbef120..d409032328 100644 --- a/pod/podfile/views.py +++ b/pod/podfile/views.py @@ -468,3 +468,47 @@ def file_edit_save(request, folder): return HttpResponse(data, content_type='application/json') return HttpResponse(data, content_type='application/json') + + +@csrf_protect +@staff_member_required(redirect_field_name='referrer') +def get_file(request, type): + id = None + if request.method == 'POST' and request.POST.get('src'): + id = request.POST.get('src') + elif request.method == 'GET' and request.GET.get('src'): + id = request.GET.get('src') + if type == "image": + reqfile = get_object_or_404(CustomImageModel, id=id) + else: + reqfile = get_object_or_404(CustomFileModel, id=id) + if (request.user != reqfile.folder.owner + and not request.user.groups.filter( + name__in=[ + name[0] + for name in reqfile.folder.groups.values_list('name') + ] + ).exists() + and not request.user.is_superuser): + messages.add_message( + request, messages.ERROR, + _(u'You cannot see this folder.')) + raise PermissionDenied + + request.session['current_session_folder'] = reqfile.folder.name + try: + with open(reqfile.file.path, 'r') as f: + fc = f.read() + some_data_to_dump = { + 'status': "success", + 'id_file': reqfile.id, + 'id_folder': reqfile.folder.id, + 'response': fc + } + except OSError: + some_data_to_dump = { + 'status': "error", + 'response': '' + } + data = json.dumps(some_data_to_dump) + return HttpResponse(data, content_type='application/json') From d4eef57da46c66652e688feefd020739ea6c2366 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Mon, 10 Feb 2020 21:01:29 +0100 Subject: [PATCH 02/33] fix bug with file name for save in video caption maker --- pod/completion/static/js/caption_maker.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pod/completion/static/js/caption_maker.js b/pod/completion/static/js/caption_maker.js index 9dd6fe6b81..bad441737f 100644 --- a/pod/completion/static/js/caption_maker.js +++ b/pod/completion/static/js/caption_maker.js @@ -24,7 +24,9 @@ $(document).on('click', '#modal-btn-new, #modal-btn-override', function() { $("#saveCaptionsModal").modal('hide'); if (this.id == 'modal-btn-override') { $('#form_save_captions').find('input[name="file_id"]').val(file_loaded_id); - send_form_save_captions($('#fileinput_id_src').find('strong').html()); + //alert($('#fileinput_id_src').find('strong').find('a').html()); + //alert($('#fileinput_id_src').text().trim()); + send_form_save_captions($('#fileinput_id_src').text().trim()); } else if (this.id == 'modal-btn-new') { $('#form_save_captions').find('input[name="file_id"]').val(""); From 2c9e86b2592e51a3191bf4180546ca0565e4ea65 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 12 Feb 2020 10:37:28 +0100 Subject: [PATCH 03/33] Add preview for record + update gitignore to support vscode files --- .gitignore | 1 + pod/recorder/models.py | 8 +++- .../templates/recorder/claim_record.html | 38 +++++++++++++++++++ .../templates/recorder/link_record.html | 6 ++- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 583b39c605..c3f76e5987 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ pod/static/ # IDE Files # ############# .idea +.vscode # Certificates # ################ diff --git a/pod/recorder/models.py b/pod/recorder/models.py index e249a13769..10f256063a 100644 --- a/pod/recorder/models.py +++ b/pod/recorder/models.py @@ -32,7 +32,10 @@ settings, 'DEFAULT_RECORDER_ID', 1 ) - +PUBLIC_RECORD_DIRS = getattr( + settings, 'PUBLIC_RECORD_DIRS', + "records" +) class Recorder(models.Model): # Recorder name @@ -177,6 +180,9 @@ class RecordingFileTreatment(models.Model): def filename(self): return os.path.basename(self.file) + def publicfileurl(self): + return os.path.join(settings.MEDIA_URL,PUBLIC_RECORD_DIRS,self.recorder.directory ,os.path.basename(self.file)) + class Meta: verbose_name = _("Recording file treatment") verbose_name_plural = _("Recording file treatments") diff --git a/pod/recorder/templates/recorder/claim_record.html b/pod/recorder/templates/recorder/claim_record.html index 55fff73f2a..23a6b8a9c3 100644 --- a/pod/recorder/templates/recorder/claim_record.html +++ b/pod/recorder/templates/recorder/claim_record.html @@ -22,6 +22,34 @@

{% trans "No record found"%}

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

{% include "recorder/record_list.html" %} {% endif %} + + + {% endblock page_content %} {% block collapse_page_aside %} @@ -49,5 +77,15 @@

{% blocktrans count counter=records.paginator.count %}{{ counter }} record f } } }); + + $('#previewModal').on('show.bs.modal', function (e) { + console.log("Opening the modal") +}) + + $('.previewBtn').on('click', function (e) { + console.log("clicking the btn") + videojs("podvideoplayer").src($(this).data("recid")) + +}) {% endblock more_script %} \ No newline at end of file diff --git a/pod/recorder/templates/recorder/link_record.html b/pod/recorder/templates/recorder/link_record.html index b0702e7152..8e364b8110 100644 --- a/pod/recorder/templates/recorder/link_record.html +++ b/pod/recorder/templates/recorder/link_record.html @@ -1,9 +1,13 @@ {% load i18n %} {% spaceless %} {% if request.user.is_superuser %} - + + {% endif %} + {% trans "Claim the record"%} From 918862e577d7c20be16ac316e712e1c6e1214d41 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 12 Feb 2020 10:42:01 +0100 Subject: [PATCH 04/33] Fix flaxe8 issues --- pod/recorder/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pod/recorder/models.py b/pod/recorder/models.py index 10f256063a..cca791ad6d 100644 --- a/pod/recorder/models.py +++ b/pod/recorder/models.py @@ -37,6 +37,7 @@ "records" ) + class Recorder(models.Model): # Recorder name name = models.CharField(_('name'), max_length=200, unique=True) @@ -181,7 +182,9 @@ def filename(self): return os.path.basename(self.file) def publicfileurl(self): - return os.path.join(settings.MEDIA_URL,PUBLIC_RECORD_DIRS,self.recorder.directory ,os.path.basename(self.file)) + return os.path.join(settings.MEDIA_URL, PUBLIC_RECORD_DIRS, + self.recorder.directory, + os.path.basename(self.file)) class Meta: verbose_name = _("Recording file treatment") From 34d4dae33f0e7b6b93170c84b1323817a063acce Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 12 Feb 2020 10:43:27 +0100 Subject: [PATCH 05/33] Remove useless logs + remove useless funcion --- pod/recorder/templates/recorder/claim_record.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pod/recorder/templates/recorder/claim_record.html b/pod/recorder/templates/recorder/claim_record.html index 23a6b8a9c3..1e63bbf458 100644 --- a/pod/recorder/templates/recorder/claim_record.html +++ b/pod/recorder/templates/recorder/claim_record.html @@ -78,14 +78,8 @@ } }); - $('#previewModal').on('show.bs.modal', function (e) { - console.log("Opening the modal") -}) - $('.previewBtn').on('click', function (e) { - console.log("clicking the btn") videojs("podvideoplayer").src($(this).data("recid")) - }) {% endblock more_script %} \ No newline at end of file From d7d20f6e4e5f2d9dfe2c9b325d94de38041d799c Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 12 Feb 2020 10:44:47 +0100 Subject: [PATCH 06/33] Update translation --- pod/locale/fr/LC_MESSAGES/django.mo | Bin 74028 -> 74107 bytes pod/locale/fr/LC_MESSAGES/django.po | 92 +++++++++++++++------------- pod/locale/nl/LC_MESSAGES/django.mo | Bin 769 -> 769 bytes pod/locale/nl/LC_MESSAGES/django.po | 91 ++++++++++++++------------- 4 files changed, 97 insertions(+), 86 deletions(-) diff --git a/pod/locale/fr/LC_MESSAGES/django.mo b/pod/locale/fr/LC_MESSAGES/django.mo index 31d67c12f805d295a2562fea927ea6135fe457f4..d3ec890c00da197e02042346adb0692f06d3ba4f 100644 GIT binary patch delta 17726 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 delta 17631 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 f$-94CvGlPeB8tV9Ef&A2@`{EDn>O7#TJHY\n" "Language-Team: \n" @@ -90,7 +90,7 @@ msgstr "enseignant" msgid "registered-reader" msgstr "lecteur enregistré" -#: pod/authentication/models.py:67 pod/recorder/models.py:109 +#: pod/authentication/models.py:67 pod/recorder/models.py:113 #: pod/video/models.py:1281 pod/video/views.py:1127 msgid "Comment" msgstr "Commentaire" @@ -196,7 +196,7 @@ msgid "video" msgstr "vidéo" #: pod/chapter/models.py:14 pod/enrichment/models.py:114 -#: pod/recorder/models.py:102 pod/video/models.py:386 +#: pod/recorder/models.py:106 pod/video/models.py:386 msgid "title" msgstr "titre" @@ -1524,7 +1524,7 @@ msgstr "" "interactive et leurs résultats." #: pod/interactive/templates/interactive/video_interactive.html:129 -#: pod/recorder/models.py:58 +#: pod/recorder/models.py:62 msgid "User" msgstr "Utilisateur" @@ -1564,7 +1564,7 @@ msgstr "Vous regardez cette vidéo en tant qu'utilisateur anonyme" msgid "You cannot add interactivity to this video." msgstr "Vous ne pouvez éditer cette vidéo interactive." -#: pod/live/models.py:20 pod/live/models.py:45 pod/recorder/models.py:39 +#: pod/live/models.py:20 pod/live/models.py:45 pod/recorder/models.py:43 msgid "name" msgstr "nom" @@ -1586,7 +1586,7 @@ msgstr "Bâtiment" msgid "Buildings" msgstr "Bâtiments" -#: pod/live/models.py:54 pod/recorder/models.py:41 +#: pod/live/models.py:54 pod/recorder/models.py:45 #: pod/video/templates/channel/list_theme.html:10 msgid "description" msgstr "description" @@ -2876,6 +2876,7 @@ msgid "Loading" msgstr "Chargement" #: pod/podfile/templates/podfile/home_content.html:57 +#: pod/recorder/templates/recorder/claim_record.html:48 msgid "Close" msgstr "Fermer" @@ -2911,7 +2912,7 @@ msgstr "Ajouter un nouveau dossier" msgid "Shared folders" msgstr "Dossiers partagés" -#: pod/podfile/views.py:123 +#: pod/podfile/views.py:123 pod/podfile/views.py:495 msgid "You cannot see this folder." msgstr "Vous ne pouvez pas voir ce dossier." @@ -2983,23 +2984,23 @@ msgstr "La suppression d'un enregistrement est définitive" msgid "Audiovideocast" msgstr "Audiovideocast" -#: pod/recorder/models.py:44 +#: pod/recorder/models.py:48 msgid "Address IP" msgstr "Adresse IP" -#: pod/recorder/models.py:46 +#: pod/recorder/models.py:50 msgid "IP address of the recorder." msgstr "Adresse IP de l'enregistreur." -#: pod/recorder/models.py:49 +#: pod/recorder/models.py:53 msgid "salt" msgstr "hash" -#: pod/recorder/models.py:50 +#: pod/recorder/models.py:54 msgid "Recorder salt." msgstr "Hash de l'enregistreur." -#: pod/recorder/models.py:55 +#: pod/recorder/models.py:59 msgid "" "Manager of this recorder. This manager will receive recorder emails and he " "will be the owner of the published videos. If no user is selected, this " @@ -3009,113 +3010,113 @@ msgstr "" "le propriétaire des vidéos publiées. Si aucun utilisateur n'est sélectionné, " "cet enregistreur utilisera le mode manuel d'assignation." -#: pod/recorder/models.py:62 +#: pod/recorder/models.py:66 msgid "Video type by default." msgstr "Type par défaut des vidéos." -#: pod/recorder/models.py:64 pod/recorder/models.py:103 +#: pod/recorder/models.py:68 pod/recorder/models.py:107 msgid "Recording Type" msgstr "Type d'enregistrement" -#: pod/recorder/models.py:68 +#: pod/recorder/models.py:72 msgid "Publication directory" msgstr "Répertoire des publications" -#: pod/recorder/models.py:70 +#: pod/recorder/models.py:74 msgid "Basic directory containing the videos published by the recorder." msgstr "Répertoire de base des vidéos publiées par l'enregistreur." -#: pod/recorder/models.py:86 pod/recorder/models.py:94 -#: pod/recorder/models.py:156 pod/recorder/models.py:190 +#: pod/recorder/models.py:90 pod/recorder/models.py:98 +#: pod/recorder/models.py:160 pod/recorder/models.py:199 msgid "Recorder" msgstr "Enregistreur" -#: pod/recorder/models.py:87 +#: pod/recorder/models.py:91 msgid "Recorders" msgstr "Enregistreurs" -#: pod/recorder/models.py:96 pod/recorder/models.py:158 -#: pod/recorder/models.py:191 +#: pod/recorder/models.py:100 pod/recorder/models.py:162 +#: pod/recorder/models.py:200 msgid "Recorder that made this recording." msgstr "Enregistreur qui a fait cet enregistrement." -#: pod/recorder/models.py:101 +#: pod/recorder/models.py:105 msgid "User who has made the recording" msgstr "Utilisateur qui a fait l'enregisrement" -#: pod/recorder/models.py:117 +#: pod/recorder/models.py:121 msgid "Recording" msgstr "Enregistrement" -#: pod/recorder/models.py:118 +#: pod/recorder/models.py:122 msgid "Recordings" msgstr "Enregistrements" -#: pod/recorder/models.py:132 +#: pod/recorder/models.py:136 msgid "Please specify a type." msgstr "Veuillez spécifier un type." -#: pod/recorder/models.py:134 +#: pod/recorder/models.py:138 msgid "Please use the only type in type choices." msgstr "Merci de sélectionner un type valide." -#: pod/recorder/models.py:136 +#: pod/recorder/models.py:140 msgid "Please specify a source file." msgstr "Veuillez spécifier un fichier source." -#: pod/recorder/models.py:138 +#: pod/recorder/models.py:142 msgid "Source file doesn't exists" msgstr "Le fichier source n'existe pas" -#: pod/recorder/models.py:153 +#: pod/recorder/models.py:157 msgid "Source file of the published video." msgstr "Fichier source de la vidéo publiée." -#: pod/recorder/models.py:154 +#: pod/recorder/models.py:158 msgid "File size" msgstr "Taille du fichier" -#: pod/recorder/models.py:159 pod/video/models.py:488 pod/video/models.py:1228 +#: pod/recorder/models.py:163 pod/video/models.py:488 pod/video/models.py:1228 #: pod/video/models.py:1283 msgid "Date added" msgstr "Date d'ajout" -#: pod/recorder/models.py:161 +#: pod/recorder/models.py:165 msgid "Require manual claim ?" msgstr "Requière une revendication manuelle ?" -#: pod/recorder/models.py:164 +#: pod/recorder/models.py:168 msgid "Has this recording file require a manual claim by a user ?" msgstr "" "Est-ce que ce fichier d'enregistrement requière une revendication manuelle ?" -#: pod/recorder/models.py:167 +#: pod/recorder/models.py:171 msgid "Email sent ?" msgstr "Email envoyé ?" -#: pod/recorder/models.py:169 +#: pod/recorder/models.py:173 msgid "Has an email been sent to the manager of the concerned recorder ?" msgstr "" "Est-ce que le mail a été envoyé au gestionnaire de l'enregistrement " "concerné ?" -#: pod/recorder/models.py:172 +#: pod/recorder/models.py:176 msgid "Date email sent" msgstr "Date de l'envoi du mail" -#: pod/recorder/models.py:181 +#: pod/recorder/models.py:190 msgid "Recording file treatment" msgstr "Traitement de fichier d’enregistrement" -#: pod/recorder/models.py:182 +#: pod/recorder/models.py:191 msgid "Recording file treatments" msgstr "Traitements de fichier d’enregistrement" -#: pod/recorder/models.py:195 +#: pod/recorder/models.py:204 msgid "Recording file" msgstr "Fichier d’enregistrement" -#: pod/recorder/models.py:196 +#: pod/recorder/models.py:205 msgid "Recording files" msgstr "Fichiers d’enregistrement" @@ -3145,12 +3146,17 @@ msgstr "Aucun enregistrement trouvé" msgid "There is no unassigned records" msgstr "Il n'y a pas d'enregistrements non assigné" -#: pod/recorder/templates/recorder/link_record.html:4 +#: pod/recorder/templates/recorder/claim_record.html:31 +#| msgid "Recording Type" +msgid "Record preview" +msgstr "Prévisulation d'enregistrement" + +#: pod/recorder/templates/recorder/link_record.html:5 msgid "Delete this record." msgstr "Supprimer cet enregistrement." -#: pod/recorder/templates/recorder/link_record.html:7 -#: pod/recorder/templates/recorder/link_record.html:8 +#: pod/recorder/templates/recorder/link_record.html:11 +#: pod/recorder/templates/recorder/link_record.html:12 msgid "Claim the record" msgstr "Revendiquer l'enregistrement" diff --git a/pod/locale/nl/LC_MESSAGES/django.mo b/pod/locale/nl/LC_MESSAGES/django.mo index acc64429f06a64293f148a30fc4c0c4fc70431d2..242dbf4cb1c7d04eae88b40fdf9cf929ae414ae4 100644 GIT binary patch delta 21 ccmZoF{&B$SBq+noaWn#R!nX!%$06q@|h5!Hn delta 21 ccmZoF{&B$S3qF`uXWoWv&nX!%$06oeDegFUf diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index c7ecd404be..0863d3c660 100644 --- a/pod/locale/nl/LC_MESSAGES/django.po +++ b/pod/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-04 10:15+0000\n" +"POT-Creation-Date: 2020-02-12 09:43+0000\n" "PO-Revision-Date: 2018-07-03 13:41+0100\n" "Last-Translator: Nicolas \n" "Language-Team: LANGUAGE \n" @@ -90,7 +90,7 @@ msgstr "" msgid "registered-reader" msgstr "" -#: pod/authentication/models.py:67 pod/recorder/models.py:109 +#: pod/authentication/models.py:67 pod/recorder/models.py:113 #: pod/video/models.py:1281 pod/video/views.py:1127 msgid "Comment" msgstr "" @@ -193,7 +193,7 @@ msgid "video" msgstr "" #: pod/chapter/models.py:14 pod/enrichment/models.py:114 -#: pod/recorder/models.py:102 pod/video/models.py:386 +#: pod/recorder/models.py:106 pod/video/models.py:386 msgid "title" msgstr "titel" @@ -1464,7 +1464,7 @@ msgid "" msgstr "" #: pod/interactive/templates/interactive/video_interactive.html:129 -#: pod/recorder/models.py:58 +#: pod/recorder/models.py:62 msgid "User" msgstr "" @@ -1504,7 +1504,7 @@ msgstr "" msgid "You cannot add interactivity to this video." msgstr "" -#: pod/live/models.py:20 pod/live/models.py:45 pod/recorder/models.py:39 +#: pod/live/models.py:20 pod/live/models.py:45 pod/recorder/models.py:43 msgid "name" msgstr "" @@ -1526,7 +1526,7 @@ msgstr "" msgid "Buildings" msgstr "" -#: pod/live/models.py:54 pod/recorder/models.py:41 +#: pod/live/models.py:54 pod/recorder/models.py:45 #: pod/video/templates/channel/list_theme.html:10 msgid "description" msgstr "" @@ -2797,6 +2797,7 @@ msgid "Loading" msgstr "" #: pod/podfile/templates/podfile/home_content.html:57 +#: pod/recorder/templates/recorder/claim_record.html:48 msgid "Close" msgstr "" @@ -2832,7 +2833,7 @@ msgstr "" msgid "Shared folders" msgstr "" -#: pod/podfile/views.py:123 +#: pod/podfile/views.py:123 pod/podfile/views.py:495 msgid "You cannot see this folder." msgstr "" @@ -2902,133 +2903,133 @@ msgstr "" msgid "Audiovideocast" msgstr "" -#: pod/recorder/models.py:44 +#: pod/recorder/models.py:48 msgid "Address IP" msgstr "" -#: pod/recorder/models.py:46 +#: pod/recorder/models.py:50 msgid "IP address of the recorder." msgstr "" -#: pod/recorder/models.py:49 +#: pod/recorder/models.py:53 msgid "salt" msgstr "" -#: pod/recorder/models.py:50 +#: pod/recorder/models.py:54 msgid "Recorder salt." msgstr "" -#: pod/recorder/models.py:55 +#: pod/recorder/models.py:59 msgid "" "Manager of this recorder. This manager will receive recorder emails and he " "will be the owner of the published videos. If no user is selected, this " "recorder will use manual assign system." msgstr "" -#: pod/recorder/models.py:62 +#: pod/recorder/models.py:66 msgid "Video type by default." msgstr "" -#: pod/recorder/models.py:64 pod/recorder/models.py:103 +#: pod/recorder/models.py:68 pod/recorder/models.py:107 msgid "Recording Type" msgstr "" -#: pod/recorder/models.py:68 +#: pod/recorder/models.py:72 msgid "Publication directory" msgstr "" -#: pod/recorder/models.py:70 +#: pod/recorder/models.py:74 msgid "Basic directory containing the videos published by the recorder." msgstr "" -#: pod/recorder/models.py:86 pod/recorder/models.py:94 -#: pod/recorder/models.py:156 pod/recorder/models.py:190 +#: pod/recorder/models.py:90 pod/recorder/models.py:98 +#: pod/recorder/models.py:160 pod/recorder/models.py:199 msgid "Recorder" msgstr "" -#: pod/recorder/models.py:87 +#: pod/recorder/models.py:91 msgid "Recorders" msgstr "" -#: pod/recorder/models.py:96 pod/recorder/models.py:158 -#: pod/recorder/models.py:191 +#: pod/recorder/models.py:100 pod/recorder/models.py:162 +#: pod/recorder/models.py:200 msgid "Recorder that made this recording." msgstr "" -#: pod/recorder/models.py:101 +#: pod/recorder/models.py:105 msgid "User who has made the recording" msgstr "" -#: pod/recorder/models.py:117 +#: pod/recorder/models.py:121 msgid "Recording" msgstr "" -#: pod/recorder/models.py:118 +#: pod/recorder/models.py:122 msgid "Recordings" msgstr "" -#: pod/recorder/models.py:132 +#: pod/recorder/models.py:136 msgid "Please specify a type." msgstr "" -#: pod/recorder/models.py:134 +#: pod/recorder/models.py:138 msgid "Please use the only type in type choices." msgstr "" -#: pod/recorder/models.py:136 +#: pod/recorder/models.py:140 msgid "Please specify a source file." msgstr "" -#: pod/recorder/models.py:138 +#: pod/recorder/models.py:142 msgid "Source file doesn't exists" msgstr "" -#: pod/recorder/models.py:153 +#: pod/recorder/models.py:157 msgid "Source file of the published video." msgstr "" -#: pod/recorder/models.py:154 +#: pod/recorder/models.py:158 msgid "File size" msgstr "" -#: pod/recorder/models.py:159 pod/video/models.py:488 pod/video/models.py:1228 +#: pod/recorder/models.py:163 pod/video/models.py:488 pod/video/models.py:1228 #: pod/video/models.py:1283 msgid "Date added" msgstr "" -#: pod/recorder/models.py:161 +#: pod/recorder/models.py:165 msgid "Require manual claim ?" msgstr "" -#: pod/recorder/models.py:164 +#: pod/recorder/models.py:168 msgid "Has this recording file require a manual claim by a user ?" msgstr "" -#: pod/recorder/models.py:167 +#: pod/recorder/models.py:171 msgid "Email sent ?" msgstr "" -#: pod/recorder/models.py:169 +#: pod/recorder/models.py:173 msgid "Has an email been sent to the manager of the concerned recorder ?" msgstr "" -#: pod/recorder/models.py:172 +#: pod/recorder/models.py:176 msgid "Date email sent" msgstr "" -#: pod/recorder/models.py:181 +#: pod/recorder/models.py:190 msgid "Recording file treatment" msgstr "" -#: pod/recorder/models.py:182 +#: pod/recorder/models.py:191 msgid "Recording file treatments" msgstr "" -#: pod/recorder/models.py:195 +#: pod/recorder/models.py:204 msgid "Recording file" msgstr "" -#: pod/recorder/models.py:196 +#: pod/recorder/models.py:205 msgid "Recording files" msgstr "" @@ -3058,12 +3059,16 @@ msgstr "" msgid "There is no unassigned records" msgstr "" -#: pod/recorder/templates/recorder/link_record.html:4 +#: pod/recorder/templates/recorder/claim_record.html:31 +msgid "Record preview" +msgstr "" + +#: pod/recorder/templates/recorder/link_record.html:5 msgid "Delete this record." msgstr "" -#: pod/recorder/templates/recorder/link_record.html:7 -#: pod/recorder/templates/recorder/link_record.html:8 +#: pod/recorder/templates/recorder/link_record.html:11 +#: pod/recorder/templates/recorder/link_record.html:12 msgid "Claim the record" msgstr "" From 7a753fc72163f0f89db7c98730740d79ae30df2d Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 12 Feb 2020 10:48:19 +0100 Subject: [PATCH 07/33] Add setting for usage of record preview --- pod/main/context_processors.py | 4 ++++ pod/recorder/templates/recorder/claim_record.html | 3 ++- pod/recorder/templates/recorder/link_record.html | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pod/main/context_processors.py b/pod/main/context_processors.py index 5b5d143bb2..bb3c2386a5 100644 --- a/pod/main/context_processors.py +++ b/pod/main/context_processors.py @@ -75,6 +75,9 @@ ALLOW_MANUAL_RECORDING_CLAIMING = getattr( django_settings, 'ALLOW_MANUAL_RECORDING_CLAIMING', False) +USE_RECORD_PREVIEW = getattr( + django_settings, 'USE_RECORD_PREVIEW', False) + def context_settings(request): new_settings = {} @@ -92,6 +95,7 @@ def context_settings(request): new_settings['HIDE_USER_TAB'] = HIDE_USER_TAB new_settings['HIDE_USER_FILTER'] = HIDE_USER_FILTER new_settings['USE_STATS_VIEW'] = USE_STATS_VIEW + new_settings['USE_RECORD_PREVIEW'] = USE_RECORD_PREVIEW new_settings['ALLOW_MANUAL_RECORDING_CLAIMING'] = \ ALLOW_MANUAL_RECORDING_CLAIMING return new_settings diff --git a/pod/recorder/templates/recorder/claim_record.html b/pod/recorder/templates/recorder/claim_record.html index 1e63bbf458..7cdf622ca7 100644 --- a/pod/recorder/templates/recorder/claim_record.html +++ b/pod/recorder/templates/recorder/claim_record.html @@ -23,7 +23,7 @@

{% blocktrans count counter=records.paginator.count %}{{ counter }} record f {% include "recorder/record_list.html" %} {% endif %} - +{% if USE_RECORD_PREVIEW%} +{% endif %} {% endblock page_content %} {% block collapse_page_aside %} diff --git a/pod/recorder/templates/recorder/link_record.html b/pod/recorder/templates/recorder/link_record.html index 8e364b8110..727f127e0f 100644 --- a/pod/recorder/templates/recorder/link_record.html +++ b/pod/recorder/templates/recorder/link_record.html @@ -5,9 +5,11 @@ {% endif %} +{% if USE_RECORD_PREVIEW%} +{% endif %} {% trans "Claim the record"%} From 3bd45be2013d2a393c5f701c5a8f28b0a43fce5c Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 12 Feb 2020 10:55:51 +0100 Subject: [PATCH 08/33] Remove fail of copy --- pod/recorder/templates/recorder/claim_record.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pod/recorder/templates/recorder/claim_record.html b/pod/recorder/templates/recorder/claim_record.html index 7cdf622ca7..1b00a269ab 100644 --- a/pod/recorder/templates/recorder/claim_record.html +++ b/pod/recorder/templates/recorder/claim_record.html @@ -35,7 +35,7 @@
+
From 3663681c0f599021ca41cdde29e8d9b277bcf6d2 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Wed, 12 Feb 2020 11:47:06 +0100 Subject: [PATCH 12/33] Bump django from 1.11.27 to 1.11.28 #216 --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8b33ff500a..beec3a049d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ -Django==1.11.27 +x +Django==1.11.2 django-ckeditor==5.3.1 Pillow==6.2.1 django-tagging==0.4.6 From f23a42b356bfe1aa7f4880da503b2c43ed81d89c Mon Sep 17 00:00:00 2001 From: ptitloup Date: Wed, 12 Feb 2020 11:51:14 +0100 Subject: [PATCH 13/33] Bump django from 1.11.27 to 1.11.28 #216 --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index beec3a049d..cbd6d99bba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -x -Django==1.11.2 +Django==1.11.28 django-ckeditor==5.3.1 Pillow==6.2.1 django-tagging==0.4.6 From 60b5675881461559aa7052a584f470ed9275b7a8 Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 12 Feb 2020 15:35:03 +0100 Subject: [PATCH 14/33] billiard<4.0,>=3.6.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cbd6d99bba..2aecd26a72 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,6 @@ django-auth-mixins==1.0.1 celery==4.3.0 pandas deepspeech==0.6.1 -billiard +billiard<4.0,>=3.6.0 webrtcvad django-select2-forms==2.1.0 From a266d05bbbb2c32e8d4600094d582415e819b779 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Fri, 14 Feb 2020 10:17:35 +0100 Subject: [PATCH 15/33] Fix csrf issues on video_edit --- pod/video/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pod/video/views.py b/pod/video/views.py index e3e1842f6c..0ba7b6e4ea 100644 --- a/pod/video/views.py +++ b/pod/video/views.py @@ -34,6 +34,7 @@ from pod.video.forms import VideoDeleteForm from pod.video.forms import AdvancedNotesForm, NoteCommentsForm from itertools import chain +from django.views.decorators.csrf import ensure_csrf_cookie import json import re @@ -526,6 +527,7 @@ def render_video(request, id, slug_c=None, slug_t=None, slug_private=None, @csrf_protect +@ensure_csrf_cookie @login_required(redirect_field_name='referrer') def video_edit(request, slug=None): video = get_object_or_404(Video, slug=slug) if slug else None From 113224f89a2d224e48ea6ccf89fbab0215c5ab92 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Fri, 14 Feb 2020 11:41:22 +0100 Subject: [PATCH 16/33] add transcript commande in video admin to (re) transcript video. Add thread function in transcript to do that --- pod/video/admin.py | 9 ++++++++- pod/video/transcript.py | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/pod/video/admin.py b/pod/video/admin.py index ed59850a5e..065dea4a02 100644 --- a/pod/video/admin.py +++ b/pod/video/admin.py @@ -21,6 +21,7 @@ from .models import ViewCount from .models import VideoToDelete from .models import VideoVersion +from .transcript import start_transcript from .forms import VideoForm, VideoVersionForm from .forms import ChannelForm @@ -150,7 +151,7 @@ def get_form(self, request, obj=None, **kwargs): form = super(VideoAdmin, self).get_form(request, obj, **kwargs) return form - actions = ['encode_video'] + actions = ['encode_video', 'transcript_video'] def encode_video(self, request, queryset): for item in queryset: @@ -158,6 +159,12 @@ def encode_video(self, request, queryset): item.save() encode_video.short_description = _('Encode selected') + def transcript_video(self, request, queryset): + for item in queryset: + if item.get_video_mp3() and not item.encoding_in_progress: + start_transcript(item) + transcript_video.short_description = _('Transcript selected') + class Media: css = { "all": ( diff --git a/pod/video/transcript.py b/pod/video/transcript.py index 0e9ddcaf18..3c176e6a53 100644 --- a/pod/video/transcript.py +++ b/pod/video/transcript.py @@ -20,7 +20,10 @@ except ImportError: from pipes import quote -DS_PARAM = getattr(settings, 'DS_PARAM', dict()) +import threading +import logging + +DEBUG = getattr(settings, 'DEBUG', False) if getattr(settings, 'USE_PODFILE', False): from pod.podfile.models import CustomFileModel @@ -30,10 +33,38 @@ FILEPICKER = False from pod.main.models import CustomFileModel +DS_PARAM = getattr(settings, 'DS_PARAM', dict()) AUDIO_SPLIT_TIME = getattr(settings, 'AUDIO_SPLIT_TIME', 300) # 5min # time in sec for phrase length SENTENCE_MAX_LENGTH = getattr(settings, 'SENTENCE_MAX_LENGTH', 3) +log = logging.getLogger(__name__) + + +def start_transcript(video): + log.info("START TRANSCRIPT VIDEO %s" % video) + t = threading.Thread(target=main_threaded_transcript, + args=[video]) + t.setDaemon(True) + t.start() + + +def main_threaded_transcript(video_to_encode): + remove_encoding_in_progress = False + if not video_to_encode.encoding_in_progress: + remove_encoding_in_progress = True + video_to_encode.encoding_in_progress = True + video_to_encode.save() + + msg = main_transcript(video_to_encode) + + if DEBUG: + print(msg) + + if remove_encoding_in_progress: + video_to_encode.encoding_in_progress = False + video_to_encode.save() + def convert_samplerate(audio_path, desired_sample_rate, trim_start, duration): # trim 0 1800 @@ -153,6 +184,7 @@ def main_transcript(video_to_encode): inference_end = timer() - inference_start msg += '\nInference took %0.3fs.' % inference_end # print(msg) + return msg @@ -225,7 +257,8 @@ def saveVTT(video, webvtt): lang, time.strftime("%Y%m%d-%H%M%S")), File(temp_vtt_file)) msg += "\nstore vtt file in bdd with Track model src field" - subtitleVtt, created = Track.objects.get_or_create(video=video) + subtitleVtt, created = Track.objects.get_or_create( + video=video, lang=lang) subtitleVtt.src = subtitleFile subtitleVtt.lang = lang subtitleVtt.save() From 3074cd47802b72bac7997a6e535f15cadc5cded3 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Fri, 14 Feb 2020 11:50:14 +0100 Subject: [PATCH 17/33] Fix a query issue when 2 tables have same name in different schema --- pod/main/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pod/main/models.py b/pod/main/models.py index 7a8a1d635b..bebe589dfa 100644 --- a/pod/main/models.py +++ b/pod/main/models.py @@ -17,7 +17,8 @@ def get_nextautoincrement(model): cursor = connection.cursor() cursor.execute( 'SELECT Auto_increment FROM information_schema.tables ' + - 'WHERE table_name="{0}";'.format(model._meta.db_table) + 'WHERE table_name="{0}" AND table_schema=DATABASE();' + .format(model._meta.db_table) ) row = cursor.fetchone() cursor.close() From 3b92bde45d22678174e386a4ddb1a6d2eef69b6b Mon Sep 17 00:00:00 2001 From: ptitloup Date: Fri, 14 Feb 2020 14:58:17 +0100 Subject: [PATCH 18/33] bump lti provider to 0.45 version, add crsf exempt to lti view, not perect but it work --- pod/lti/templates/lti_provider/assignment.html | 2 ++ pod/lti/views.py | 9 +++++++-- requirements.txt | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pod/lti/templates/lti_provider/assignment.html b/pod/lti/templates/lti_provider/assignment.html index f76f52261d..e2f506ceb4 100644 --- a/pod/lti/templates/lti_provider/assignment.html +++ b/pod/lti/templates/lti_provider/assignment.html @@ -31,6 +31,7 @@

{% trans "Activity not found" %}

{%endif%} {% endif %} +{% comment %} +{% endcomment %} diff --git a/pod/lti/views.py b/pod/lti/views.py index d83d497f16..4a2530f70c 100644 --- a/pod/lti/views.py +++ b/pod/lti/views.py @@ -5,17 +5,22 @@ from django.contrib import messages from django.utils.translation import ugettext_lazy as _ +from django.utils.decorators import method_decorator +# from django.views.decorators.csrf import ensure_csrf_cookie +# from django.views.decorators.csrf import csrf_protect, csrf_exempt +from django.views.decorators.csrf import csrf_exempt + from pod.video.models import Video # Create your views here. - +@method_decorator([csrf_exempt], name='dispatch') class LTIAssignmentView(LTIAuthMixin, LoginRequiredMixin, TemplateView): template_name = 'lti_provider/assignment.html' def get_context_data(self, **kwargs): - print(kwargs) + # print(kwargs) # print(self.request, self.request.get_full_url()) activity = kwargs.get("activity") url = "" diff --git a/requirements.txt b/requirements.txt index 2aecd26a72..f0fe46e9d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ elasticsearch==6.3.1 djangorestframework==3.9.1 django-filter==1.1.0 sorl-thumbnail==12.4.1 -django-lti-provider==0.3.3 +django-lti-provider==0.4.0 django-auth-mixins==1.0.1 celery==4.3.0 pandas From f295407e053b3aab00f01825784e1ec7e88dcb73 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Mon, 17 Feb 2020 14:52:41 +0100 Subject: [PATCH 19/33] add SESSION_ENGINE and SESSION_COOKIE_HTTPONLY in settings --- pod/main/settings.py | 3 +++ pod/settings.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pod/main/settings.py b/pod/main/settings.py index 03158af8d3..337f40d8c1 100644 --- a/pod/main/settings.py +++ b/pod/main/settings.py @@ -56,6 +56,9 @@ # SESSION_COOKIE_AGE = 14400 SESSION_EXPIRE_AT_BROWSER_CLOSE = True +# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') +SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" +SESSION_COOKIE_HTTPONLY = True ## # A tuple that lists people who get code error notifications diff --git a/pod/settings.py b/pod/settings.py index 1e8b981c65..728ee34cd3 100644 --- a/pod/settings.py +++ b/pod/settings.py @@ -72,7 +72,6 @@ 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ] - AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', ) From e5c3e3b5301f0ad361c83d8758e083ebd31d77ea Mon Sep 17 00:00:00 2001 From: ptitloup Date: Mon, 17 Feb 2020 15:26:12 +0100 Subject: [PATCH 20/33] add comment just before SESSION_ENGINE and SESSION_COOKIE_HTTPONLY --- pod/main/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pod/main/settings.py b/pod/main/settings.py index 337f40d8c1..7d1ad988c3 100644 --- a/pod/main/settings.py +++ b/pod/main/settings.py @@ -57,8 +57,8 @@ SESSION_COOKIE_AGE = 14400 SESSION_EXPIRE_AT_BROWSER_CLOSE = True # SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') -SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" -SESSION_COOKIE_HTTPONLY = True +# SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" +# SESSION_COOKIE_HTTPONLY = True ## # A tuple that lists people who get code error notifications From 499eab3e7733858aad06220076d23d3a39243c04 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Mon, 17 Feb 2020 15:27:35 +0100 Subject: [PATCH 21/33] lti split assignement view to each request, add post method to get past data and ignore csrf in lti view --- pod/lti/views.py | 92 +++++++++++++++++++++++++++++------------------- pod/urls.py | 8 +++-- 2 files changed, 60 insertions(+), 40 deletions(-) diff --git a/pod/lti/views.py b/pod/lti/views.py index 4a2530f70c..5871090555 100644 --- a/pod/lti/views.py +++ b/pod/lti/views.py @@ -1,51 +1,69 @@ from django.views.generic.base import TemplateView from lti_provider.mixins import LTIAuthMixin -from auth_mixins import LoginRequiredMixin -from django.urls import reverse -from django.contrib import messages -from django.utils.translation import ugettext_lazy as _ +from django.contrib.auth.mixins import LoginRequiredMixin from django.utils.decorators import method_decorator -# from django.views.decorators.csrf import ensure_csrf_cookie -# from django.views.decorators.csrf import csrf_protect, csrf_exempt from django.views.decorators.csrf import csrf_exempt +from django.shortcuts import render + +from django.urls import reverse +from django.contrib import messages +from django.utils.translation import ugettext_lazy as _ from pod.video.models import Video -# Create your views here. @method_decorator([csrf_exempt], name='dispatch') -class LTIAssignmentView(LTIAuthMixin, LoginRequiredMixin, TemplateView): +class LTIAssignmentAddVideoView( + LTIAuthMixin, LoginRequiredMixin, TemplateView): + + redirect_field_name = 'referrer' + template_name = 'lti_provider/assignment.html' + + def get_context_data(self, **kwargs): + context = super(LTIAssignmentAddVideoView, + self).get_context_data(**kwargs) + url = reverse('video_edit') + url += "?is_iframe=true" + context['iframe_url'] = url + context['is_student'] = self.lti.lis_result_sourcedid(self.request), + context['course_title'] = self.lti.course_title(self.request), + context['number'] = 1 + return context + + def post(self, request, *args, **kwargs): + return render( + request, self.template_name, self.get_context_data(**kwargs)) + + +@method_decorator([csrf_exempt], name='dispatch') +class LTIAssignmentGetVideoView( + LTIAuthMixin, LoginRequiredMixin, TemplateView): + redirect_field_name = 'referrer' template_name = 'lti_provider/assignment.html' def get_context_data(self, **kwargs): - # print(kwargs) - # print(self.request, self.request.get_full_url()) - activity = kwargs.get("activity") - url = "" - if activity == 'addvideo': - # "http://localhost:8000/video_edit/?is_iframe=true" - url = reverse('video_edit') - url += "?is_iframe=true" - # url = "/video_edit/?is_iframe=true" - if activity == 'getvideo': - if self.request.session.get("custom_video"): - try: - video = Video.objects.get( - id=self.request.session.get("custom_video")) - # "http://localhost:8000/video_edit/?is_iframe=true" - url = reverse('video', args=(video.slug,)) - url += "?is_iframe=true" - # url = "http:" + video.get_full_url() + "?is_iframe=true" - except Exception: - messages.add_message( - self.request, - messages.ERROR, - _('The video id is not valid.')) - return { - 'iframe_url': url, - 'is_student': self.lti.lis_result_sourcedid(self.request), - 'course_title': self.lti.course_title(self.request), - 'number': 1 - } + context = super(LTIAssignmentGetVideoView, + self).get_context_data(**kwargs) + if self.request.session.get("custom_video"): + try: + video = Video.objects.get( + id=self.request.session.get("custom_video")) + url = reverse('video', args=(video.slug,)) + url += "?is_iframe=true" + context['iframe_url'] = url + except Exception: + messages.add_message( + self.request, + messages.ERROR, + _('The video id is not valid.')) + context['is_student'] = self.lti.lis_result_sourcedid( + self.request), + context['course_title'] = self.lti.course_title(self.request), + context['number'] = 1 + return context + + def post(self, request, *args, **kwargs): + return render( + request, self.template_name, self.get_context_data(**kwargs)) diff --git a/pod/urls.py b/pod/urls.py index c426befa53..c3f624cc7a 100644 --- a/pod/urls.py +++ b/pod/urls.py @@ -35,7 +35,7 @@ from pod.video_search.views import search_videos from pod.recorder.views import add_recording, recorder_notify, claim_record,\ delete_record -from pod.lti.views import LTIAssignmentView +from pod.lti.views import LTIAssignmentAddVideoView, LTIAssignmentGetVideoView USE_CAS = getattr( @@ -169,8 +169,10 @@ # LTI href urlpatterns += [ url(r'^lti/', include('lti_provider.urls')), - url(r'^assignment/(?P[\-\d\w]+)/', - LTIAssignmentView.as_view()), + url(r'^assignment/addvideo/', + LTIAssignmentAddVideoView.as_view()), + url(r'^assignment/getvideo/', + LTIAssignmentGetVideoView.as_view()), ] ## # H5P feature patterns From 3bdeee7272692667da9da3e01d395b5c6d6a2460 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Tue, 18 Feb 2020 08:45:21 +0100 Subject: [PATCH 22/33] add proxy option + skip ssl --- pod/video/management/commands/recorder.py | 123 ++++++++++++---------- 1 file changed, 66 insertions(+), 57 deletions(-) diff --git a/pod/video/management/commands/recorder.py b/pod/video/management/commands/recorder.py index 766c427c9b..03bbc71915 100644 --- a/pod/video/management/commands/recorder.py +++ b/pod/video/management/commands/recorder.py @@ -80,14 +80,29 @@ False ) +PROXIES = getattr( + settings, 'PROXIES', + { + "http": None, + "https": None, + } +) +ALLOW_INSECURE_REQUESTS = getattr( + settings, 'ALLOW_INSECURE_REQUESTS', + False +) + + +def print_if_debug(str): + if DEBUG: + print(str) + def case_full_upload(html_message_error, message_error, recorder, source_file, filename, file_size): - if DEBUG: - print( - "- This video wasn't already processed. Starting the " - "process.") - # Generation of the hashkey, depending on the IP address of the + print_if_debug("- This video wasn't already processed. Starting the " + "process.") + # Generation of the hashkey, depending on the IP address of the # recorder m = hashlib.md5() m.update(recorder.ipunder().encode( @@ -118,41 +133,47 @@ def case_manager_exist(html_message_error, message_error, recorder, source_file + "&key=" + m.hexdigest() + "&course_title=" + filename]) - if DEBUG: - print( + print_if_debug( "- Generate the URL , with haskey, to notify the " "mediacourse recorder's manager : " + urlNotify) - # Make a request on this URL - request = requests.get(urlNotify) + # Make a request on this URL + try: + request = requests.get(urlNotify, proxies=PROXIES) + except Exception: + if(ALLOW_INSECURE_REQUESTS): + request = requests.get(urlNotify, proxies=PROXIES, verify=False) + else: + message_error += "The request on recorder_notfy cannot be" + +" complete. It may be a certificate issue." + +"If you want to ignore the verification of the SSl" + +"certificate set ALLOW_INSECURE_REQUESTS to True" + return html_message_error, message_error # If all (arguments,...) are good, an email is sent to # mediacourse recorder's manager that a video was published if str(request.content)[1:] == "'ok'": # Email was sent. Job is done - if DEBUG: - print( - "- Request was made to URL with success. An " - "email was sent to mediacourse recorder's " - "manager.") - # Save this information in the database, to avoid to + print_if_debug( + "- Request was made to URL with success. An " + "email was sent to mediacourse recorder's " + "manager.") + # Save this information in the database, to avoid to # send multiple emails RecordingFileTreatment.objects.filter( file=source_file, ).update(file_size=file_size, email_sent=True, date_email_sent=timezone .now()) - if DEBUG: - print( - "- Information saved in the " - "recorder_recordingfiletreatment table.") + print_if_debug( + "- Information saved in the " + "recorder_recordingfiletreatment table.") else: # Email wasn't sent, due to an error - if DEBUG: - print( - " - Request was made to URL with failure(" + str( - request.content)[1:] + "). An email wasn't sent to " - "mediacourse recorder's " - "manager.") - # Catch the the error encountered + print_if_debug( + " - Request was made to URL with failure(" + str( + request.content)[1:] + "). An email wasn't sent to " + "mediacourse recorder's " + "manager.") + # Catch the the error encountered html_message_error += "
  • Error : Security error" " for the file " + source_file + ": " + str(request.content)[1:] + \ ".
    >>>Check the publish link : " + urlNotify + \ @@ -183,11 +204,10 @@ def case_no_manager(html_message_error, message_error, recorder, source_file): ">>> You need to assign a user for this" \ " recorder or set the ALLOW_MANUAL" \ "_RECORDING_CLAIMING setting to True." - if DEBUG: - print( - "\n\n*** An email recorder job [Error(s) " - "encountered] was sent to Pod admins, " - "with message : ***" + message_error) + print_if_debug( + "\n\n*** An email recorder job [Error(s) " + "encountered] was sent to Pod admins, " + "with message : ***" + message_error) mail_admins( "Mediacourse job [Error(s) encountered]", message_error, fail_silently=False, @@ -196,32 +216,28 @@ def case_no_manager(html_message_error, message_error, recorder, source_file): RecordingFileTreatment.objects.filter( file=source_file).update( require_manual_claim=True) - if DEBUG: - print( - "- There is no manager for this recording, " - "waiting for claiming") + print_if_debug( + "- There is no manager for this recording, " + "waiting for claiming") return html_message_error, message_error def file_exist(file, file_size, source_file, recorder, message_error, html_message_error, filename): if file.email_sent: - if DEBUG: - print( + print_if_debug( "- An email, with the publication link, was already sent to " "mediacourse recorder's manager. Nothing to do. Stopping the " "process for this file.") elif file.require_manual_claim: - if DEBUG: - print( + print_if_debug( " - Recording already treated, waiting for claiming ...") else: # File size saved in database file_size_in_db = file.file_size # Check if file is complete if file_size > 0 and file_size > file_size_in_db: - if DEBUG: - print( + print_if_debug( "- This video was partially uploaded. Waiting for " "complete file.") file = RecordingFileTreatment.objects.filter( @@ -237,8 +253,7 @@ def file_exist(file, file_size, source_file, recorder, message_error, def recorder_exist(recorder, filename, message_error, html_message_error): # There is a connection between the directory and a recorder - if DEBUG: - print( + print_if_debug( " - This video was published by '" + recorder.name + "' recorder.") # Absolute path of the video @@ -252,8 +267,7 @@ def recorder_exist(recorder, filename, message_error, html_message_error): if recording: # This video was already processed - if DEBUG: - print( + print_if_debug( "- This video was already processed. Nothing to do. Stopping " "the process for this file.") else: @@ -267,8 +281,7 @@ def recorder_exist(recorder, filename, message_error, html_message_error): html_message_error, filename) else: - if DEBUG: - print(" - The job is created.") + print_if_debug(" - The job is created.") # The job is created but no email is sent RecordingFileTreatment.objects.create(file=source_file, recorder=recorder, @@ -282,18 +295,16 @@ def process_directory(html_message_error, message_error, files, root): for filename in files: # Name of the directory dirname = root.split(os.path.sep)[-1] - if DEBUG: - print("\n*** Process the file " + os.path - .join(DEFAULT_RECORDER_PATH, dirname, filename) - + " ***") + print_if_debug("\n*** Process the file " + os.path + .join(DEFAULT_RECORDER_PATH, dirname, filename) + + " ***") # Check if extension is a good extension (videos # extensions + zip) extension = filename.split(".")[-1] valid_ext = VIDEO_ALLOWED_EXTENSIONS + ("zip",) if not (extension in valid_ext and filename != extension): - if DEBUG: - print( + print_if_debug( " - WARNING : " + extension + "is not a valid video " "extension. If it should " "be, add it to the setting " @@ -307,8 +318,7 @@ def process_directory(html_message_error, message_error, files, root): recorder, filename, message_error, html_message_error) else: # There isn't a connection between the directory and a recorder - if DEBUG: - print(" - No recorder found for this file.") + print_if_debug(" - No recorder found for this file.") # Catch the the error encountered html_message_error += "
  • Error : No recorder found for " "the file " + os.path.join( @@ -348,8 +358,7 @@ def handle(self, *args, **options): html_message_error, message_error, files, root) # If there was at least one error, send an email to Pod admins if message_error != "": - if DEBUG: - print( + print_if_debug( "\n\n*** An email Mediacourse recorder job [Error(s) " "encountered] was sent to Pod admins, with message : " "***" + message_error) From 762f346a8d80d535f19a6a09936e9a3ab2883844 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Tue, 18 Feb 2020 08:59:09 +0100 Subject: [PATCH 23/33] fix error message --- pod/video/management/commands/recorder.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pod/video/management/commands/recorder.py b/pod/video/management/commands/recorder.py index 03bbc71915..ef12856a50 100644 --- a/pod/video/management/commands/recorder.py +++ b/pod/video/management/commands/recorder.py @@ -143,10 +143,12 @@ def case_manager_exist(html_message_error, message_error, recorder, if(ALLOW_INSECURE_REQUESTS): request = requests.get(urlNotify, proxies=PROXIES, verify=False) else: - message_error += "The request on recorder_notfy cannot be" - +" complete. It may be a certificate issue." - +"If you want to ignore the verification of the SSl" - +"certificate set ALLOW_INSECURE_REQUESTS to True" + certif_err = "The request on recorder_notfy cannot be complete."\ + "It may be a certificate issue. If you want to ignore"\ + "the verification of the SSl certificate set"\ + "ALLOW_INSECURE_REQUESTS to True" + message_error += certif_err + print_if_debug(certif_err) return html_message_error, message_error # If all (arguments,...) are good, an email is sent to # mediacourse recorder's manager that a video was published From f94d038d5678f6f4d55eb413a533ef2693e7426e Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Tue, 18 Feb 2020 09:43:30 +0100 Subject: [PATCH 24/33] Fix flake8 issues --- pod/video/management/commands/recorder.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pod/video/management/commands/recorder.py b/pod/video/management/commands/recorder.py index ef12856a50..cc3d8e01c6 100644 --- a/pod/video/management/commands/recorder.py +++ b/pod/video/management/commands/recorder.py @@ -227,13 +227,13 @@ def case_no_manager(html_message_error, message_error, recorder, source_file): def file_exist(file, file_size, source_file, recorder, message_error, html_message_error, filename): if file.email_sent: - print_if_debug( - "- An email, with the publication link, was already sent to " - "mediacourse recorder's manager. Nothing to do. Stopping the " - "process for this file.") + print_if_debug( + "- An email, with the publication link, was already sent to " + "mediacourse recorder's manager. Nothing to do. Stopping the " + "process for this file.") elif file.require_manual_claim: - print_if_debug( - " - Recording already treated, waiting for claiming ...") + print_if_debug( + " - Recording already treated, waiting for claiming ...") else: # File size saved in database file_size_in_db = file.file_size @@ -269,9 +269,9 @@ def recorder_exist(recorder, filename, message_error, html_message_error): if recording: # This video was already processed - print_if_debug( - "- This video was already processed. Nothing to do. Stopping " - "the process for this file.") + print_if_debug( + "- This video was already processed. Nothing to do. Stopping " + "the process for this file.") else: # Size of the existant file file_size = os.path.getsize(source_file) From 9f341e16cfe005870e9a821a3507ceb2bd7786b6 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Tue, 18 Feb 2020 10:08:06 +0100 Subject: [PATCH 25/33] rename PROXIES setting --- pod/video/management/commands/recorder.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pod/video/management/commands/recorder.py b/pod/video/management/commands/recorder.py index cc3d8e01c6..0692c1e2b5 100644 --- a/pod/video/management/commands/recorder.py +++ b/pod/video/management/commands/recorder.py @@ -80,8 +80,8 @@ False ) -PROXIES = getattr( - settings, 'PROXIES', +SELF_REQUESTS_PROXIES = getattr( + settings, 'SELF_REQUESTS_PROXIES', { "http": None, "https": None, @@ -138,10 +138,11 @@ def case_manager_exist(html_message_error, message_error, recorder, "mediacourse recorder's manager : " + urlNotify) # Make a request on this URL try: - request = requests.get(urlNotify, proxies=PROXIES) + request = requests.get(urlNotify, proxies=SELF_REQUESTS_PROXIES) except Exception: if(ALLOW_INSECURE_REQUESTS): - request = requests.get(urlNotify, proxies=PROXIES, verify=False) + request = requests.get(urlNotify, proxies=SELF_REQUESTS_PROXIES, + verify=False) else: certif_err = "The request on recorder_notfy cannot be complete."\ "It may be a certificate issue. If you want to ignore"\ From 66c65b49e61a4a49f63e4615af88117fc577a5dd Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Tue, 18 Feb 2020 10:38:53 +0100 Subject: [PATCH 26/33] Add select2 in missing user field --- pod/playlist/models.py | 3 ++- pod/podfile/models.py | 3 ++- pod/recorder/models.py | 12 +++++++----- pod/video/models.py | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pod/playlist/models.py b/pod/playlist/models.py index 70a26abecc..df1f6c4a68 100644 --- a/pod/playlist/models.py +++ b/pod/playlist/models.py @@ -5,6 +5,7 @@ from django.utils.translation import ugettext as _ from pod.video.models import Video from pod.main.models import get_nextautoincrement +from select2 import fields as select2_fields class Playlist(models.Model): @@ -16,7 +17,7 @@ class Playlist(models.Model): help_text=_('Used to access this instance, the "slug" is a short' + ' label containing only letters, numbers, underscore' + ' or dash top.')) - owner = models.ForeignKey(User, verbose_name=_('Owner')) + owner = select2_fields.ForeignKey(User, verbose_name=_('Owner')) description = models.TextField( _('Description'), max_length=255, diff --git a/pod/podfile/models.py b/pod/podfile/models.py index 6a0d1d0b39..c9b2685d1f 100644 --- a/pod/podfile/models.py +++ b/pod/podfile/models.py @@ -7,6 +7,7 @@ from django.dispatch import receiver from django.db.models.signals import post_save from django.contrib.auth.models import Group +from select2 import fields as select2_fields from itertools import chain from operator import attrgetter @@ -26,7 +27,7 @@ class UserFolder(models.Model): name = models.CharField(_('Name'), max_length=255) # parent = models.ForeignKey( # 'self', blank=True, null=True, related_name='children') - owner = models.ForeignKey(User, verbose_name=_('Owner')) + owner = select2_fields.ForeignKey(User, verbose_name=_('Owner')) created_at = models.DateTimeField(auto_now_add=True) groups = models.ManyToManyField( Group, blank=True, verbose_name=_('Groups'), diff --git a/pod/recorder/models.py b/pod/recorder/models.py index b33ad24efb..fe203df8e4 100644 --- a/pod/recorder/models.py +++ b/pod/recorder/models.py @@ -10,6 +10,7 @@ from django.db.models.signals import post_save from django.utils import timezone from django.core.exceptions import ValidationError +from select2 import fields as select2_fields from pod.video.models import Type @@ -53,7 +54,7 @@ class Recorder(models.Model): salt = models.CharField(_('salt'), max_length=50, blank=True, help_text=_('Recorder salt.')) # Manager of the recorder who received mails - user = models.ForeignKey( + user = select2_fields.ForeignKey( User, on_delete=models.CASCADE, limit_choices_to={'is_staff': True}, help_text=_( 'Manager of this recorder. This manager will receive recorder ' @@ -99,10 +100,11 @@ class Recording(models.Model): default=DEFAULT_RECORDER_ID, help_text=_('Recorder that made this ' 'recording.')) - user = models.ForeignKey(User, on_delete=models.CASCADE, - limit_choices_to={'is_staff': True}, - default=DEFAULT_RECORDER_USER_ID, - help_text=_("User who has made the recording")) + user = select2_fields.ForeignKey(User, on_delete=models.CASCADE, + limit_choices_to={'is_staff': True}, + default=DEFAULT_RECORDER_USER_ID, + help_text=_ + ("User who has made the recording")) title = models.CharField(_('title'), max_length=200, unique=True) type = models.CharField(_('Recording Type'), max_length=50, choices=RECORDER_TYPE, diff --git a/pod/video/models.py b/pod/video/models.py index c423d3861c..904675f071 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -1200,7 +1200,7 @@ def __str__(self): class Notes(models.Model): - user = models.ForeignKey(User) + user = select2_fields.ForeignKey(User) video = models.ForeignKey(Video) note = models.TextField(_('Note'), null=True, blank=True) @@ -1214,7 +1214,7 @@ def __str__(self): class AdvancedNotes(models.Model): - user = models.ForeignKey(User) + user = select2_fields.ForeignKey(User) video = models.ForeignKey(Video) status = models.CharField( _('Note availibility level'), max_length=1, @@ -1268,7 +1268,7 @@ def timestampstr(self): class NoteComments(models.Model): - user = models.ForeignKey(User) + user = select2_fields.ForeignKey(User) parentNote = models.ForeignKey(AdvancedNotes) parentCom = models.ForeignKey( "NoteComments", blank=True, null=True) From 61c534980f267e230c1350cac47329ab115547df Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Tue, 18 Feb 2020 11:22:11 +0100 Subject: [PATCH 27/33] Add select2 in some fields --- pod/chapter/models.py | 3 ++- pod/completion/models.py | 9 +++++---- pod/enrichment/models.py | 11 ++++++----- pod/live/models.py | 3 ++- pod/playlist/models.py | 4 ++-- pod/podfile/models.py | 6 +++--- pod/video/models.py | 24 ++++++++++-------------- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pod/chapter/models.py b/pod/chapter/models.py index f3e6ee01f7..c7c52f86af 100644 --- a/pod/chapter/models.py +++ b/pod/chapter/models.py @@ -7,10 +7,11 @@ from pod.video.models import Video from pod.main.models import get_nextautoincrement +from select2 import fields as select2_fields class Chapter(models.Model): - video = models.ForeignKey(Video, verbose_name=_('video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('video')) title = models.CharField(_('title'), max_length=100) slug = models.SlugField( _('slug'), diff --git a/pod/completion/models.py b/pod/completion/models.py index b1284b2161..3e42f94e05 100644 --- a/pod/completion/models.py +++ b/pod/completion/models.py @@ -8,6 +8,7 @@ from ckeditor.fields import RichTextField from pod.video.models import Video from pod.main.models import get_nextautoincrement +from select2 import fields as select2_fields if getattr(settings, 'USE_PODFILE', False): FILEPICKER = True @@ -47,7 +48,7 @@ class Contributor(models.Model): - video = models.ForeignKey(Video, verbose_name=_('video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('video')) name = models.CharField(_('lastname / firstname'), max_length=200) email_address = models.EmailField( _('mail'), null=True, blank=True, default='') @@ -110,7 +111,7 @@ def get_noscript_mail(self): class Document(models.Model): - video = models.ForeignKey(Video, verbose_name=_('Video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('Video')) document = models.ForeignKey( CustomFileModel, null=True, @@ -161,7 +162,7 @@ def __str__(self): class Track(models.Model): - video = models.ForeignKey(Video, verbose_name=_('Video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('Video')) kind = models.CharField( _('Kind'), max_length=10, @@ -238,7 +239,7 @@ class Overlay(models.Model): ('left', _(u'left')), ) - video = models.ForeignKey(Video, verbose_name=_('Video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('Video')) title = models.CharField(_('Title'), max_length=100) slug = models.SlugField( _('Slug'), diff --git a/pod/enrichment/models.py b/pod/enrichment/models.py index 6befea15e4..800e8828eb 100644 --- a/pod/enrichment/models.py +++ b/pod/enrichment/models.py @@ -13,6 +13,7 @@ from pod.video.models import Video from pod.main.models import get_nextautoincrement +from select2 import fields as select2_fields import os import datetime @@ -110,7 +111,7 @@ class Enrichment(models.Model): ('embed', _("embed")), ) - video = models.ForeignKey(Video, verbose_name=_('video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('video')) title = models.CharField(_('title'), max_length=100) slug = models.SlugField( _('slug'), @@ -305,10 +306,10 @@ def verify_attributs(self): class EnrichmentGroup(models.Model): - video = models.OneToOneField(Video, verbose_name=_('Video'), - # editable=False, null=True, - on_delete=models.CASCADE) - groups = models.ManyToManyField( + video = select2_fields.OneToOneField(Video, verbose_name=_('Video'), + # editable=False, null=True, + on_delete=models.CASCADE) + groups = select2_fields.ManyToManyField( Group, blank=True, verbose_name=_('Groups'), help_text=_('Select one or more groups who' ' can access to the' diff --git a/pod/live/models.py b/pod/live/models.py index e925c6905b..4cff8fd2ca 100644 --- a/pod/live/models.py +++ b/pod/live/models.py @@ -4,6 +4,7 @@ from ckeditor.fields import RichTextField from django.template.defaultfilters import slugify from pod.video.models import Video +from select2 import fields as select2_fields if getattr(settings, 'USE_PODFILE', False): from pod.podfile.models import CustomImageModel @@ -60,7 +61,7 @@ class Broadcaster(models.Model): verbose_name=_('Poster')) url = models.URLField(_('URL'), help_text=_( 'Url of the stream'), unique=True) - video_on_hold = models.ForeignKey(Video, help_text=_( + video_on_hold = select2_fields.ForeignKey(Video, help_text=_( 'This video will be displayed when there is no live stream.'), blank=True, null=True, diff --git a/pod/playlist/models.py b/pod/playlist/models.py index df1f6c4a68..39a321a244 100644 --- a/pod/playlist/models.py +++ b/pod/playlist/models.py @@ -75,8 +75,8 @@ def videos(self): class PlaylistElement(models.Model): - playlist = models.ForeignKey(Playlist, verbose_name=_('Playlist')) - video = models.ForeignKey(Video, verbose_name=_('Video')) + playlist = select2_fields.ForeignKey(Playlist, verbose_name=_('Playlist')) + video = select2_fields.ForeignKey(Video, verbose_name=_('Video')) position = models.PositiveSmallIntegerField( _('Position'), default=1, diff --git a/pod/podfile/models.py b/pod/podfile/models.py index c9b2685d1f..a235d3d61a 100644 --- a/pod/podfile/models.py +++ b/pod/podfile/models.py @@ -29,7 +29,7 @@ class UserFolder(models.Model): # 'self', blank=True, null=True, related_name='children') owner = select2_fields.ForeignKey(User, verbose_name=_('Owner')) created_at = models.DateTimeField(auto_now_add=True) - groups = models.ManyToManyField( + groups = select2_fields.ManyToManyField( Group, blank=True, verbose_name=_('Groups'), help_text=_('Select one or more groups who' ' can access in read only to this folder')) @@ -99,9 +99,9 @@ def get_upload_path_files(instance, filename): class BaseFileModel(models.Model): name = models.CharField(_('Name'), max_length=255) description = models.CharField(max_length=255, blank=True) - folder = models.ForeignKey(UserFolder) + folder = select2_fields.ForeignKey(UserFolder) uploaded_at = models.DateTimeField(auto_now_add=True) - created_by = models.ForeignKey( + created_by = select2_fields.ForeignKey( User, related_name='%(app_label)s_%(class)s_created', on_delete=models.CASCADE) diff --git a/pod/video/models.py b/pod/video/models.py index 904675f071..f3836d58c8 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -287,7 +287,7 @@ class Theme(models.Model): blank=True, null=True, verbose_name=_('Headband')) - channel = models.ForeignKey( + channel = select2_fields.ForeignKey( 'Channel', related_name='themes', verbose_name=_('Channel')) def __str__(self): @@ -505,21 +505,17 @@ class Video(models.Model): 'Separate tags with spaces, ' 'enclose the tags consist of several words in quotation marks.'), verbose_name=_('Tags')) - discipline = models.ManyToManyField( + discipline = select2_fields.ManyToManyField( Discipline, blank=True, - verbose_name=_('Disciplines'), - help_text=_('Hold down "Control", or "Command" ' - 'on a Mac, to select more than one.')) + verbose_name=_('Disciplines')) licence = models.CharField( _('Licence'), max_length=8, choices=LICENCE_CHOICES, blank=True, null=True) - channel = models.ManyToManyField( + channel = select2_fields.ManyToManyField( Channel, verbose_name=_('Channels'), - blank=True, - help_text=_('Hold down "Control", or "Command" ' - 'on a Mac, to select more than one.')) + blank=True) theme = models.ManyToManyField( Theme, verbose_name=_('Themes'), @@ -545,7 +541,7 @@ class Video(models.Model): 'If this box is checked, ' 'the video will only be accessible to authenticated users.'), default=False) - restrict_access_to_groups = models.ManyToManyField( + restrict_access_to_groups = select2_fields.ManyToManyField( Group, blank=True, verbose_name=_('Groups'), help_text=_('Select one or more groups who can access to this video')) password = models.CharField( @@ -1126,7 +1122,7 @@ class PlaylistVideo(models.Model): _('Name'), max_length=10, choices=ENCODING_CHOICES, default="360p", help_text="Please use the only format in encoding choices :" + " %s" % ' '.join(str(key) for key, value in ENCODING_CHOICES)) - video = models.ForeignKey(Video, verbose_name=_('Video')) + video = select2_fields.ForeignKey(Video, verbose_name=_('Video')) encoding_format = models.CharField( _('Format'), max_length=22, choices=FORMAT_CHOICES, default="application/x-mpegURL", @@ -1201,7 +1197,7 @@ def __str__(self): class Notes(models.Model): user = select2_fields.ForeignKey(User) - video = models.ForeignKey(Video) + video = select2_fields.ForeignKey(Video) note = models.TextField(_('Note'), null=True, blank=True) class Meta: @@ -1215,7 +1211,7 @@ def __str__(self): class AdvancedNotes(models.Model): user = select2_fields.ForeignKey(User) - video = models.ForeignKey(Video) + video = select2_fields.ForeignKey(Video) status = models.CharField( _('Note availibility level'), max_length=1, choices=NOTES_STATUS, default="0", @@ -1305,7 +1301,7 @@ def clean(self): class VideoToDelete(models.Model): date_deletion = models.DateField( _('Date for deletion'), default=date.today, unique=True) - video = models.ManyToManyField( + video = select2_fields.ManyToManyField( Video, verbose_name=_('Videos'), help_text=_('Hold down "Control", or "Command" ' From ac77b6dc3bb47b4eb0c935fb493e96d0003d5c52 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 19 Feb 2020 08:48:21 +0100 Subject: [PATCH 28/33] Remove useless help text due to select2 --- pod/video/models.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pod/video/models.py b/pod/video/models.py index f3836d58c8..149fe66e01 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -1303,9 +1303,7 @@ class VideoToDelete(models.Model): _('Date for deletion'), default=date.today, unique=True) video = select2_fields.ManyToManyField( Video, - verbose_name=_('Videos'), - help_text=_('Hold down "Control", or "Command" ' - 'on a Mac, to select more than one.')) + verbose_name=_('Videos')) class Meta: verbose_name = _("Video to delete") From f50dfa7b16ffc106f3612f887e687c1799821d13 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 19 Feb 2020 11:04:42 +0100 Subject: [PATCH 29/33] Started to fix podfile view in admin + fix tests --- pod/authentication/admin.py | 5 +++-- pod/completion/admin.py | 10 ++++++---- pod/enrichment/admin.py | 10 ++++++---- pod/live/admin.py | 10 ++++++---- pod/video/admin.py | 22 ++++++++++++++-------- pod/video/forms.py | 2 +- 6 files changed, 36 insertions(+), 23 deletions(-) diff --git a/pod/authentication/admin.py b/pod/authentication/admin.py index b153ba10ab..f385aaa5d1 100644 --- a/pod/authentication/admin.py +++ b/pod/authentication/admin.py @@ -40,12 +40,13 @@ def get_fields(self, request, obj=None): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'podfile/js/filewidget.js', + 'js/main.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') diff --git a/pod/completion/admin.py b/pod/completion/admin.py index b7a4e0123b..1495157e01 100644 --- a/pod/completion/admin.py +++ b/pod/completion/admin.py @@ -51,12 +51,13 @@ class DocumentAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'podfile/js/filewidget.js', + 'js/main.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') @@ -85,12 +86,13 @@ class TrackAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') diff --git a/pod/enrichment/admin.py b/pod/enrichment/admin.py index f422ce0012..8498e2395a 100644 --- a/pod/enrichment/admin.py +++ b/pod/enrichment/admin.py @@ -23,12 +23,13 @@ class EnrichmentAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') @@ -59,12 +60,13 @@ def get_file_name(self, obj): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') diff --git a/pod/live/admin.py b/pod/live/admin.py index eabf155d8c..cf03839118 100644 --- a/pod/live/admin.py +++ b/pod/live/admin.py @@ -16,12 +16,13 @@ class BuildingAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') @@ -35,12 +36,13 @@ class BroadcasterAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') diff --git a/pod/video/admin.py b/pod/video/admin.py index 065dea4a02..862b1bab78 100644 --- a/pod/video/admin.py +++ b/pod/video/admin.py @@ -168,8 +168,10 @@ def transcript_video(self, request, queryset): class Media: css = { "all": ( + 'bootstrap-4/css/bootstrap.min.css', 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -221,12 +223,13 @@ def get_form(self, request, obj=None, **kwargs): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') @@ -240,12 +243,13 @@ class ThemeAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') @@ -257,12 +261,13 @@ class TypeAdmin(TranslationAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') @@ -274,12 +279,13 @@ class DisciplineAdmin(TranslationAdmin): class Media: css = { "all": ( - 'css/podfile.css', + 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', ) } js = ( - 'js/filewidget.js', + 'js/main.js', + 'podfile/js/filewidget.js', 'feather-icons/feather.min.js', 'bootstrap-4/js/bootstrap.min.js') diff --git a/pod/video/forms.py b/pod/video/forms.py index 049f643b60..575bac13ff 100644 --- a/pod/video/forms.py +++ b/pod/video/forms.py @@ -390,7 +390,7 @@ def clean(self): settings.LANGUAGE_CODE ] = cleaned_data['title'] if ('restrict_access_to_groups' in cleaned_data.keys() - and cleaned_data['restrict_access_to_groups'].count() > 0): + and len(cleaned_data['restrict_access_to_groups']) > 0): cleaned_data['is_restricted'] = True def __init__(self, *args, **kwargs): From 9334c9123b0f63dcd6d68e2d76c86edc1b79cd57 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 19 Feb 2020 11:24:23 +0100 Subject: [PATCH 30/33] remove podfile usage + fix podfile view in all admins + fix admin body using pod.css --- pod/authentication/admin.py | 2 +- pod/completion/admin.py | 4 ++-- pod/enrichment/admin.py | 4 ++-- pod/live/admin.py | 4 ++-- pod/main/static/css/pod.css | 5 +++++ pod/video/admin.py | 9 ++++----- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pod/authentication/admin.py b/pod/authentication/admin.py index f385aaa5d1..ab729e69c0 100644 --- a/pod/authentication/admin.py +++ b/pod/authentication/admin.py @@ -40,7 +40,7 @@ def get_fields(self, request, obj=None): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } diff --git a/pod/completion/admin.py b/pod/completion/admin.py index 1495157e01..010cd75c6b 100644 --- a/pod/completion/admin.py +++ b/pod/completion/admin.py @@ -51,7 +51,7 @@ class DocumentAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } @@ -86,7 +86,7 @@ class TrackAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } diff --git a/pod/enrichment/admin.py b/pod/enrichment/admin.py index 8498e2395a..06118f986e 100644 --- a/pod/enrichment/admin.py +++ b/pod/enrichment/admin.py @@ -23,7 +23,7 @@ class EnrichmentAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } @@ -60,7 +60,7 @@ def get_file_name(self, obj): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } diff --git a/pod/live/admin.py b/pod/live/admin.py index cf03839118..6a01e2d87b 100644 --- a/pod/live/admin.py +++ b/pod/live/admin.py @@ -16,7 +16,7 @@ class BuildingAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } @@ -36,7 +36,7 @@ class BroadcasterAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css index 15d2113602..defa4d4f9c 100755 --- a/pod/main/static/css/pod.css +++ b/pod/main/static/css/pod.css @@ -1,3 +1,8 @@ + +body[data-admin-utc-offset] +{ + padding-top: 0; +} body { padding-top: 3.5rem; } diff --git a/pod/video/admin.py b/pod/video/admin.py index 862b1bab78..70b62ef5fb 100644 --- a/pod/video/admin.py +++ b/pod/video/admin.py @@ -169,7 +169,6 @@ class Media: css = { "all": ( 'bootstrap-4/css/bootstrap.min.css', - 'podfile/css/podfile.css', 'bootstrap-4/css/bootstrap-grid.css', 'css/pod.css' ) @@ -223,7 +222,7 @@ def get_form(self, request, obj=None, **kwargs): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } @@ -243,7 +242,7 @@ class ThemeAdmin(admin.ModelAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } @@ -261,7 +260,7 @@ class TypeAdmin(TranslationAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } @@ -279,7 +278,7 @@ class DisciplineAdmin(TranslationAdmin): class Media: css = { "all": ( - 'podfile/css/podfile.css', + 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', ) } From a4a098804452c8cc1563869175090b3ac0c1111d Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 19 Feb 2020 11:33:56 +0100 Subject: [PATCH 31/33] import pod.css in admin views to allow full podfile modal size --- pod/authentication/admin.py | 1 + pod/completion/admin.py | 2 ++ pod/enrichment/admin.py | 2 ++ pod/live/admin.py | 2 ++ pod/video/admin.py | 4 ++++ 5 files changed, 11 insertions(+) diff --git a/pod/authentication/admin.py b/pod/authentication/admin.py index ab729e69c0..a7a2def45b 100644 --- a/pod/authentication/admin.py +++ b/pod/authentication/admin.py @@ -42,6 +42,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( diff --git a/pod/completion/admin.py b/pod/completion/admin.py index 010cd75c6b..6a0cf2ad91 100644 --- a/pod/completion/admin.py +++ b/pod/completion/admin.py @@ -53,6 +53,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -88,6 +89,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( diff --git a/pod/enrichment/admin.py b/pod/enrichment/admin.py index 06118f986e..0e11e6e871 100644 --- a/pod/enrichment/admin.py +++ b/pod/enrichment/admin.py @@ -25,6 +25,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -62,6 +63,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( diff --git a/pod/live/admin.py b/pod/live/admin.py index 6a01e2d87b..d08e218f22 100644 --- a/pod/live/admin.py +++ b/pod/live/admin.py @@ -18,6 +18,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -38,6 +39,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( diff --git a/pod/video/admin.py b/pod/video/admin.py index 70b62ef5fb..3df70c451e 100644 --- a/pod/video/admin.py +++ b/pod/video/admin.py @@ -224,6 +224,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -244,6 +245,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -262,6 +264,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( @@ -280,6 +283,7 @@ class Media: "all": ( 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'css/pod.css' ) } js = ( From e1d1577b4adb428e3fb8e1734ed3bae1a4d06209 Mon Sep 17 00:00:00 2001 From: JoshuaBaubry Date: Wed, 19 Feb 2020 13:34:41 +0100 Subject: [PATCH 32/33] Fix row table in video admin --- pod/main/static/css/pod.css | 3 +++ pod/video/admin.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pod/main/static/css/pod.css b/pod/main/static/css/pod.css index defa4d4f9c..4bcaa15e89 100755 --- a/pod/main/static/css/pod.css +++ b/pod/main/static/css/pod.css @@ -1,4 +1,7 @@ +tr ,.rowl{ + display: table-row !important; +} body[data-admin-utc-offset] { padding-top: 0; diff --git a/pod/video/admin.py b/pod/video/admin.py index 3df70c451e..9c0000d9a4 100644 --- a/pod/video/admin.py +++ b/pod/video/admin.py @@ -168,9 +168,9 @@ def transcript_video(self, request, queryset): class Media: css = { "all": ( + 'css/pod.css', 'bootstrap-4/css/bootstrap.min.css', - 'bootstrap-4/css/bootstrap-grid.css', - 'css/pod.css' + 'bootstrap-4/css/bootstrap-grid.css' ) } js = ( @@ -281,8 +281,8 @@ class DisciplineAdmin(TranslationAdmin): class Media: css = { "all": ( - 'bootstrap-4/css/bootstrap.min.css', 'bootstrap-4/css/bootstrap-grid.css', + 'bootstrap-4/css/bootstrap.min.css', 'css/pod.css' ) } From 97550888f84adfa5dc2e05952b929ee1eb164e8c Mon Sep 17 00:00:00 2001 From: Ptitloup Date: Wed, 19 Feb 2020 15:01:00 +0100 Subject: [PATCH 33/33] Update settings.py Bump VERSION to 2.5.1 --- pod/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pod/settings.py b/pod/settings.py index 728ee34cd3..9ed64384cc 100644 --- a/pod/settings.py +++ b/pod/settings.py @@ -10,7 +10,7 @@ ## # Version of the project # -VERSION = '2.5.0' +VERSION = '2.5.1' ## # Installed applications list