Merge branch 'add_video_uploader' into 'develop'

Add video uploader

See merge request !75

courses/migrations/0030_video_file.py

+# Generated by Django 2.2.24 on 2021-07-28 12:35
+
+import courses.videos.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0029_auto_20210719_2107'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='video',
+            name='file',
+            field=models.FileField(default=None, null=True, upload_to=courses.videos.models.get_upload_path),
+        ),
+    ]

courses/translation.py

@@ -2,6 +2,7 @@ from modeltranslation.translator import register, TranslationOptions
 from .models import Course, Lesson, Unit, ProfessorMessage
 from .course_material.models import CourseMaterial, File
 from .stats.models import AccessibleArea
+#from .videos.models import VideoFile
 from .certification.models import CertificateTemplate
 
 
@@ -49,3 +50,7 @@ class CertificateTemplateTranslationOptions(TranslationOptions):
               'base_logo', 'signature', 'second_signature', 'site_logo',
               'organization_name', 'text')
 
+
+#@register(VideoFile)
+#class VideoFileTranslationOptions(TranslationOptions):
+#    fields = ('name', 'file', 'video')

courses/urls.py

@@ -15,6 +15,7 @@ from .views import (
     CoursePictureUploadViewSet,
 
 )
+from .videos.views import VideoViewSet
 from .course_material.views import CourseMaterialViewSet, CourseMaterialFileViewSet
 from .import_export.views import ExportCourseView, ImportCourseView
 from courses.workspaces.views import (
@@ -54,6 +55,7 @@ router.register(r'my-courses', MyCoursesViewSet, base_name='my-courses')
 router.register(r'course_material', CourseMaterialViewSet, base_name='course_material')
 router.register(r'course_material_file', CourseMaterialFileViewSet, base_name='course_material_file')
 router.register(r'course-by-slug', CourseBySlugViewSet, base_name='course_by_slug'),
+router.register(r'videos', VideoViewSet, base_name='course_by_slug'),
 
 # Lessons
 router.register(r'course-lessons/(?P<course_id>[1-9][0-9]*)', LessonViewSet, base_name='lessons')

courses/videos/models.py

 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.utils.text import slugify
+
+
+def get_upload_path(instance, filename):
+    filename, fileextension = filename.split(".", 2)
+    filename = slugify(filename.split("/", 2)[-1])
+    return 'course_videos/{0}.{1}'.format(filename, fileextension)
 
 class Video(models.Model):
     name = models.CharField(
@@ -8,6 +15,11 @@ class Video(models.Model):
     youtube_id = models.CharField(
         max_length=100,
     )
+    file = models.FileField(
+        upload_to=get_upload_path,
+        default=None,
+        null=True,
+    )
 
     class Meta:
         verbose_name = _('Video')

courses/videos/serializers.py

 from rest_framework import serializers
-
+from modeltranslation.utils import fallbacks
 from .models import Video
 
 
 class VideoSerializer(serializers.ModelSerializer):
 
+    file = serializers.FileField(read_only=True)
+
+    class Meta:
+        model = Video
+        fields = ('id', 'name', 'youtube_id', 'file',)
+
+    #def get_file(self, obj):
+    #    with fallbacks(False):
+    #        files = VideoFileSerializer(required=False, allow_null=True, read_only=True, **{'context': self.context}).data
+    #        files = [f for f in files if f['file'] != None]
+    #        return files
+
+class VideoFileSerializer(serializers.ModelSerializer):
+
     class Meta:
         model = Video
-        fields = ('id', 'name', 'youtube_id',)
+        fields = ('id', 'file',)

courses/videos/views.py

 from django.shortcuts import render
 
-# Create your views here.
+from rest_framework import viewsets
+
+from courses.videos.models import Video
+from courses.videos.serializers import VideoFileSerializer
+
+from courses.permissions import (
+    IsProfessorCoordinatorOrAdminPermissionOrReadOnly,
+)
+
+
+class VideoViewSet(viewsets.ModelViewSet):
+
+    model = Video
+    queryset = Video.objects.all()
+    serializer_class = VideoFileSerializer
+    permission_classes = (IsProfessorCoordinatorOrAdminPermissionOrReadOnly,)

courses/views.py

@@ -321,4 +321,4 @@ class CoursePictureUploadViewSet(viewsets.ModelViewSet):
             serializer.save()
             return Response(serializer.data, status=200)
         else:
-            return Response(serializer.errors, status=400)
\ No newline at end of file
+            return Response(serializer.errors, status=400)