Video.js fixes and improvements after major upgrade (#1413)

This PR updates Django core version and also brings html pages support (that admins can create)

.github/workflows/docker-build-push.yml

@@ -15,15 +15,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Docker meta
+      - name: Login to Docker Hub
-        id: meta
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker meta for base image
+        id: meta-base
         uses: docker/metadata-action@v4
         with:
-          # List of Docker images to use as base name for tags
           images: |
             mediacms/mediacms
-          # Generate Docker tags based on the following events/attributes
-          # Set latest tag for default branch
           tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=semver,pattern={{version}}
@@ -37,16 +40,39 @@ jobs:
             org.opencontainers.image.source=https://github.com/mediacms-io/mediacms
             org.opencontainers.image.licenses=AGPL-3.0
 
-      - name: Login to Docker Hub
+      - name: Docker meta for full image
-        uses: docker/login-action@v2.2.0
+        id: meta-full
+        uses: docker/metadata-action@v4
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          images: |
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+            mediacms/mediacms
+          tags: |
+            type=raw,value=full,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=semver,pattern={{version}}-full
+            type=semver,pattern={{major}}.{{minor}}-full
+            type=semver,pattern={{major}}-full
+          labels: |
+            org.opencontainers.image.title=MediaCMS Full
+            org.opencontainers.image.description=MediaCMS is a modern, fully featured open source video and media CMS, written in Python/Django and React, featuring a REST API. This is the full version with additional dependencies.
+            org.opencontainers.image.vendor=MediaCMS
+            org.opencontainers.image.url=https://mediacms.io/
+            org.opencontainers.image.source=https://github.com/mediacms-io/mediacms
+            org.opencontainers.image.licenses=AGPL-3.0
 
-      - name: Build and push
+      - name: Build and push full image
         uses: docker/build-push-action@v4
         with:
           context: .
+          target: full
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta-full.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta-full.outputs.labels }}
+
+      - name: Build and push base image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          target: base
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-base.outputs.tags }}
+          labels: ${{ steps.meta-base.outputs.labels }}

.gitignore

@@ -5,6 +5,7 @@ media_files/original/
 media_files/hls/
 media_files/chunks/
 media_files/uploads/
+media_files/tinymce_media/
 postgres_data/
 celerybeat-schedule
 logs/
@@ -18,3 +19,19 @@ static/drf-yasg
 cms/local_settings.py
 deploy/docker/local_settings.py
 yt.readme.md
+/frontend-tools/video-editor/node_modules
+/frontend-tools/video-editor/client/node_modules
+/static_collected
+/frontend-tools/video-editor-v1
+frontend-tools/.DS_Store
+static/video_editor/videos/sample-video-30s.mp4
+static/video_editor/videos/sample-video-37s.mp4
+/frontend-tools/video-editor-v2
+.DS_Store
+static/video_editor/videos/sample-video-10m.mp4
+static/video_editor/videos/sample-video-10s.mp4
+frontend-tools/video-js/public/videos/sample-video-white.mp4
+frontend-tools/video-editor/client/public/videos/sample-video.mp3
+frontend-tools/chapters-editor/client/public/videos/sample-video.mp3
+static/chapters_editor/videos/sample-video.mp3
+static/video_editor/videos/sample-video.mp3

.prettierignore

@@ -0,0 +1,3 @@
+/templates/cms/*
+/templates/*.html
+*.scss

.prettierrc

@@ -0,0 +1,21 @@
+{
+    "semi": true,
+    "singleQuote": true,
+    "printWidth": 120,
+    "tabWidth": 4,
+    "useTabs": false,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "bracketSameLine": false,
+    "arrowParens": "always",
+    "endOfLine": "lf",
+    "embeddedLanguageFormatting": "auto",
+    "overrides": [
+        {
+            "files": ["*.css", "*.scss"],
+            "options": {
+                "singleQuote": false
+            }
+        }
+    ]
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-bookworm AS build-image
+FROM python:3.13.5-slim-bookworm AS build-image
 
 # Install system dependencies needed for downloading and extracting
 RUN apt-get update -y && \
@@ -7,9 +7,9 @@ RUN apt-get update -y && \
     apt-get purge --auto-remove && \
     apt-get clean
 
-# Install ffmpeg
+RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
-RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+
-    mkdir -p ffmpeg-tmp && \
+RUN mkdir -p ffmpeg-tmp && \
     tar -xf ffmpeg-release-amd64-static.tar.xz --strip-components 1 -C ffmpeg-tmp && \
     cp -v ffmpeg-tmp/ffmpeg ffmpeg-tmp/ffprobe ffmpeg-tmp/qt-faststart /usr/local/bin && \
     rm -rf ffmpeg-tmp ffmpeg-release-amd64-static.tar.xz
@@ -23,8 +23,8 @@ RUN mkdir -p /home/mediacms.io/bento4 && \
     rm -rf /home/mediacms.io/bento4/docs && \
     rm Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip
 
-############ RUNTIME IMAGE ############
+############ BASE RUNTIME IMAGE ############
-FROM python:3.13-bookworm AS runtime_image
+FROM python:3.13.5-slim-bookworm AS base
 
 SHELL ["/bin/bash", "-c"]
 
@@ -34,13 +34,47 @@ ENV CELERY_APP='cms'
 ENV VIRTUAL_ENV=/home/mediacms.io
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-# Install runtime system dependencies
+# Install system dependencies first
 RUN apt-get update -y && \
     apt-get -y upgrade && \
-    apt-get install --no-install-recommends supervisor nginx imagemagick procps -y && \
+    apt-get install --no-install-recommends -y \
-    rm -rf /var/lib/apt/lists/* && \
+        supervisor \
-    apt-get purge --auto-remove && \
+        nginx \
-    apt-get clean
+        imagemagick \
+        procps \
+        build-essential \
+        pkg-config \
+        zlib1g-dev \
+        zlib1g \
+        libxml2-dev \
+        libxmlsec1-dev \
+        libxmlsec1-openssl \
+        libpq-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up virtualenv first
+RUN mkdir -p /home/mediacms.io/mediacms/{logs} && \
+    cd /home/mediacms.io && \
+    python3 -m venv $VIRTUAL_ENV
+
+# Copy requirements files
+COPY requirements.txt requirements-dev.txt ./
+
+# Install Python dependencies using pip (within virtualenv)
+ARG DEVELOPMENT_MODE=False
+RUN pip install --no-cache-dir uv && \
+    uv pip install --no-binary lxml --no-binary xmlsec -r requirements.txt && \
+    if [ "$DEVELOPMENT_MODE" = "True" ]; then \
+        echo "Installing development dependencies..." && \
+        uv pip install -r requirements-dev.txt; \
+    fi && \
+    apt-get purge -y --auto-remove \
+        build-essential \
+        pkg-config \
+        libxml2-dev \
+        libxmlsec1-dev \
+        libpq-dev
 
 # Copy ffmpeg and Bento4 from build image
 COPY --from=build-image /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
@@ -48,28 +82,11 @@ COPY --from=build-image /usr/local/bin/ffprobe /usr/local/bin/ffprobe
 COPY --from=build-image /usr/local/bin/qt-faststart /usr/local/bin/qt-faststart
 COPY --from=build-image /home/mediacms.io/bento4 /home/mediacms.io/bento4
 
-# Set up virtualenv
-RUN mkdir -p /home/mediacms.io/mediacms/{logs} && \
-    cd /home/mediacms.io && \
-    python3 -m venv $VIRTUAL_ENV
-
-# Install Python dependencies
-COPY requirements.txt requirements-dev.txt ./
-
-ARG DEVELOPMENT_MODE=False
-
-RUN pip install --no-cache-dir -r requirements.txt && \
-    if [ "$DEVELOPMENT_MODE" = "True" ]; then \
-        echo "Installing development dependencies..." && \
-        pip install --no-cache-dir -r requirements-dev.txt; \
-    fi
-
 # Copy application files
 COPY . /home/mediacms.io/mediacms
 WORKDIR /home/mediacms.io/mediacms
 
 # required for sprite thumbnail generation for large video files
-
 COPY deploy/docker/policy.xml /etc/ImageMagick-6/policy.xml
 
 # Set process control environment variables
@@ -86,3 +103,11 @@ RUN chmod +x ./deploy/docker/entrypoint.sh
 
 ENTRYPOINT ["./deploy/docker/entrypoint.sh"]
 CMD ["./deploy/docker/start.sh"]
+
+############ FULL IMAGE ############
+FROM base AS full
+COPY requirements-full.txt ./
+RUN mkdir -p /root/.cache/ && \
+    chmod go+rwx /root/ && \
+    chmod go+rwx /root/.cache/
+RUN uv pip install -r requirements-full.txt

Makefile

@@ -1,7 +1,7 @@
 .PHONY: admin-shell build-frontend
 
 admin-shell:
-	@container_id=$$(docker-compose ps -q web); \
+	@container_id=$$(docker compose ps -q web); \
 	if [ -z "$$container_id" ]; then \
 		echo "Web container not found"; \
 		exit 1; \

README.md

@@ -23,11 +23,15 @@ A demo is available at https://demo.mediacms.io
 
 ## Features
 - **Complete control over your data**: host it yourself!
-- **Support for multiple publishing workflows**: public, private, unlisted and custom
 - **Modern technologies**: Django/Python/Celery, React.
+- **Support for multiple publishing workflows**: public, private, unlisted and custom
+- **Role-Based Access Control (RBAC)**: create RBAC categories and connect users to groups with view/edit access on their media
+- **Automatic transcription**: through integration with Whisper running locally
 - **Multiple media types support**: video, audio,  image, pdf
 - **Multiple media classification options**: categories, tags and custom
 - **Multiple media sharing options**: social media share, videos embed code generation
+- **Video Trimmer**: trim video, replace, save as new or create segments
+- **SAML support**: with ability to add mappings to system roles and groups
 - **Easy media searching**: enriched with live search functionality
 - **Playlists for audio and video content**: create playlists, add and reorder content
 - **Responsive design**: including light and dark themes
@@ -35,7 +39,7 @@ A demo is available at https://demo.mediacms.io
 - **Configurable actions**: allow download, add comments, add likes, dislikes, report media
 - **Configuration options**: change logos, fonts, styling, add more pages
 - **Enhanced video player**: customized video.js player with multiple resolution and playback speed options
-- **Multiple transcoding profiles**: sane defaults for multiple dimensions (240p, 360p, 480p, 720p, 1080p) and multiple profiles (h264, h265, vp9)
+- **Multiple transcoding profiles**: sane defaults for multiple dimensions (144p, 240p, 360p, 480p, 720p, 1080p) and multiple profiles (h264, h265, vp9)
 - **Adaptive video streaming**: possible through HLS protocol
 - **Subtitles/CC**: support for multilingual subtitle files
 - **Scalable transcoding**: transcoding through priorities. Experimental support for remote workers
@@ -45,7 +49,7 @@ A demo is available at https://demo.mediacms.io
 
 ## Example cases
 
-- **Schools, education.** Administrators and editors keep what content will be published, students are not distracted with advertisements and irrelevant content, plus they have the ability to select either to stream or download content.
+- **Universities, schools, education.** Administrators and editors keep what content will be published, students are not distracted with advertisements and irrelevant content, plus they have the ability to select either to stream or download content.
 - **Organization sensitive content.** In cases where content is sensitive and cannot be uploaded to external sites.
 - **Build a great community.** MediaCMS can be customized (URLs, logos, fonts, aesthetics) so that you create a highly customized video portal for your community!
 - **Personal portal.** Organize, categorize and host your content the way you prefer.
@@ -80,6 +84,7 @@ For a small to medium installation, with a few hours of video uploaded daily, an
 
 In terms of disk space, think of what the needs will be. A general rule is to multiply by three the size of the expected uploaded videos (since the system keeps original versions, encoded versions plus HLS), so if you receive 1G of videos daily and maintain all of them, you should consider a 1T disk across a year (1G * 3 * 365).
 
+In order to support automatic transcriptions through Whisper, consider more CPUs.
 
 ## Installation / Maintanance
 
@@ -90,20 +95,15 @@ There are two ways to run MediaCMS, through Docker Compose and through installin
 
   A complete guide can be found on the blog post [How to self-host and share your videos in 2021](https://medium.com/@MediaCMS.io/how-to-self-host-and-share-your-videos-in-2021-14067e3b291b).
 
-## Configuration
-
-Visit [Configuration](docs/admins_docs.md#5-configuration) page.
-
-
-## Information for developers
-Check out the new section on the [Developer Experience](docs/dev_exp.md) page
-
-
 ## Documentation
 
 * [Users documentation](docs/user_docs.md) page
 * [Administrators documentation](docs/admins_docs.md) page
 * [Developers documentation](docs/developers_docs.md) page
+* [Configuration](docs/admins_docs.md#5-configuration) page
+* [Transcoding](docs/transcoding.md) page
+* [Developer Experience](docs/dev_exp.md) page
+* [Media Permissions](docs/media_permissions.md) page
 
 
 ## Technology
@@ -112,7 +112,7 @@ This software uses the following list of awesome technologies: Python, Django, D
 
 
 ## Who is using it
-
+- **Multiple Universities** for hosting educational videos
 - **Cinemata** non-profit media, technology and culture organization - https://cinemata.org
 - **Critical Commons** public media archive and fair use advocacy network - https://criticalcommons.org
 - **American Association of Gynecologic Laparoscopists** - https://surgeryu.org/

admin_customizations/apps.py

@@ -0,0 +1,86 @@
+from django.apps import AppConfig
+from django.conf import settings
+from django.contrib import admin
+
+
+class AdminCustomizationsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'admin_customizations'
+
+    def ready(self):
+        original_get_app_list = admin.AdminSite.get_app_list
+
+        def get_app_list(self, request, app_label=None):
+            """Custom get_app_list"""
+            app_list = original_get_app_list(self, request, app_label)
+            # To see the list:
+            # print([a.get('app_label') for a in app_list])
+
+            email_model = None
+            rbac_group_model = None
+            identity_providers_user_log_model = None
+            identity_providers_login_option = None
+            auth_app = None
+            rbac_app = None
+            socialaccount_app = None
+
+            for app in app_list:
+                if app['app_label'] == 'users':
+                    auth_app = app
+
+                elif app['app_label'] == 'account':
+                    for model in app['models']:
+                        if model['object_name'] == 'EmailAddress':
+                            email_model = model
+                elif app['app_label'] == 'rbac':
+                    if not getattr(settings, 'USE_RBAC', False):
+                        continue
+                    rbac_app = app
+                    for model in app['models']:
+                        if model['object_name'] == 'RBACGroup':
+                            rbac_group_model = model
+                elif app['app_label'] == 'identity_providers':
+                    if not getattr(settings, 'USE_IDENTITY_PROVIDERS', False):
+                        continue
+
+                    models_to_check = list(app['models'])
+
+                    for model in models_to_check:
+                        if model['object_name'] == 'IdentityProviderUserLog':
+                            identity_providers_user_log_model = model
+                        if model['object_name'] == 'LoginOption':
+                            identity_providers_login_option = model
+                elif app['app_label'] == 'socialaccount':
+                    socialaccount_app = app
+
+            if email_model and auth_app:
+                auth_app['models'].append(email_model)
+            if rbac_group_model and rbac_app and auth_app:
+                auth_app['models'].append(rbac_group_model)
+            if identity_providers_login_option and socialaccount_app:
+                socialaccount_app['models'].append(identity_providers_login_option)
+            if identity_providers_user_log_model and socialaccount_app:
+                socialaccount_app['models'].append(identity_providers_user_log_model)
+
+            # 2. don't include the following apps
+            apps_to_hide = ['authtoken', 'auth', 'account', 'saml_auth', 'rbac']
+            if not getattr(settings, 'USE_RBAC', False):
+                apps_to_hide.append('rbac')
+            if not getattr(settings, 'USE_IDENTITY_PROVIDERS', False):
+                apps_to_hide.append('socialaccount')
+
+            app_list = [app for app in app_list if app['app_label'] not in apps_to_hide]
+
+            # 3. change the ordering
+            app_order = {
+                'files': 1,
+                'users': 2,
+                'socialaccount': 3,
+                'rbac': 5,
+            }
+
+            app_list.sort(key=lambda x: app_order.get(x['app_label'], 999))
+
+            return app_list
+
+        admin.AdminSite.get_app_list = get_app_list

cms/auth_backends.py

@@ -0,0 +1,10 @@
+from django.conf import settings
+from django.contrib.auth.backends import ModelBackend
+
+
+class ApprovalBackend(ModelBackend):
+    def user_can_authenticate(self, user):
+        can_authenticate = super().user_can_authenticate(user)
+        if can_authenticate and settings.USERS_NEEDS_TO_BE_APPROVED and not user.is_superuser:
+            return getattr(user, 'is_approved', False)
+        return can_authenticate

cms/dev_settings.py

@@ -4,30 +4,37 @@ import os
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
+    "admin_customizations",
-    'django.contrib.auth',
+    "django.contrib.auth",
-    'allauth',
+    "allauth",
-    'allauth.account',
+    "allauth.account",
-    'allauth.socialaccount',
+    "allauth.socialaccount",
-    'django.contrib.contenttypes',
+    "django.contrib.contenttypes",
-    'django.contrib.sessions',
+    "django.contrib.sessions",
-    'django.contrib.messages',
+    "django.contrib.messages",
-    'django.contrib.staticfiles',
+    "django.contrib.staticfiles",
-    'django.contrib.sites',
+    "jazzmin",
-    'rest_framework',
+    "django.contrib.admin",
-    'rest_framework.authtoken',
+    "django.contrib.sites",
-    'imagekit',
+    "rest_framework",
-    'files.apps.FilesConfig',
+    "rest_framework.authtoken",
-    'users.apps.UsersConfig',
+    "imagekit",
-    'actions.apps.ActionsConfig',
+    "files.apps.FilesConfig",
-    'debug_toolbar',
+    "users.apps.UsersConfig",
-    'mptt',
+    "actions.apps.ActionsConfig",
-    'crispy_forms',
+    "rbac.apps.RbacConfig",
+    "identity_providers.apps.IdentityProvidersConfig",
+    "debug_toolbar",
+    "mptt",
+    "crispy_forms",
     "crispy_bootstrap5",
-    'uploader.apps.UploaderConfig',
+    "uploader.apps.UploaderConfig",
-    'djcelery_email',
+    "djcelery_email",
-    'drf_yasg',
+    "drf_yasg",
-    'corsheaders',
+    "allauth.socialaccount.providers.saml",
+    "saml_auth.apps.SamlAuthConfig",
+    "corsheaders",
+    "tinymce",
 ]
 
 MIDDLEWARE = [

cms/middleware.py

@@ -0,0 +1,23 @@
+from django.conf import settings
+from django.http import JsonResponse
+from django.shortcuts import redirect
+from django.urls import reverse
+
+
+class ApprovalMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if settings.USERS_NEEDS_TO_BE_APPROVED and request.user.is_authenticated and not request.user.is_superuser and not getattr(request.user, 'is_approved', False):
+            allowed_paths = [
+                reverse('approval_required'),
+                reverse('account_logout'),
+            ]
+            if request.path not in allowed_paths:
+                if request.path.startswith('/api/'):
+                    return JsonResponse({'detail': 'User account not approved.'}, status=403)
+                return redirect('approval_required')
+
+        response = self.get_response(request)
+        return response

cms/permissions.py

@@ -1,14 +1,22 @@
 from django.conf import settings
 from rest_framework import permissions
+from rest_framework.exceptions import PermissionDenied
 
-from files.methods import is_mediacms_editor, is_mediacms_manager
+from files.methods import (
+    is_mediacms_editor,
+    is_mediacms_manager,
+    user_allowed_to_upload,
+)
 
 
 class IsAuthorizedToAdd(permissions.BasePermission):
     def has_permission(self, request, view):
         if request.method in permissions.SAFE_METHODS:
             return True
-        return user_allowed_to_upload(request)
+        if not user_allowed_to_upload(request):
+            raise PermissionDenied("You don't have permission to upload media, or have reached max number of media uploads.")
+
+        return True
 
 
 class IsAuthorizedToAddComment(permissions.BasePermission):
@@ -55,26 +63,6 @@ class IsUserOrEditor(permissions.BasePermission):
         return obj.user == request.user
 
 
-def user_allowed_to_upload(request):
-    """Any custom logic for whether a user is allowed
-    to upload content lives here
-    """
-    if request.user.is_anonymous:
-        return False
-    if request.user.is_superuser:
-        return True
-
-    if settings.CAN_ADD_MEDIA == "all":
-        return True
-    elif settings.CAN_ADD_MEDIA == "email_verified":
-        if request.user.email_is_verified:
-            return True
-    elif settings.CAN_ADD_MEDIA == "advancedUser":
-        if request.user.advancedUser:
-            return True
-    return False
-
-
 def user_allowed_to_comment(request):
     """Any custom logic for whether a user is allowed
     to comment lives here

cms/settings.py

@@ -105,6 +105,23 @@ USE_L10N = True
 USE_TZ = True
 SITE_ID = 1
 
+# these are the portal logos (dark and light)
+# set new paths for svg or png if you want to override
+# svg has priority over png, so if you want to use
+# custom pngs and not svgs, remove the lines with svgs
+# or set as empty strings
+# example:
+# PORTAL_LOGO_DARK_SVG = ""
+# PORTAL_LOGO_LIGHT_SVG = ""
+# place the files on static/images folder
+PORTAL_LOGO_DARK_SVG = "/static/images/logo_dark.svg"
+PORTAL_LOGO_DARK_PNG = "/static/images/logo_dark.png"
+PORTAL_LOGO_LIGHT_SVG = "/static/images/logo_light.svg"
+PORTAL_LOGO_LIGHT_PNG = "/static/images/logo_dark.png"
+
+# paths to extra css files to be included, eg "/static/css/custom.css"
+# place css inside static/css folder
+EXTRA_CSS_PATHS = []
 # protection agains anonymous users
 # per ip address limit, for actions as like/dislike/report
 TIME_TO_ACTION_ANONYMOUS = 10 * 60
@@ -115,7 +132,7 @@ ACCOUNT_LOGIN_METHODS = {"username", "email"}
 ACCOUNT_EMAIL_REQUIRED = True  # new users need to specify email
 ACCOUNT_EMAIL_VERIFICATION = "optional"  # 'mandatory' 'none'
 ACCOUNT_LOGIN_ON_EMAIL_CONFIRMATION = True
-ACCOUNT_USERNAME_MIN_LENGTH = "4"
+ACCOUNT_USERNAME_MIN_LENGTH = 4
 ACCOUNT_ADAPTER = "users.adapter.MyAccountAdapter"
 ACCOUNT_SIGNUP_FORM_CLASS = "users.forms.SignupForm"
 ACCOUNT_USERNAME_VALIDATORS = "users.validators.custom_username_validators"
@@ -128,6 +145,10 @@ USERS_CAN_SELF_REGISTER = True
 
 RESTRICTED_DOMAINS_FOR_USER_REGISTRATION = ["xxx.com", "emaildomainwhatever.com"]
 
+# by default users do not need to be approved. If this is set to True, then new users
+# will have to be approved before they can login successfully
+USERS_NEEDS_TO_BE_APPROVED = False
+
 # Comma separated list of domains:  ["organization.com", "private.organization.com", "org2.com"]
 # Empty list disables.
 ALLOWED_DOMAINS_FOR_USER_REGISTRATION = []
@@ -186,7 +207,7 @@ CHUNKIZE_VIDEO_DURATION = 60 * 5
 VIDEO_CHUNKS_DURATION = 60 * 4
 
 # always get these two, even if upscaling
-MINIMUM_RESOLUTIONS_TO_ENCODE = [240, 360]
+MINIMUM_RESOLUTIONS_TO_ENCODE = [144, 240]
 
 # default settings for notifications
 # not all of them are implemented
@@ -226,7 +247,7 @@ POST_UPLOAD_AUTHOR_MESSAGE_UNLISTED_NO_COMMENTARY = ""
 # only in case where unlisted workflow is used and no commentary
 # exists
 
-CANNOT_ADD_MEDIA_MESSAGE = ""
+CANNOT_ADD_MEDIA_MESSAGE = "User cannot add media, or maximum number of media uploads has been reached."
 
 # mp4hls command, part of Bento4
 MP4HLS_COMMAND = "/home/mediacms.io/mediacms/Bento4-SDK-1-6-0-637.x86_64-unknown-linux/bin/mp4hls"
@@ -256,7 +277,7 @@ AUTHENTICATION_BACKENDS = (
 )
 
 INSTALLED_APPS = [
-    "django.contrib.admin",
+    "admin_customizations",
     "django.contrib.auth",
     "allauth",
     "allauth.account",
@@ -265,6 +286,8 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "jazzmin",
+    "django.contrib.admin",
     "django.contrib.sites",
     "rest_framework",
     "rest_framework.authtoken",
@@ -272,6 +295,8 @@ INSTALLED_APPS = [
     "files.apps.FilesConfig",
     "users.apps.UsersConfig",
     "actions.apps.ActionsConfig",
+    "rbac.apps.RbacConfig",
+    "identity_providers.apps.IdentityProvidersConfig",
     "debug_toolbar",
     "mptt",
     "crispy_forms",
@@ -279,6 +304,9 @@ INSTALLED_APPS = [
     "uploader.apps.UploaderConfig",
     "djcelery_email",
     "drf_yasg",
+    "allauth.socialaccount.providers.saml",
+    "saml_auth.apps.SamlAuthConfig",
+    "tinymce",
 ]
 
 MIDDLEWARE = [
@@ -370,16 +398,7 @@ LOGGING = {
     },
 }
 
-DATABASES = {
+DATABASES = {"default": {"ENGINE": "django.db.backends.postgresql", "NAME": "mediacms", "HOST": "127.0.0.1", "PORT": "5432", "USER": "mediacms", "PASSWORD": "mediacms", "OPTIONS": {'pool': True}}}
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": "mediacms",
-        "HOST": "127.0.0.1",
-        "PORT": "5432",
-        "USER": "mediacms",
-        "PASSWORD": "mediacms",
-    }
-}
 
 
 REDIS_LOCATION = "redis://127.0.0.1:6379/1"
@@ -439,79 +458,81 @@ CELERY_TASK_ALWAYS_EAGER = False
 if os.environ.get("TESTING"):
     CELERY_TASK_ALWAYS_EAGER = True
 
-
-try:
-    # keep a local_settings.py file for local overrides
-    from .local_settings import *  # noqa
-
-    # ALLOWED_HOSTS needs a url/ip
-    ALLOWED_HOSTS.append(FRONTEND_HOST.replace("http://", "").replace("https://", ""))
-except ImportError:
-    # local_settings not in use
-    pass
-
-
-if "http" not in FRONTEND_HOST:
-    # FRONTEND_HOST needs a http:// preffix
-    FRONTEND_HOST = f"http://{FRONTEND_HOST}"  # noqa
-
-if LOCAL_INSTALL:
-    SSL_FRONTEND_HOST = FRONTEND_HOST.replace("http", "https")
-else:
-    SSL_FRONTEND_HOST = FRONTEND_HOST
-
-if GLOBAL_LOGIN_REQUIRED:
-    # this should go after the AuthenticationMiddleware middleware
-    MIDDLEWARE.insert(6, "login_required.middleware.LoginRequiredMiddleware")
-    LOGIN_REQUIRED_IGNORE_PATHS = [
-        r'/accounts/login/$',
-        r'/accounts/logout/$',
-        r'/accounts/signup/$',
-        r'/accounts/password/.*/$',
-        r'/accounts/confirm-email/.*/$',
-        #        r'/api/v[0-9]+/',
-    ]
-
 # if True, only show original, don't perform any action on videos
 DO_NOT_TRANSCODE_VIDEO = False
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
-# the following is related to local development using docker
-# and docker-compose-dev.yaml
-try:
-    DEVELOPMENT_MODE = os.environ.get("DEVELOPMENT_MODE")
-    if DEVELOPMENT_MODE:
-        # keep a dev_settings.py file for local overrides
-        from .dev_settings import *  # noqa
-except ImportError:
-    pass
-
 LANGUAGES = [
     ('ar', _('Arabic')),
     ('bn', _('Bengali')),
+    ('da', _('Danish')),
     ('nl', _('Dutch')),
     ('en', _('English')),
     ('fr', _('French')),
     ('de', _('German')),
     ('hi', _('Hindi')),
     ('id', _('Indonesian')),
+    ('it', _('Italian')),
     ('ja', _('Japanese')),
     ('ko', _('Korean')),
     ('pt', _('Portuguese')),
     ('ru', _('Russian')),
     ('zh-hans', _('Simplified Chinese')),
+    ('sl', _('Slovenian')),
+    ('zh-hant', _('Traditional Chinese')),
     ('es', _('Spanish')),
     ('tr', _('Turkish')),
     ('el', _('Greek')),
     ('ur', _('Urdu')),
+    ('he', _('Hebrew')),
 ]
 
 LANGUAGE_CODE = 'en'  # default language
 
+TINYMCE_DEFAULT_CONFIG = {
+    "theme": "silver",
+    "height": 500,
+    "resize": "both",
+    "menubar": "file edit view insert format tools table help",
+    "menu": {
+        "format": {
+            "title": "Format",
+            "items": "blocks | bold italic underline strikethrough superscript subscript code | " "fontfamily fontsize align lineheight | " "forecolor backcolor removeformat",
+        },
+    },
+    "plugins": "advlist,autolink,autosave,lists,link,image,charmap,print,preview,anchor,"
+    "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,paste,directionality,"
+    "code,help,wordcount,emoticons,file,image,media",
+    "toolbar": "undo redo | code preview | blocks | "
+    "bold italic | alignleft aligncenter "
+    "alignright alignjustify ltr rtl | bullist numlist outdent indent | "
+    "removeformat | restoredraft help | image media",
+    "branding": False,  # remove branding
+    "promotion": False,  # remove promotion
+    "body_class": "page-main-inner custom-page-wrapper",  # class of the body element in tinymce
+    "block_formats": "Paragraph=p; Heading 1=h1; Heading 2=h2; Heading 3=h3;",
+    "formats": {  # customize h2 to always have emphasis-large class
+        "h2": {"block": "h2", "classes": "emphasis-large"},
+    },
+    "font_size_formats": "16px 18px 24px 32px",
+    "images_upload_url": "/tinymce/upload/",
+    "images_upload_handler": "tinymce.views.upload_image",
+    "automatic_uploads": True,
+    "file_picker_types": "image",
+    "paste_data_images": True,
+    "paste_as_text": False,
+    "paste_enable_default_filters": True,
+    "paste_word_valid_elements": "b,strong,i,em,h1,h2,h3,h4,h5,h6,p,br,a,ul,ol,li",
+    "paste_retain_style_properties": "all",
+    "paste_remove_styles": False,
+    "paste_merge_formats": True,
+    "sandbox_iframes": False,
+}
+
 SPRITE_NUM_SECS = 10
 # number of seconds for sprite image.
-# If you plan to change this, you must also follow the instructions on admin_docs.md
+# If you plan to change this, you must also follow the instructions on admins_docs.md
 # to change the equivalent value in ./frontend/src/static/js/components/media-viewer/VideoViewer/index.js and then re-build frontend
 
 # how many images will be shown on the slideshow
@@ -526,7 +547,97 @@ CRISPY_TEMPLATE_PACK = "bootstrap5"
 # keep the trailing slash
 DJANGO_ADMIN_URL = "admin/"
 
+# this are used around a number of places and will need to be well documented!!!
+
+USE_SAML = False
+USE_RBAC = False
+USE_IDENTITY_PROVIDERS = False
+JAZZMIN_UI_TWEAKS = {"theme": "flatly"}
+
+USE_ROUNDED_CORNERS = True
+
+ALLOW_VIDEO_TRIMMER = True
+
+ALLOW_CUSTOM_MEDIA_URLS = False
+
+# Whether to allow anonymous users to list all users
+ALLOW_ANONYMOUS_USER_LISTING = True
+
+# Who can see the members page
+# valid choices are all, editors, admins
+CAN_SEE_MEMBERS_PAGE = "all"
+
+# Maximum number of media a user can upload
+NUMBER_OF_MEDIA_USER_CAN_UPLOAD = 100
+
+# ffmpeg options
+FFMPEG_DEFAULT_PRESET = "medium"  # see https://trac.ffmpeg.org/wiki/Encode/H.264
+
+# If 'all' is in the list, no check is performed
+ALLOWED_MEDIA_UPLOAD_TYPES = ["video", "audio", "image", "pdf"]
+
+# transcription options
+# the mediacms-full docker image needs to be used in order to be able to use transcription
+# if you are using the mediacms-full image, change USE_WHISPER_TRANSCRIBE to True
+USE_WHISPER_TRANSCRIBE = False
+
+# by default all users can request a video to be transcribed. If you want to
+# allow only editors, set this to False
+USER_CAN_TRANSCRIBE_VIDEO = True
+
+# Whisper transcribe options - https://github.com/openai/whisper
+WHISPER_MODEL = "base"
+
+# show a custom text in the sidebar footer, otherwise the default will be shown if this is empty
+SIDEBAR_FOOTER_TEXT = ""
+
+try:
+    # keep a local_settings.py file for local overrides
+    from .local_settings import *  # noqa
+
+    # ALLOWED_HOSTS needs a url/ip
+    ALLOWED_HOSTS.append(FRONTEND_HOST.replace("http://", "").replace("https://", ""))
+except ImportError:
+    # local_settings not in use
+    pass
+
+# Don't add new settings below that could be overridden in local_settings.py!!!
+
+if "http" not in FRONTEND_HOST:
+    # FRONTEND_HOST needs a http:// preffix
+    FRONTEND_HOST = f"http://{FRONTEND_HOST}"  # noqa
+
+if LOCAL_INSTALL:
+    SSL_FRONTEND_HOST = FRONTEND_HOST.replace("http", "https")
+else:
+    SSL_FRONTEND_HOST = FRONTEND_HOST
+
+
 # CSRF_COOKIE_SECURE = True
 # SESSION_COOKIE_SECURE = True
 
 PYSUBS_COMMAND = "pysubs2"
+
+# the following is related to local development using docker
+# and docker-compose-dev.yaml
+try:
+    DEVELOPMENT_MODE = os.environ.get("DEVELOPMENT_MODE")
+    if DEVELOPMENT_MODE:
+        # keep a dev_settings.py file for local overrides
+        from .dev_settings import *  # noqa
+except ImportError:
+    pass
+
+
+if GLOBAL_LOGIN_REQUIRED:
+    auth_index = MIDDLEWARE.index("django.contrib.auth.middleware.AuthenticationMiddleware")
+    MIDDLEWARE.insert(auth_index + 1, "django.contrib.auth.middleware.LoginRequiredMiddleware")
+
+
+if USERS_NEEDS_TO_BE_APPROVED:
+    AUTHENTICATION_BACKENDS = (
+        'cms.auth_backends.ApprovalBackend',
+        'allauth.account.auth_backends.AuthenticationBackend',
+    )
+    auth_index = MIDDLEWARE.index("django.contrib.auth.middleware.AuthenticationMiddleware")
+    MIDDLEWARE.insert(auth_index + 1, "cms.middleware.ApprovalMiddleware")

cms/urls.py

@@ -30,4 +30,9 @@ urlpatterns = [
     re_path(r'^swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),
     re_path(r'^swagger/$', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
     path('docs/api/', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
+    path("tinymce/", include("tinymce.urls")),
 ]
+
+admin.site.site_header = "MediaCMS Admin"
+admin.site.site_title = "MediaCMS"
+admin.site.index_title = "Admin"

cms/version.py

@@ -0,0 +1 @@
+VERSION = "7.0.1-beta.8"

conftest.py

@@ -1,5 +0,0 @@
-from pytest_factoryboy import register
-
-from tests.users.factories import UserFactory
-
-register(UserFactory)

deic_setup_notes.md

@@ -0,0 +1,75 @@
+# MediaCMS: Document Changes for DEIC
+
+## Configuration Changes
+The following changes are required in `deploy/docker/local_settings.py`:
+
+```python
+
+# default workflow
+PORTAL_WORKFLOW = 'private'
+
+# Authentication Settings
+# these two are necessary so that users cannot register through system accounts. They can only register through identity providers
+REGISTER_ALLOWED = False
+USERS_CAN_SELF_REGISTER = False
+
+USE_RBAC = True
+USE_SAML = True
+USE_IDENTITY_PROVIDERS = True
+
+# Proxy and SSL Settings
+USE_X_FORWARDED_HOST = True
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+SECURE_SSL_REDIRECT = True
+CSRF_COOKIE_SECURE = True
+SESSION_COOKIE_SECURE = True
+
+# SAML Configuration
+SOCIALACCOUNT_ADAPTER = 'saml_auth.adapter.SAMLAccountAdapter'
+ACCOUNT_USERNAME_VALIDATORS = "users.validators.less_restrictive_username_validators"
+SOCIALACCOUNT_PROVIDERS = {
+    "saml": {
+        "provider_class": "saml_auth.custom.provider.CustomSAMLProvider",
+    }
+}
+SOCIALACCOUNT_AUTO_SIGNUP = True
+SOCIALACCOUNT_EMAIL_REQUIRED = False
+
+# if set to strict, user is created with the email from the saml provider without
+# checking if the email is already on the system
+# however if this is ommited, and user tries to login with an email that already exists on
+# the system, then they get to the ugly form where it suggests they add a username/email/name
+
+ACCOUNT_PREVENT_ENUMERATION = 'strict'
+
+```
+
+## SAML Configuration Steps
+
+### Step 1: Add SAML Identity Provider
+1. Navigate to Admin panel
+2. Select "Identity Provider"
+3. Configure as follows:
+   - **Provider**: saml # ensure this is set with lower case!
+   - **Provider ID**: `wayf.wayf.dk`
+   - **IDP Config Name**: `Deic` (or preferred name)
+   - **Client ID**: `wayf_dk` (important: defines the URL, e.g., `https://deic.mediacms.io/accounts/saml/wayf_dk`)
+   - **Site**: Set the default one
+
+### Step 2: Add SAML Configuration
+Can be set through the SAML Configurations tab:
+
+1. **IDP ID**: Must be a URL, e.g., `https://wayf.wayf.dk`
+2. **IDP Certificate**: x509cert from your SAML provider
+3. **SSO URL**: `https://wayf.wayf.dk/saml2/idp/SSOService2.php`
+4. **SLO URL**: `https://wayf.wayf.dk/saml2/idp/SingleLogoutService.php`
+5. **SP Metadata URL**: The metadata URL set for the SP, e.g., `https://deic.mediacms.io/saml/metadata`. This should point to the URL of the SP and is autogenerated
+
+### Step 3: Set the other Options
+1. **Email Settings**:
+   - `verified_email`: When enabled, emails from SAML responses will be marked as verified
+   - `Remove from groups`: When enabled, user is removed from a group after login, if they have been removed from the group on the IDP
+2. **Global Role Mapping**: Maps the role returned by SAML (as set in the SAML Configuration tab) with the role in MediaCMS
+3. **Group Role Mapping**: Maps the role returned by SAML (as set in the SAML Configuration tab) with the role in groups that user will be added
+4. **Group mapping**: This creates groups associated with this IDP. Group ids as they come from SAML, associated with MediaCMS groups
+5. **Category Mapping**: This maps a group id (from SAML response) with a category in MediaCMS

deploy/docker/entrypoint.sh

@@ -30,7 +30,8 @@ fi
 
 # We should do this only for folders that have a different owner, since it is an expensive operation
 # Also ignoring .git folder to fix this issue https://github.com/mediacms-io/mediacms/issues/934
-find /home/mediacms.io/mediacms ! \( -path "*.git*" \) -exec chown www-data:$TARGET_GID {} +
+# Exclude package-lock.json files that may not exist or be removed during frontend setup
+find /home/mediacms.io/mediacms ! \( -path "*.git*" -o -name "package-lock.json" \) -exec chown www-data:$TARGET_GID {} + 2>/dev/null || true
 
 chmod +x /home/mediacms.io/mediacms/deploy/docker/start.sh /home/mediacms.io/mediacms/deploy/docker/prestart.sh
 

deploy/docker/local_settings.py

@@ -13,6 +13,7 @@ DATABASES = {
         "PORT": os.getenv('POSTGRES_PORT', '5432'),
         "USER": os.getenv('POSTGRES_USER', 'mediacms'),
         "PASSWORD": os.getenv('POSTGRES_PASSWORD', 'mediacms'),
+        "OPTIONS": {'pool': True},
     }
 }
 

deploy/scripts/build_and_deploy.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# This script builds the video editor package and deploys the frontend assets to the static directory.
+# How to run: sh deploy/scripts/build_and_deploy.sh
+
+# Exit on any error
+set -e
+
+echo "Starting build process..."
+
+# Build video editor package
+echo "Building video editor package..."
+cd frontend-tools/video-editor
+yarn build:django
+cd ../../
+
+# Build chapter editor package
+echo "Building chapters editor package..."
+cd frontend-tools/chapters-editor
+yarn build:django
+cd ../../   
+
+# Build video js package
+echo "Building video js package..."
+cd frontend-tools/video-js
+yarn build:django
+cd ../../
+
+# Run npm build in the frontend container
+echo "Building frontend assets..."
+docker compose -f docker-compose/docker-compose-dev-updated.yaml exec frontend npm run dist
+
+# Copy static assets to the static directory
+echo "Copying static assets..."
+cp -r frontend/dist/static/* static/
+
+# Restart the web service
+echo "Restarting web service..."
+docker compose -f docker-compose/docker-compose-dev-updated.yaml restart web
+
+echo "Build and deployment completed successfully!"

docker-compose-dev-updated.yaml

@@ -1,144 +0,0 @@
-services:
-  migrations:
-    platform: linux/amd64
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-      args:
-        - DEVELOPMENT_MODE=True
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    command: "./deploy/docker/prestart.sh"
-    environment:
-      DEVELOPMENT_MODE: True
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ADMIN_USER: 'admin'
-      ADMIN_EMAIL: 'admin@localhost'
-      ADMIN_PASSWORD: 'admin'
-    restart: on-failure
-    depends_on:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-  frontend:
-    image: node:20
-    user: "root"
-    volumes:
-      - ${PWD}/frontend:/home/mediacms.io/mediacms/frontend/
-      - frontend_node_modules:/home/mediacms.io/mediacms/frontend/node_modules
-      - player_node_modules:/home/mediacms.io/mediacms/frontend/packages/player/node_modules
-      - scripts_node_modules:/home/mediacms.io/mediacms/frontend/packages/scripts/node_modules
-      - npm_global:/home/node/.npm-global
-    working_dir: /home/mediacms.io/mediacms/frontend/
-    command: >
-      bash -c "
-      echo 'Setting up npm global directory...' &&
-      mkdir -p /home/node/.npm-global &&
-      chown -R node:node /home/node/.npm-global &&
-      echo 'Setting up permissions...' &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend &&
-      echo 'Cleaning up node_modules...' &&
-      find /home/mediacms.io/mediacms/frontend/node_modules -mindepth 1 -delete 2>/dev/null || true &&
-      find /home/mediacms.io/mediacms/frontend/packages/player/node_modules -mindepth 1 -delete 2>/dev/null || true &&
-      find /home/mediacms.io/mediacms/frontend/packages/scripts/node_modules -mindepth 1 -delete 2>/dev/null || true &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend/node_modules &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend/packages/player/node_modules &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend/packages/scripts/node_modules &&
-      echo 'Switching to node user...' &&
-      su node -c '
-        export NPM_CONFIG_PREFIX=/home/node/.npm-global &&
-        echo \"Setting up frontend...\" &&
-        rm -f package-lock.json &&
-        rm -f packages/player/package-lock.json &&
-        rm -f packages/scripts/package-lock.json &&
-        echo \"Installing dependencies...\" &&
-        npm install --legacy-peer-deps &&
-        echo \"Setting up workspaces...\" &&
-        npm install -g npm@latest &&
-        cd packages/scripts &&
-        npm install --legacy-peer-deps &&
-        npm install rollup@2.79.1 --save-dev --legacy-peer-deps &&
-        npm install typescript@4.9.5 --save-dev --legacy-peer-deps &&
-        npm install tslib@2.6.2 --save --legacy-peer-deps &&
-        npm install rollup-plugin-typescript2@0.34.1 --save-dev --legacy-peer-deps &&
-        npm install --legacy-peer-deps &&
-        npm run build &&
-        cd ../.. &&
-        cd packages/player &&
-        npm install --legacy-peer-deps &&
-        npm run build &&
-        cd ../.. &&
-        echo \"Starting development server...\" &&
-        npm run start
-      '"
-    env_file:
-      - ${PWD}/frontend/.env
-    environment:
-      - NPM_CONFIG_PREFIX=/home/node/.npm-global
-    ports:
-      - "8088:8088"
-    depends_on:
-      - web
-    restart: unless-stopped
-  web:
-    platform: linux/amd64
-    image: mediacms/mediacms:latest
-    command: "python manage.py runserver 0.0.0.0:80"
-    environment:
-      DEVELOPMENT_MODE: True
-    ports:
-      - "80:80"
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    depends_on:
-      - migrations
-  db:
-    image: postgres:17.2-alpine
-    volumes:
-      - ./postgres_data:/var/lib/postgresql/data/
-    restart: always
-    environment:
-      POSTGRES_USER: mediacms
-      POSTGRES_PASSWORD: mediacms
-      POSTGRES_DB: mediacms
-      TZ: Europe/London
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-  redis:
-    image: "redis:alpine"
-    restart: always
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-  celery_worker:
-    platform: linux/amd64
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_MIGRATIONS: 'no'
-      DEVELOPMENT_MODE: True
-    depends_on:
-      - web
-
-volumes:
-  frontend_node_modules:
-  player_node_modules:
-  scripts_node_modules:
-  npm_global:

docker-compose-dev.yaml

@@ -5,6 +5,7 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      target: base
       args:
         - DEVELOPMENT_MODE=True
     image: mediacms/mediacms-dev:latest
@@ -84,6 +85,5 @@ services:
       ENABLE_NGINX: 'no'
       ENABLE_CELERY_BEAT: 'no'
       ENABLE_MIGRATIONS: 'no'
-      DEVELOPMENT_MODE: True
     depends_on:
       - web

docker-compose-http-proxy.yaml

@@ -1,92 +0,0 @@
-version: "3"
-
-services:
-  nginx-proxy:
-    image: jwilder/nginx-proxy
-    ports:
-      - "80:80"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./deploy/docker/reverse_proxy/client_max_body_size.conf:/etc/nginx/conf.d/client_max_body_size.conf:ro
-  migrations:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ADMIN_USER: 'admin'
-      ADMIN_EMAIL: 'admin@localhost'
-      #ADMIN_PASSWORD: 'uncomment_and_set_password_here'
-    command: "./deploy/docker/prestart.sh"
-    restart: on-failure
-    depends_on:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-  web:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-      VIRTUAL_HOST: localhost
-    depends_on:
-      - migrations
-  celery_beat:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - redis
-  celery_worker:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - migrations
-  db:
-    image: postgres:17.2-alpine
-    volumes:
-      - ../postgres_data/:/var/lib/postgresql/data/
-    restart: always
-    environment:
-      POSTGRES_USER: mediacms
-      POSTGRES_PASSWORD: mediacms
-      POSTGRES_DB: mediacms
-      TZ: Europe/London
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-  redis:
-    image: "redis:alpine"
-    restart: always
-    healthcheck:
-      test: ["CMD", "redis-cli","ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3

docker-compose-https-proxy.yaml

@@ -1,94 +0,0 @@
-version: "3"
-
-services:
-  nginx-proxy:
-    image: jwilder/nginx-proxy
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./deploy/docker/reverse_proxy/certs/:/etc/nginx/certs/
-      - ./deploy/docker/reverse_proxy/client_max_body_size.conf:/etc/nginx/conf.d/client_max_body_size.conf:ro
-  migrations:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-    command: "./deploy/docker/prestart.sh"
-    restart: on-failure
-    depends_on:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-  web:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-      ADMIN_USER: 'admin'
-      ADMIN_EMAIL: 'admin@localhost'
-      #ADMIN_PASSWORD: 'uncomment_and_set_password_here'
-      VIRTUAL_HOST: localhost
-    depends_on:
-      - migrations
-  celery_beat:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - redis
-  celery_worker:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 2
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - migrations
-  db:
-    image: postgres:17.2-alpine
-    volumes:
-      - ../postgres_data/:/var/lib/postgresql/data/
-    restart: always
-    environment:
-      POSTGRES_USER: mediacms
-      POSTGRES_PASSWORD: mediacms
-      POSTGRES_DB: mediacms
-      TZ: Europe/London
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-  redis:
-    image: "redis:alpine"
-    restart: always
-    healthcheck:
-      test: ["CMD", "redis-cli","ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3

docker-compose-letsencrypt.yaml

@@ -1,121 +0,0 @@
-version: "3"
-
-# Uses https://github.com/nginx-proxy/acme-companion
-
-services:
-  nginx-proxy:
-    image: nginxproxy/nginx-proxy
-    container_name: nginx-proxy
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - conf:/etc/nginx/conf.d
-      - vhost:/etc/nginx/vhost.d
-      - html:/usr/share/nginx/html
-      - dhparam:/etc/nginx/dhparam
-      - certs:/etc/nginx/certs:ro
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./deploy/docker/reverse_proxy/client_max_body_size.conf:/etc/nginx/conf.d/client_max_body_size.conf:ro
-
-  acme-companion:
-    image: nginxproxy/acme-companion
-    container_name: nginx-proxy-acme
-    volumes_from:
-      - nginx-proxy
-    volumes:
-      - certs:/etc/nginx/certs:rw
-      - acme:/etc/acme.sh
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  migrations:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ADMIN_USER: 'admin'
-      ADMIN_EMAIL: 'admin@localhost'
-      #ADMIN_PASSWORD: 'uncomment_and_set_password_here'
-    command: "./deploy/docker/prestart.sh"
-    restart: on-failure
-    depends_on:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-  web:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-      VIRTUAL_HOST: 'mediacms.52.209.5.113.nip.io'
-      LETSENCRYPT_HOST: 'mediacms.52.209.5.113.nip.io'
-      LETSENCRYPT_EMAIL: 'email@example.com'
-    depends_on:
-      - migrations
-  celery_beat:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - redis
-  celery_worker:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - migrations
-  db:
-    image: postgres:17.2-alpine
-    volumes:
-      - ../postgres_data:/var/lib/postgresql/data/
-    restart: always
-    environment:
-      POSTGRES_USER: mediacms
-      POSTGRES_PASSWORD: mediacms
-      POSTGRES_DB: mediacms
-      TZ: Europe/London
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-  redis:
-    image: "redis:alpine"
-    restart: always
-    healthcheck:
-      test: ["CMD", "redis-cli","ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-volumes:
-  conf:
-  vhost:
-  html:
-  dhparam:
-  certs:
-  acme:

docker-compose-named-volumes.yaml

@@ -1,94 +0,0 @@
-version: "3"
-
-services:
-  migrations:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./deploy/docker/local_settings.py:/home/mediacms.io/mediacms/deploy/docker/local_settings.py
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ADMIN_USER: 'admin'
-      ADMIN_EMAIL: 'admin@localhost'
-      #ADMIN_PASSWORD: 'uncomment_and_set_password_here'
-    command: "./deploy/docker/prestart.sh"
-    restart: on-failure
-    depends_on:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
-  web:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    ports:
-      - "80:80"
-    volumes:
-      - media_store:/home/mediacms.io/mediacms/media_files/
-      - static_store:/home/mediacms.io/mediacms/static/
-      - ./deploy/docker/local_settings.py:/home/mediacms.io/mediacms/deploy/docker/local_settings.py
-    environment:
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - migrations
-  celery_beat:
-    image: mediacms/mediacms:latest
-    volumes:
-      - ./deploy/docker/local_settings.py:/home/mediacms.io/mediacms/deploy/docker/local_settings.py
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - redis
-  celery_worker:
-    image: mediacms/mediacms:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - media_store:/home/mediacms.io/mediacms/media_files/
-      - static_store:/home/mediacms.io/mediacms/static/
-      - ./deploy/docker/local_settings.py:/home/mediacms.io/mediacms/deploy/docker/local_settings.py
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - migrations
-  db:
-    image: postgres:17.2-alpine
-    volumes:
-      - postgres_data:/var/lib/postgresql/data/
-    restart: always
-    environment:
-      POSTGRES_USER: mediacms
-      POSTGRES_PASSWORD: mediacms
-      POSTGRES_DB: mediacms
-      TZ: Europe/London
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-  redis:
-    image: "redis:alpine"
-    restart: always
-    healthcheck:
-      test: ["CMD", "redis-cli","ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-volumes:
-  postgres_data:
-  media_store:
-  static_store:

docker-compose.full.yaml

@@ -0,0 +1,5 @@
+version: "3"
+
+services:
+  celery_worker:
+    image: mediacms/mediacms:full

docker-compose.yaml

@@ -72,7 +72,7 @@ services:
       POSTGRES_DB: mediacms
       TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL",  "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -81,6 +81,6 @@ services:
     restart: always
     healthcheck:
       test: ["CMD", "redis-cli","ping"]
-      interval: 30s
+      interval: 10s
-      timeout: 10s
+      timeout: 5s
       retries: 3

docker-compose/docker-compose-dev-updated.yaml

@@ -1,15 +1,16 @@
+name: mediacms-dev
 services:
   migrations:
     platform: linux/amd64
     build:
-      context: .
+      context: ..
-      dockerfile: ./Dockerfile
+      dockerfile: Dockerfile
       args:
         - DEVELOPMENT_MODE=True
     image: mediacms/mediacms:latest
     volumes:
-      - ./:/home/mediacms.io/mediacms/
+      - ../:/home/mediacms.io/mediacms/
-    command: "./deploy/docker/prestart.sh"
+    command: "/home/mediacms.io/mediacms/deploy/docker/prestart.sh"
     environment:
       DEVELOPMENT_MODE: True
       ENABLE_UWSGI: 'no'
@@ -32,55 +33,35 @@ services:
     volumes:
       - ${PWD}/frontend:/home/mediacms.io/mediacms/frontend/
       - frontend_node_modules:/home/mediacms.io/mediacms/frontend/node_modules
-      - player_node_modules:/home/mediacms.io/mediacms/frontend/packages/player/node_modules
       - scripts_node_modules:/home/mediacms.io/mediacms/frontend/packages/scripts/node_modules
-      - npm_global:/home/node/.npm-global
+      - npm_cache:/home/node/.npm
     working_dir: /home/mediacms.io/mediacms/frontend/
     command: >
       bash -c "
-      echo 'Setting up npm global directory...' &&
+      echo 'Checking dependencies...' &&
-      mkdir -p /home/node/.npm-global &&
+      if [ ! -f node_modules/.install-complete ]; then
-      chown -R node:node /home/node/.npm-global &&
+        echo 'First-time setup or dependencies changed, installing...' &&
-      echo 'Setting up permissions...' &&
+        npm install --legacy-peer-deps --cache /home/node/.npm &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend &&
-      echo 'Cleaning up node_modules...' &&
-      find /home/mediacms.io/mediacms/frontend/node_modules -mindepth 1 -delete 2>/dev/null || true &&
-      find /home/mediacms.io/mediacms/frontend/packages/player/node_modules -mindepth 1 -delete 2>/dev/null || true &&
-      find /home/mediacms.io/mediacms/frontend/packages/scripts/node_modules -mindepth 1 -delete 2>/dev/null || true &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend/node_modules &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend/packages/player/node_modules &&
-      chown -R node:node /home/mediacms.io/mediacms/frontend/packages/scripts/node_modules &&
-      echo 'Switching to node user...' &&
-      su node -c '
-        export NPM_CONFIG_PREFIX=/home/node/.npm-global &&
-        echo \"Setting up frontend...\" &&
-        rm -f package-lock.json &&
-        rm -f packages/player/package-lock.json &&
-        rm -f packages/scripts/package-lock.json &&
-        echo \"Installing dependencies...\" &&
-        npm install --legacy-peer-deps &&
-        echo \"Setting up workspaces...\" &&
-        npm install -g npm@latest &&
         cd packages/scripts &&
-        npm install --legacy-peer-deps &&
+        npm install --legacy-peer-deps --cache /home/node/.npm &&
-        npm install rollup@2.79.1 --save-dev --legacy-peer-deps &&
-        npm install typescript@4.9.5 --save-dev --legacy-peer-deps &&
-        npm install tslib@2.6.2 --save --legacy-peer-deps &&
-        npm install rollup-plugin-typescript2@0.34.1 --save-dev --legacy-peer-deps &&
-        npm install --legacy-peer-deps &&
         npm run build &&
         cd ../.. &&
-        cd packages/player &&
+        touch node_modules/.install-complete &&
-        npm install --legacy-peer-deps &&
+        echo 'Dependencies installed successfully'
+      else
+        echo 'Dependencies already installed, skipping installation...' &&
+        if [ ! -d packages/scripts/dist ]; then
+          echo 'Building scripts package...' &&
+          cd packages/scripts &&
           npm run build &&
-        cd ../.. &&
+          cd ../..
-        echo \"Starting development server...\" &&
+        fi
+      fi &&
+      echo 'Starting development server...' &&
       npm run start
-      '"
+      "
     env_file:
       - ${PWD}/frontend/.env
-    environment:
-      - NPM_CONFIG_PREFIX=/home/node/.npm-global
     ports:
       - "8088:8088"
     depends_on:
@@ -95,13 +76,13 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./:/home/mediacms.io/mediacms/
+      - ../:/home/mediacms.io/mediacms/
     depends_on:
       - migrations
   db:
     image: postgres:17.2-alpine
     volumes:
-      - ./postgres_data:/var/lib/postgresql/data/
+      - ../postgres_data:/var/lib/postgresql/data/
     restart: always
     environment:
       POSTGRES_USER: mediacms
@@ -127,7 +108,7 @@ services:
     deploy:
       replicas: 1
     volumes:
-      - ./:/home/mediacms.io/mediacms/
+      - ../:/home/mediacms.io/mediacms/
     environment:
       ENABLE_UWSGI: 'no'
       ENABLE_NGINX: 'no'
@@ -139,6 +120,5 @@ services:
 
 volumes:
   frontend_node_modules:
-  player_node_modules:
   scripts_node_modules:
-  npm_global:
+  npm_cache:

docs/admins_docs.md

@@ -2,7 +2,7 @@
 
 ## Table of contents
 - [1. Welcome](#1-welcome)
-- [2. Server Installaton](#2-server-installation)
+- [2. Single Server Installaton](#2-single-server-installation)
 - [3. Docker Installation](#3-docker-installation)
 - [4. Docker Deployment options](#4-docker-deployment-options)
 - [5. Configuration](#5-configuration)
@@ -21,19 +21,27 @@
 - [18. Disable encoding and show only original file](#18-disable-encoding-and-show-only-original-file)
 - [19. Rounded corners on videos](#19-rounded-corners)
 - [20. Translations](#20-translations)
-- [21. How to change the video frames on videos](#21-fames)
+- [21. How to change the video frames on videos](#21-how-to-change-the-video-frames-on-videos)
+- [22. Role-Based Access Control](#22-role-based-access-control)
+- [23. SAML setup](#23-saml-setup)
+- [24. Identity Providers setup](#24-identity-providers-setup)
+- [25. Custom urls](#25-custom-urls)
+- [26. Allowed files](#26-allowed-files)
+- [27. User upload limits](#27-user-upload-limits)
+- [28. Whisper Transcribe for Automatic Subtitles](#28-whisper-transcribe-for-automatic-subtitles)
+
 
 ## 1. Welcome
 This page is created for MediaCMS administrators that are responsible for setting up the software, maintaining it and making modifications.
 
-## 2. Server Installation
+## 2. Single Server Installation
 
-The core dependencies are Python3, Django3, Celery, PostgreSQL, Redis, ffmpeg. Any system that can have these dependencies installed, can run MediaCMS. But we strongly suggest installing on Linux Ubuntu (tested on versions 20, 22).
+The core dependencies are python3, Django, celery, PostgreSQL, redis, ffmpeg. Any system that can have these dependencies installed, can run MediaCMS. But the install.sh is only tested in Linux Ubuntu 24 and 22 versions.
 
-Installation on an Ubuntu system with git utility installed should be completed in a few minutes with the following steps.
+Installation on an Ubuntu 22/24 system with git utility installed should be completed in a few minutes with the following steps.
 Make sure you run it as user root, on a clear system, since the automatic script will install and configure the following services: Celery/PostgreSQL/Redis/Nginx and will override any existing settings.
 
-Automated script - tested on Ubuntu 20, Ubuntu 22 and Debian Buster
+
 
 ```bash
 mkdir /home/mediacms.io && cd /home/mediacms.io/
@@ -84,13 +92,11 @@ Database can be backed up with pg_dump and media_files on /home/mediacms.io/medi
 ## Installation
 Install a recent version of [Docker](https://docs.docker.com/get-docker/), and [Docker Compose](https://docs.docker.com/compose/install/).
 
-For Ubuntu 20/22 systems this is:
+For Ubuntu systems this is:
 
 ```bash
 curl -fsSL https://get.docker.com -o get-docker.sh
 sudo sh get-docker.sh
-sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
 ```
 
 Then run as root
@@ -106,7 +112,7 @@ If you want to explore more options (including setup of https with letsencrypt c
 Run
 
 ```bash
-docker-compose up
+docker compose up
 ```
 
 This will download all MediaCMS related Docker images and start all containers. Once it finishes, MediaCMS will be installed and available on http://localhost or http://ip
@@ -119,6 +125,12 @@ migrations_1     | Created admin user with password: gwg1clfkwf
 
 or if you have set the ADMIN_PASSWORD variable on docker-compose file you have used (example `docker-compose.yaml`), that variable will be set as the admin user's password
 
+`Note`: if you want to use the automatic transcriptions, you have to do one of the following:
+* either use the docker-compose.full.yaml, so in this case run `docker-compose -f docker-compose.yaml -f docker-compose.full.yaml up`
+* or edit the docker-compose.yaml file and set the image for the celery_worker service as mediacms/mediacms:full instead of mediacms/mediacms:latest
+
+Plus set variable `USE_WHISPER_TRANSCRIBE = True` in the settings.py file
+
 ### Update
 
 Get latest MediaCMS image and stop/start containers
@@ -126,8 +138,8 @@ Get latest MediaCMS image and stop/start containers
 ```bash
 cd /path/to/mediacms/installation
 docker pull mediacms/mediacms
-docker-compose down
+docker compose down
-docker-compose up
+docker compose up
 ```
 
 ### Update from version 2 to version 3
@@ -165,9 +177,7 @@ By default, all these services are enabled, but in order to create a scaleable d
 
 Also see the `Dockerfile` for other environment variables which you may wish to override. Application settings, eg. `FRONTEND_HOST` can also be overridden by updating the `deploy/docker/local_settings.py` file.
 
-See example deployments in the sections below. These example deployments have been tested on `docker-compose version 1.27.4` running on `Docker version 19.03.13`
+To run, update the configs above if necessary, build the image by running `docker compose build`, then run `docker compose run`
-
-To run, update the configs above if necessary, build the image by running `docker-compose build`, then run `docker-compose run`
 
 ### Simple Deployment, accessed as http://localhost
 
@@ -184,7 +194,7 @@ Edit this file and set `VIRTUAL_HOST` as my_domain.com, `LETSENCRYPT_HOST` as my
 
 Edit `deploy/docker/local_settings.py` and set https://my_domain.com as `FRONTEND_HOST`
 
-Now run docker-compose -f docker-compose-letsencrypt.yaml up, when installation finishes you will be able to access https://my_domain.com using a valid Letsencrypt certificate!
+Now run `docker compose -f docker-compose-letsencrypt.yaml up`, when installation finishes you will be able to access https://my_domain.com using a valid Letsencrypt certificate!
 
 ### Advanced Deployment, accessed as http://localhost:8000
 
@@ -225,12 +235,17 @@ Single server installation: edit `cms/local_settings.py`, make a change and rest
 Docker Compose installation: edit `deploy/docker/local_settings.py`, make a change and restart MediaCMS containers
 
 ```bash
-#docker-compose restart web celery_worker celery_beat
+#docker compose restart web celery_worker celery_beat
 ```
 
 ### 5.1 Change portal logo
 
-Set a new svg file for the white theme (`static/images/logo_dark.svg`) or the dark theme (`static/images/logo_light.svg`)
+Find the default svg files for the white theme on `static/images/logo_dark.svg` and for the dark theme on `static/images/logo_light.svg`
+You can specify new svg paths to override by editing the `PORTAL_LOGO_DARK_SVG` and `PORTAL_LOGO_LIGHT_SVG` variables in `settings.py`.
+
+You can also use custom pngs, by setting the variables `PORTAL_LOGO_DARK_PNG` and `PORTAL_LOGO_LIGHT_PNG` in `settings.py`. The svg files have priority over png files, so if both are set, svg files will be used.
+
+In any case, make sure the files are placed on the static/images folder.
 
 ### 5.2 Set global portal title
 
@@ -499,6 +514,30 @@ By default `CAN_COMMENT = "all"` means that all registered users can add comment
 
 - **advancedUser**, only users that are marked as advanced users can add comment. Admins or MediaCMS managers can make users advanced users by editing their profile and selecting advancedUser.
 
+### 5.26 Control whether anonymous users can list all users
+
+By default, anonymous users can view the list of all users on the platform. To restrict this to authenticated users only, set:
+
+```
+ALLOW_ANONYMOUS_USER_LISTING = False
+```
+
+When set to False, only logged-in users will be able to access the user listing API endpoint.
+
+
+### 5.27 Control who can see the members page
+
+By default `CAN_SEE_MEMBERS_PAGE = "all"` means that all registered users can see the members page. Other valid options are:
+
+- **editors**, only MediaCMS editors can view the page
+- **admins**, only MediaCMS admins can view the page
+
+
+### 5.28 Require user approval on registration
+
+By default, users do not require approval, so they can login immediately after registration (if registration is open). However, if the parameter `USERS_NEEDS_TO_BE_APPROVED` is set to `True`, they will first have to have their accounts approved by an administrator before they can successfully sign in.
+Administrators can approve users through the following ways: 1. through Django administration, 2. through the users management page, 3. through editing the profile page directly. In all cases, set 'Is approved' to True.
+
 
 ## 6. Manage pages
 to be written
@@ -804,14 +843,8 @@ This will disable the transcoding process and only the original file will be sho
 
 ## 19. Rounded corners on videos
 
-By default the video player and media items are now having rounded corners, on larger screens (not in mobile). If you don't like this change, remove the `border-radius` added on the following files:
+By default the video player and media items are now having rounded corners, on larger screens (not in mobile). If you don't like this change, set `USE_ROUNDED_CORNERS = False` in `local_settings.py`.
 
-```
-frontend/src/static/css/_extra.css
-frontend/src/static/js/components/list-item/Item.scss
-frontend/src/static/js/components/media-page/MediaPage.scss
-```
-you now have to re-run the frontend build in order to see the changes (check docs/dev_exp.md)
 
 
 ## 20. Translations
@@ -861,3 +894,147 @@ By default while watching a video you can hover and see the small images named s
 
 After that, newly uploaded videos will have sprites generated with the new number of seconds.
 
+
+
+## 22. Role-Based Access Control
+
+By default there are 3 statuses for any Media that lives on the system, public, unlisted, private. When RBAC support is added, a user that is part of a group has access to media that are published to one or more categories that the group is associated with. The workflow is this:
+
+
+1. A Group is created
+2. A Category is associated with the Group
+3. A User is added to the Group
+
+Now user can view the Media even if it is in private state. User also sees all media in Category page
+
+When user is added to group, they can be set as Member, Contributor, Manager.
+
+- Member: user can view media that are published on one or more categories that this group is associated with
+- Contributor: besides viewing, user can also edit the Media in a category associated with this Group. They can also publish Media to this category
+- Manager: same as Contributor for now
+
+Use cases facilitated with RBAC:
+- viewing a Media in private state: if RBAC is enabled, if user is Member on a Group that is associated with a Category, and the media is published to this Category, then user can view the media
+- editing a Media: if RBAC is enabled, and user is Contributor to one or more Categories, they can publish media to these Categories as long as they are associated with one Group
+- viewing all media of a category: if RBAC is enabled, and user visits a Category, they are able to see the listing of all media that are published in this category, independent of their state, provided that the category is associated with a group that the user is member of
+- viewing all categories associated with groups the user is member of: if RBAC is enabled, and user visits the listing of categories, they can view all categories that are associated with a group the user is member
+
+How to enable RBAC support:
+
+```
+USE_RBAC = True
+```
+
+on `local_settings.py` and restart the instance.
+
+
+## 23. SAML setup
+SAML authentication is supported along with the option to utilize the SAML response and do useful things as setting up the user role in MediaCMS or participation in groups.
+
+To enable SAML support, edit local_settings.py and set the following options:
+
+```
+USE_RBAC = True
+USE_SAML = True
+USE_IDENTITY_PROVIDERS = True
+
+USE_X_FORWARDED_HOST = True
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+SECURE_SSL_REDIRECT = True
+CSRF_COOKIE_SECURE = True
+SESSION_COOKIE_SECURE = True
+
+SOCIALACCOUNT_ADAPTER = 'saml_auth.adapter.SAMLAccountAdapter'
+SOCIALACCOUNT_PROVIDERS = {
+    "saml": {
+        "provider_class": "saml_auth.custom.provider.CustomSAMLProvider",
+    }
+}
+```
+
+
+To set a SAML provider:
+
+- Step 1: Add SAML Identity Provider
+1. Navigate to Admin panel
+2. Select "Identity Provider"
+3. Configure as follows:
+   - **Provider**: saml
+   - **Provider ID**: an ID for the provider
+   - **IDP Config Name**: a name for the provider
+   - **Client ID**: the identifier that is part of the login, and that is shared with the IDP.
+   - **Site**: Set the default one
+
+- Step 2: Add SAML Configuration
+Select the SAML Configurations tab, create a new one and set:
+
+1. **IDP ID**: Must be a URL
+2. **IDP Certificate**: x509cert from your SAML provider
+3. **SSO URL**:
+4. **SLO URL**:
+5. **SP Metadata URL**: The metadata URL that the IDP will utilize. This can be https://{portal}/saml/metadata and is autogenerated by MediaCMS
+
+- Step 3: Set other Options
+1. **Email Settings**:
+   - `verified_email`: When enabled, emails from SAML responses will be marked as verified
+   - `Remove from groups`: When enabled, user is removed from a group after login, if they have been removed from the group on the IDP
+2. **Global Role Mapping**: Maps the role returned by SAML (as set in the SAML Configuration tab) with the role in MediaCMS
+3. **Group Role Mapping**: Maps the role returned by SAML (as set in the SAML Configuration tab) with the role in groups that user will be added
+4. **Group mapping**: This creates groups associated with this IDP. Group ids as they come from SAML, associated with MediaCMS groups
+5. **Category Mapping**: This maps a group id (from SAML response) with a category in MediaCMS
+
+A full SAML deployment with [EntraID guide and troubleshooting steps is available here.](./saml_entraid_setup.md). This guide can be used as reference for other IDPs too.
+
+## 24. Identity Providers setup
+
+A separate Django app identity_providers has been added in order to facilitate a number of configurations related to different identity providers. If this is enabled, it gives the following options:
+
+- allows to add an Identity Provider through Django admin, and set a number of mappings, as Group Mapping, Global Role mapping and more. While SAML is the only provider that can be added out of the box, any identity provider supported by django allauth can be added with minimal effort. If the response of the identity provider contains attributes as role, or groups, then these can be mapped to MediaCMS specific roles (advanced user, editor, manager, admin) and groups (rbac groups)
+- saves SAML response logs after user is authenticated (can be utilized for other providers too)
+- allows to specify a list of login options through the admin (eg system login, identity provider login)
+
+
+to enable the identity providers, set the following setting on `local_settings.py`:
+
+
+```
+USE_IDENTITY_PROVIDERS = True
+```
+
+Visiting the admin, you will see the Identity Providers tab and you can add one.
+
+## 25. Custom urls
+To enable custom urls, set `ALLOW_CUSTOM_MEDIA_URLS = True` on settings.py or local_settings.py
+This will enable editing the URL of the media, while editing a media. If the URL is already taken you get a message you cannot update this.
+
+## 26. Allowed files
+MediaCMS performs identification attempts on new file uploads and only allows certain file types specified in the `ALLOWED_MEDIA_UPLOAD_TYPES` setting. By default, only ["video", "audio", "image", "pdf"] files are allowed.
+
+When a file is not identified as one of these allowed types, the file gets removed from the system and there's an entry indicating that this is not a supported media type.
+
+If you want to change the allowed file types, edit the `ALLOWED_MEDIA_UPLOAD_TYPES` list in your `settings.py` or `local_settings.py` file. If 'all' is specified in this list, no check is performed and all files are allowed.
+
+## 27. User upload limits
+MediaCMS allows you to set a maximum number of media files that each user can upload. This is controlled by the `NUMBER_OF_MEDIA_USER_CAN_UPLOAD` setting in `settings.py` or `local_settings.py`. By default, this is set to 100 media items per user.
+
+When a user reaches this limit, they will no longer be able to upload new media until they delete some of their existing content. This limit applies regardless of the user's role or permissions in the system.
+
+To change the maximum number of uploads allowed per user, modify the `NUMBER_OF_MEDIA_USER_CAN_UPLOAD` value in your settings file:
+
+```
+NUMBER_OF_MEDIA_USER_CAN_UPLOAD = 5
+```
+
+## 28. Whisper Transcribe for Automatic Subtitles
+MediaCMS can integrate with OpenAI's Whisper to automatically generate subtitles for your media files. This feature is useful for making your content more accessible.
+
+### How it works
+When the whisper transcribe task is triggered for a media file, MediaCMS runs the `whisper` command-line tool to process the audio and generate a subtitle file in VTT format. The generated subtitles are then associated with the media and are available under the "automatic" language option.
+
+### Configuration
+
+Transcription functionality is available only for the Docker installation. To enable this feature, you must either use the `docker-compose.full.yaml` file, as it contains an image with the necessary requirements, or you can also set that celery_worker service is usine mediacms:full image instead of mediacms:latest. Then you also have to set the setting: `USE_WHISPER_TRANSCRIBE = True` in your local_settings.py file.
+
+By default, all users have the ability to send a request for a video to be transcribed, as well as transcribed and translated to English. If you wish to change this behavior, you can edit the `settings.py` file and set `USER_CAN_TRANSCRIBE_VIDEO=False`.
+
+The transcription uses the base model of Whisper speech-to-text by default. However, you can change the model by editing the `WHISPER_MODEL` setting in `settings.py`.

docs/dev_exp.md

@@ -4,10 +4,10 @@ There is ongoing effort to provide a better developer experience and document it
 ## How to develop locally with Docker
 First install a recent version of [Docker](https://docs.docker.com/get-docker/), and [Docker Compose](https://docs.docker.com/compose/install/).
 
-Then run `docker-compose -f docker-compose-dev.yaml up`
+Then run `docker compose -f docker-compose-dev.yaml up`
 
 ```
-user@user:~/mediacms$ docker-compose -f docker-compose-dev.yaml up
+user@user:~/mediacms$ docker compose -f docker-compose-dev.yaml up
 ```
 
 In a few minutes the app will be available at http://localhost . Login via admin/admin
@@ -37,7 +37,7 @@ Django starts at http://localhost and is reloading automatically. Making any cha
 If Django breaks due to an error (eg SyntaxError, while editing the code), you might have to restart it
 
 ```
-docker-compose -f docker-compose-dev.yaml restart web
+docker compose -f docker-compose-dev.yaml restart web
 ```
 
 
@@ -62,9 +62,9 @@ In order to make changes to React code, edit code on frontend/src and check it's
 ### Development workflow with the frontend
 1. Edit frontend/src/ files
 2. Check changes on http://localhost:8088/
-3. Build frontend with `docker-compose -f docker-compose-dev.yaml exec frontend npm run dist`
+3. Build frontend with `docker compose -f docker-compose-dev.yaml exec frontend npm run dist`
 4. Copy static files to Django static folder with`cp -r frontend/dist/static/* static/`
-5. Restart Django - `docker-compose -f docker-compose-dev.yaml restart web` so that it uses the new static files
+5. Restart Django - `docker compose -f docker-compose-dev.yaml restart web` so that it uses the new static files
 6. Commit the changes
 
 ### Helper commands
@@ -81,7 +81,7 @@ Build the frontend:
 
 ```
 user@user:~/mediacms$ make build-frontend
-docker-compose -f docker-compose-dev.yaml exec frontend npm run dist
+docker compose -f docker-compose-dev.yaml exec frontend npm run dist
 
 > mediacms-frontend@0.9.1 dist /home/mediacms.io/mediacms/frontend
 > mediacms-scripts rimraf ./dist && mediacms-scripts build --config=./config/mediacms.config.js --env=dist

docs/developers_docs.md

@@ -50,8 +50,8 @@ Checkout the [Code of conduct page](../CODE_OF_CONDUCT.md) if you want to contri
 To perform the Docker installation, follow instructions to install Docker + Docker compose (docs/Docker_Compose.md) and then build/start docker-compose-dev.yaml . This will run the frontend application on port 8088 on top of all other containers (including the Django web application on port 80)
 
 ```
-docker-compose -f docker-compose-dev.yaml build
+docker compose -f docker-compose-dev.yaml build
-docker-compose -f docker-compose-dev.yaml up
+docker compose -f docker-compose-dev.yaml up
 ```
 
 An `admin` user is created during the installation process. Its attributes are defined in `docker-compose-dev.yaml`:
@@ -65,7 +65,7 @@ ADMIN_EMAIL: 'admin@localhost'
 Eg change `frontend/src/static/js/pages/HomePage.tsx` , dev application refreshes in a number of seconds (hot reloading) and I see the changes, once I'm happy I can run
 
 ```
-docker-compose -f docker-compose-dev.yaml exec -T frontend npm run dist
+docker compose -f docker-compose-dev.yaml exec -T frontend npm run dist
 ```
 
 And then in order for the changes to be visible on the application while served through nginx,
@@ -90,7 +90,7 @@ http://localhost:8088/manage-media.html manage_media
 After I make changes to the django application (eg make a change on `files/forms.py`) in order to see the changes I have to restart the web container
 
 ```
-docker-compose -f docker-compose-dev.yaml restart web
+docker compose -f docker-compose-dev.yaml restart web
 ```
 
 ## How video is transcoded
@@ -122,19 +122,19 @@ This instructions assume that you're using the docker installation
 1. start docker-compose
 
 ```
-docker-compose up
+docker compose up
 ```
 
 2. Install the requirements on `requirements-dev.txt ` on web container (we'll use the web container for this)
 
 ```
-docker-compose exec -T web pip install -r requirements-dev.txt 
+docker compose exec -T web pip install -r requirements-dev.txt
 ```
 
 3. Now you can run the existing tests
 
 ```
-docker-compose exec --env TESTING=True -T web pytest
+docker compose exec --env TESTING=True -T web pytest
 ```
 
 The `TESTING=True` is passed for Django to be aware this is a testing environment (so that it runs Celery tasks as functions for example and not as background tasks, since Celery is not started in the case of pytest)
@@ -143,13 +143,13 @@ The `TESTING=True` is passed for Django to be aware this is a testing environmen
 4. You may try a single test, by specifying the path, for example
 
 ```
-docker-compose exec --env TESTING=True -T web pytest tests/test_fixtures.py
+docker compose exec --env TESTING=True -T web pytest tests/test_fixtures.py
 ```
 
 5. You can also see the coverage
 
 ```
-docker-compose exec --env TESTING=True -T web pytest --cov=. --cov-report=html
+docker compose exec --env TESTING=True -T web pytest --cov=. --cov-report=html
 ```
 
 and of course...you are very welcome to help us increase it ;)

docs/media_permissions.md

@@ -0,0 +1,166 @@
+# Media Permissions in MediaCMS
+
+This document explains the permission system in MediaCMS, which controls who can view, edit, and manage media files.
+
+## Overview
+
+MediaCMS provides a flexible permission system that allows fine-grained control over media access. The system supports:
+
+1. **Basic permissions** - Public, private, and unlisted media
+2. **User-specific permissions** - Direct permissions granted to specific users
+3. **Role-Based Access Control (RBAC)** - Category-based permissions through group membership
+
+## Media States
+
+Every media file has a state that determines its basic visibility:
+
+- **Public** - Visible to everyone
+- **Private** - Only visible to the owner and users with explicit permissions
+- **Unlisted** - Not listed in public listings but accessible via direct link
+
+
+## User Roles
+
+MediaCMS has several user roles that affect permissions:
+
+- **Regular User** - Can upload and manage their own media
+- **Advanced User** - Additional capabilities (configurable)
+- **MediaCMS Editor** - Can edit and review content across the platform
+- **MediaCMS Manager** - Full management capabilities
+- **Admin** - Complete system access
+
+## Direct Media Permissions
+
+The `MediaPermission` model allows granting specific permissions to individual users:
+
+### Permission Levels
+
+- **Viewer** - Can view the media even if it's private
+- **Editor** - Can view and edit the media's metadata
+- **Owner** - Full control, including deletion
+
+## Role-Based Access Control (RBAC)
+
+When RBAC is enabled (`USE_RBAC` setting), permissions can be managed through categories and groups:
+
+1. Categories can be marked as RBAC-controlled
+2. Users are assigned to RBAC groups with specific roles
+3. RBAC groups are associated with categories
+4. Users inherit permissions to media in those categories based on their role
+
+### RBAC Roles
+
+- **Member** - Can view media in the category
+- **Contributor** - Can view and edit media in the category
+- **Manager** - Full control over media in the category
+
+## Permission Checking Methods
+
+The User model provides several methods to check permissions:
+
+```python
+# From users/models.py
+def has_member_access_to_media(self, media):
+    # Check if user can view the media
+    # ...
+
+def has_contributor_access_to_media(self, media):
+    # Check if user can edit the media
+    # ...
+
+def has_owner_access_to_media(self, media):
+    # Check if user has full control over the media
+    # ...
+```
+
+## How Permissions Are Applied
+
+When a user attempts to access media, the system checks permissions in this order:
+
+1. Is the media public? If yes, allow access.
+2. Is the user the owner of the media? If yes, allow full access.
+3. Does the user have direct permissions through MediaPermission? If yes, grant the corresponding access level.
+4. If RBAC is enabled, does the user have access through category membership? If yes, grant the corresponding access level.
+5. If none of the above, deny access.
+
+## Media Sharing
+
+Users can share media with others by:
+
+1. Making it public or unlisted
+2. Granting direct permissions to specific users
+3. Adding it to a category that's accessible to an RBAC group
+
+## Implementation Details
+
+### Media Listing
+
+When listing media, the system filters based on permissions:
+
+```python
+# Simplified example from files/views/media.py
+def _get_media_queryset(self, request, user=None):
+    # 1. Public media
+    listable_media = Media.objects.filter(listable=True)
+
+    if not request.user.is_authenticated:
+        return listable_media
+
+    # 2. User permissions for authenticated users
+    user_media = Media.objects.filter(permissions__user=request.user)
+
+    # 3. RBAC for authenticated users
+    if getattr(settings, 'USE_RBAC', False):
+        rbac_categories = request.user.get_rbac_categories_as_member()
+        rbac_media = Media.objects.filter(category__in=rbac_categories)
+
+    # Combine all accessible media
+    return listable_media.union(user_media, rbac_media)
+```
+
+### Permission Checking
+
+The system uses helper methods to check permissions:
+
+```python
+# From users/models.py
+def has_member_access_to_media(self, media):
+    # First check if user is the owner
+    if media.user == self:
+        return True
+
+    # Then check RBAC permissions
+    if getattr(settings, 'USE_RBAC', False):
+        rbac_groups = RBACGroup.objects.filter(
+            memberships__user=self,
+            memberships__role__in=["member", "contributor", "manager"],
+            categories__in=media.category.all()
+        ).distinct()
+        if rbac_groups.exists():
+            return True
+
+    # Then check MediaShare permissions for any access
+    media_permission_exists = MediaPermission.objects.filter(
+        user=self,
+        media=media,
+    ).exists()
+
+    return media_permission_exists
+```
+
+## Best Practices
+
+1. **Default to Private** - Consider setting new uploads to private by default
+2. **Use Categories** - Organize media into categories for easier permission management
+3. **RBAC for Teams** - Use RBAC for team collaboration scenarios
+4. **Direct Permissions for Exceptions** - Use direct permissions for one-off sharing
+
+## Configuration
+
+The permission system can be configured through several settings:
+
+- `USE_RBAC` - Enable/disable Role-Based Access Control
+
+## Conclusion
+
+MediaCMS provides a flexible and powerful permission system that can accommodate various use cases, from simple personal media libraries to complex team collaboration scenarios with fine-grained access control.

docs/saml_entraid_setup.md

@@ -0,0 +1,315 @@
+# Integrating Microsoft Entra ID (formerly Azure AD) with MediaCMS via SAML Authentication
+
+This guide provides step-by-step instructions on how to configure Microsoft Entra ID as a SAML Identity Provider (IdP) for MediaCMS, an open-source content management system. The goal is to enable single sign-on (SSO) authentication for users in a secure and scalable way.
+
+## Table of Contents
+
+1. [Overview](#overview)
+2. [Prerequisites](#prerequisites)
+3. [Step 1: Configure MediaCMS for SAML](#step-1-configure-mediacms-for-saml)
+4. [Step 2: Register MediaCMS as an Enterprise App in Entra ID](#step-2-register-mediacms-as-an-enterprise-app-in-entra-id)
+5. [Step 3: Configure SAML Settings in Entra ID](#step-3-configure-saml-settings-in-entra-id)
+6. [Step 4: Configure SAML Settings in MediaCMS](#step-4-configure-saml-settings-in-mediacms)
+7. [Step 5: Allow Users or Groups to Log Into the Application](#step-5-allow-users-or-groups-to-log-into-the-application)
+8. [Step 6: Test and Validate Login Flow](#step-6-test-and-validate-login-flow)
+9. [Troubleshooting](#troubleshooting)
+10. [Resources](#resources)
+
+---
+
+## Overview
+
+MediaCMS supports SAML 2.0 authentication by acting as a Service Provider (SP). By integrating with Microsoft Entra ID, organizations can allow users to authenticate using their existing enterprise credentials.
+
+In our particular deployment of MediaCMS, the application is hosted internally with no direct inbound access from the public Internet. As an internal company application, it was essential to integrate it with our existing authentication systems and provide a seamless single sign-on experience. This is where the SAML protocol shines.
+
+One of the major advantages of SAML authentication is that all communication between the Identity Provider (IdP) — in this case, Microsoft Entra ID — and the Service Provider (SP) — MediaCMS — is brokered entirely by the end user's browser. The browser initiates the authentication flow, communicates securely with Microsoft’s login portal, receives the identity assertion, and then passes it back to the internal MediaCMS server.
+
+This architecture enables the MediaCMS server to remain isolated from the Internet while still participating in a modern and seamless federated login experience.
+
+Even though the deployment method outlined in this tutorial is for EntraID on an isolated MediaCMS server, the same steps and general information could be applied to another authentication SAML provider/identity provider on a non-isolated system.
+
+> **Note**: This guide assumes you are running MediaCMS with Django backend and that the `django-allauth` library is enabled and configured.
+
+---
+
+## Prerequisites
+
+Before beginning, ensure the following:
+
+* You have administrator access to both MediaCMS and Microsoft Entra ID (Azure portal).
+* MediaCMS is installed and accessible via HTTPS, with a valid SSL certificate.
+* Your MediaCMS installation has SAML support enabled (via `django-allauth`).
+* You have a dedicated domain or subdomain for MediaCMS (e.g., `https://<MyMediaCMS.MyDomain.com>`).
+
+---
+
+## Step 1: Configure MediaCMS for SAML
+
+The first step in enabling SAML authentication is to modify the `local_settings.py` (for Docker: `./deploy/docker/local_settings.py`) file of your MediaCMS deployment. Add the following configuration block to enable SAML support, role-based access control (RBAC), and enforce secure communication settings:
+
+```python
+USE_RBAC = True
+USE_SAML = True
+USE_IDENTITY_PROVIDERS = True
+
+USE_X_FORWARDED_HOST = True
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+SECURE_SSL_REDIRECT = True
+CSRF_COOKIE_SECURE = True
+SESSION_COOKIE_SECURE = True
+
+SOCIALACCOUNT_ADAPTER = 'saml_auth.adapter.SAMLAccountAdapter'
+SOCIALACCOUNT_PROVIDERS = {
+    "saml": {
+        "provider_class": "saml_auth.custom.provider.CustomSAMLProvider",
+    }
+}
+```
+
+These settings enable SAML authentication, configure MediaCMS to respect role-based access, and apply important headers and cookie policies for secure browser handling — all of which are necessary for the SAML flow to function properly.
+
+> ⚠️ **Important**: After updating the `local_settings.py` file, you must restart your MediaCMS service (e.g., by rebooting the Docker container) in order for the changes to take effect. This step must be completed before proceeding to the next configuration stage.
+
+---
+
+## Step 2: Register MediaCMS as an Enterprise App in Entra ID
+
+To begin the integration process on the Microsoft Entra ID (formerly Azure AD) side, follow the steps below to register MediaCMS as a new Enterprise Application.
+
+### 1. Navigate to Enterprise Applications
+
+* Log in to your [Azure Portal](https://portal.azure.com).
+* Navigate to **Enterprise Applications**.
+
+> *Note: This guide assumes you already have an existing Azure tenant and Entra ID configured with users and groups.*
+
+### 2. Create a New Application
+
+* Click the **+ New Application** button.
+* On the next screen, choose **Create your own application**.
+* Enter a name for the application (e.g., `MediaCMS`).
+* Under "What are you looking to do with your application?", select **Integrate any other application you don't find in the gallery (Non-gallery)**.
+* Click **Create**.
+
+After a few moments, Azure will create the new application and redirect you to its configuration page.
+
+---
+
+## Step 3: Configure SAML Settings in Entra ID
+
+### 1. Configure SAML-Based Single Sign-On
+
+* From the application overview page, in the left-hand menu under **Manage**, click **Single sign-on**.
+* You will be prompted to choose a sign-on method. Select **SAML**.
+
+### 2. Choose a Client ID Name
+
+Before filling out the SAML configuration, you must decide on a client ID name. This name will uniquely identify your SAML integration and appear in your login URL.
+
+* Choose a name that is descriptive and easy to remember (e.g., `mediacms_entraid`).
+* You will use this name in both MediaCMS and Entra ID configuration settings.
+
+### 3. Fill Out Basic SAML Configuration
+
+Now input the following values under the **Basic SAML Configuration** section:
+
+| Field                      | Value                                                                 |
+| -------------------------- | --------------------------------------------------------------------- |
+| **Identifier (Entity ID)** | `https://<MyMediaCMS.MyDomain.com>/saml/metadata/`                    |
+| **Reply URL (ACS URL)**    | `https://<MyMediaCMS.MyDomain.com>/accounts/saml/<MyClientID>/acs/`   |
+| **Sign-on URL**            | `https://<MyMediaCMS.MyDomain.com>/accounts/saml/<MyClientID>/login/` |
+| **Relay State (Optional)** | `https://<MyMediaCMS.MyDomain.com>/`                                  |
+| **Logout URL (Optional)**  | `https://<MyMediaCMS.MyDomain.com>/accounts/saml/<MyClientID>/sls/`   |
+
+> 🔐 Replace `<MyClientID>` with your own chosen client ID if different.
+
+Once these fields are filled in, save your configuration.
+
+Keep the Azure Enterprise single sign-on configuration window up, as we are now going to configure some of the details from this Azure page into our MediaCMS system.
+
+---
+
+## Step 4: Configure SAML Settings in MediaCMS
+
+In MediaCMS, start by logging into the back-end administrative web page. You will now have new options under the left-hand menu bar.
+
+### 1. Add Login Option
+
+* Navigate to **Identity Providers → Login Options**.
+
+* Click **Add Login Option**.
+
+* Give the login option a title. This title can be anything you like but it will appear to the end-user when they select a method of logging in, so ensure the name is clear. (e.g., `EntraID-SSO`).
+
+* Set the **Login URL** to the same Sign-on URL:
+
+  ```
+  https://<MyMediaCMS.MyDomain.com>/accounts/saml/<MyClientID>/login/
+  ```
+
+* Leave the ordering at `0` if you have no other authentication methods.
+
+* Ensure the **Active** box is checked to make this an active login method.
+
+* Click **Save** to continue.
+
+### 2. Add ID Provider
+
+* Navigate to **Identity Providers → ID Providers**.
+* Click **Add ID Provider**.
+
+Back in your Azure Enterprise application configuration window (at the bottom of the Single Sign-On configuration menu), find your application-specific details. They will look like the following example:
+
+```
+Example unique AppID: 123456ab-1234-12ab-ab12-abc123abc123
+The unique AppID is automatically generated when you create the application.
+
+-- Example URLs --
+Login URL: https://login.microsoftonline.com/123456ab-1234-12ab-ab12-abc123abc123/saml2
+Microsoft Entra Identifier: https://sts.windows.net/123456ab-1234-12ab-ab12-abc123abc123/
+Logout URL: https://login.microsoftonline.com/123456ab-1234-12ab-ab12-abc123abc123/saml2
+```
+
+Back in MediaCMS's new ID Provider window, under the **General** tab:
+
+* **Protocol**: `saml` (all lowercase)
+* **Provider ID**: The Microsoft Entra Identifier (as shown above), the whole URL.
+* **IDP Configuration Name**: Any unique name (e.g., `EntraID`)
+* **Client ID**: The exact same client ID you used earlier when configuring EntraID (e.g., `mediacms_entraid`).
+* **Sites**: Add all the sites you want this login to appear on (e.g., all of them)
+
+Click **Save and Continue**, then go to the **SAML Configuration** tab.
+
+On the **SAML Configuration** tab:
+
+* **SSO URL**: Use the same Logon URL from EntraID example listed above.
+
+* **SLO URL**: Use the Logout URL from EntraID example listed above.
+
+* **SP Metadata URL**:
+
+  ```
+  https://<MyMediaCMS.MyDomain.com>/saml/metadata/
+  ```
+
+* **IdP ID**: Use the same Microsoft Entra Identifier URL as listed above.
+
+#### LDP Certificate
+
+Back in Azure's Enterprise Application page (SAML certificates section), download the **Base64 Certificate**, open it in a text editor, and copy the contents into the **LDP Certificate** setting inside of MediaCMS.
+
+### 3. Configure Identity Mappings
+
+Map the identity attributes that Entra ID will provide to MediaCMS. Even though only UID is specified as mandatory, Entra ID will not work unless all of these details are filled in(YES, you must type NA in the fields; you cannot leave anything blank. You will get 500 errors if this is not done). You can use the exact settings below:
+
+| Field          | Value                                                                |
+| -------------- | -------------------------------------------------------------------- |
+| **Uid**        | `http://schemas.microsoft.com/identity/claims/objectidentifier`      |
+| **Name**       | `http://schemas.microsoft.com/identity/claims/displayname`           |
+| **Email**      | `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress` |
+| **Groups**     | `NA`                                                                 |
+| **First name** | `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname`    |
+| **Last name**  | `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname`      |
+| **User logo**  | `NA`                                                                 |
+| **Role**       | `NA`                                                                 |
+
+> ℹ️ Groups and Role can be changed or remapped inside the Azure Enterprise Application under **Attributes and Claims**.
+
+Check the **Verified Email** box (since EntraID will verify the user for you). While setting up, you can enable **Save SAML Response Log** for troubleshooting purposes.
+
+Finally, click **Save** to finish adding the new ID provider.
+
+---
+
+## Step 5: Allow Users or Groups to Log Into the Application
+
+Back inside Azure AD, within your MediaCMS Enterprise Application, you must assign users or groups that are allowed to use the MediaCMS authentication sign-on.
+
+### 1. Navigate to Users and Groups
+
+* Open the Azure Portal and go to your **MediaCMS Enterprise Application**.
+* In the left-hand **Manage** menu, click **Users and Groups**.
+
+### 2. Assign Users or Groups
+
+* Add individual users or groups of users who are allowed to use the EntraID authentication method with MediaCMS.
+* In this example, the application was provided to all registered users inside of EntraID by using the special group **All Users**, which grants any registered user in the tenant access to MediaCMS.
+
+> ⚠️ **Important**: Nested groups will not work. All users must be directly assigned to the group you are giving permission to. If a group contains another group, the users of the nested group will not inherit the permissions to use this application from the parent group.
+
+---
+
+## Step 6: Test and Validate Login Flow
+
+At this point, you should go to your MediaCMS webpage and attempt to log in using the authentication method that you have just set up.
+
+---
+
+## Troubleshooting
+
+If you're experiencing logon issues, it is helpful to first review the SAML authentication data directly.
+
+1. Go to MediaCMS's login page. It should redirect you to Microsoft's login page.
+2. Before completing the Microsoft authentication, open Firefox or Chrome Developer Tools (press **F12**) and navigate to the **Network** tab.
+3. Enable **Persistent Logging**.
+4. Complete the Microsoft authentication steps on your page (including two-factor authentication if enabled).
+
+On the final step of the authentication (usually after entering a code and confirming "Stay signed in?"), you will see several POST requests going back to your MediaCMS server URL. Find the POST request that is going to your MediaCMS server's Assertion Consumer Service (ACS) URL, which will look like this:
+
+```
+https://<MyMediaCMS.MyDomain.com>/accounts/saml/<MyClientID>/acs/
+```
+
+Inside the request section of the Network tab, you will see a **Form Data** field labeled **SAMLResponse**, which contains a Base64-encoded XML string of your authenticated assertion from EntraID.
+
+* Click into the data field of the SAML response so you can highlight and copy all of the Base64-encoded text.
+* You can then take this Base64-encoded text to a tool like [CyberChef](https://gchq.github.io/CyberChef/) and use the **From Base64** decoder and **XML Beautify** to reveal the XML-formatted SAML response.
+
+This decoded XML contains all the assertion and token details passed back to MediaCMS. You can use this information to troubleshoot any issues or misconfigurations that arise.
+
+You can also confirm your MediaCMS server has the SAML authentication settings correct by opening a private browsing window and navigating to the following URL, which will output the current XML data that your MediaCMS server is configured with:
+
+```
+https://<MyMediaCMS.MyDomain.com>/saml/metadata/
+```
+
+You can use the returned XML data from this URL to confirm that MediaCMS is configured appropriately as expected and is providing the correct information to the identity provider.
+
+### Infinite Redirect Loop
+
+Another issue you might encounter is an **infinite redirect loop**. This can happen when global login is enforced and local user login is disabled.
+
+**Symptoms:** The system continuously redirects between the homepage and the login URL.
+
+**Root Cause:** With global login required and local login disabled, Django attempts to redirect users to the default local login page. Since that login method is unavailable, users are bounced back to the homepage, triggering the same redirect logic again — resulting in a loop.
+
+**Solution:** Specify the correct SAML authentication URL in your local settings. For example:
+
+* "Login Option" URL configured for EntraID in MediaCMS:
+
+  ```
+  https://<MyDomainName>/accounts/saml/mediacms_entraid/login/
+  ```
+
+* Add the following line to `./deploy/docker/local_settings.py`:
+
+  ```python
+  LOGIN_URL = "/accounts/saml/mediacms_entraid/login/"
+  ```
+
+This change ensures Django uses the proper SAML login route, breaking the redirect loop and allowing authentication via EntraID as intended.
+
+> **Note:** The `LOGIN_URL` setting works because we are using the Django AllAuth module to perform the SAML authentication. If you review the AllAuth Django configuration settings, you will find that this is a setting, among other settings, that you can set inside of your local settings file that Django will pick up when using the AllAuth module. You can review the module documentation at the following URL for more details and additional settings that can be set through AllAuth via `local_settings.py`: [https://django-allauth.readthedocs.io/en/latest/account/configuration.html](https://django-allauth.readthedocs.io/en/latest/account/configuration.html)
+
+---
+
+## Resources
+
+* [MediaCMS SAML Docs](https://github.com/mediacms-io/mediacms/blob/main/docs/admins_docs.md#24-identity-providers-setup)
+* [Enable SAML single sign-on for an enterprise application](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/add-application-portal-setup-sso)
+* [Django AllAuth](https://django-allauth.readthedocs.io/en/latest/index.html)
+
+---
+
+*This documentation is a work-in-progress and will be updated as further steps are dictated or completed.*

docs/transcoding.md

@@ -0,0 +1,50 @@
+# Transcoding in MediaCMS
+
+MediaCMS uses FFmpeg for transcoding media files. Most of the transcoding settings and configurations are defined in `files/helpers.py`.
+
+## Configuration Options
+
+Several transcoding parameters can be customized in `cms/settings.py`:
+
+### FFmpeg Preset
+
+The default FFmpeg preset is set to "medium". This setting controls the encoding speed and compression efficiency trade-off.
+
+```python
+# ffmpeg options
+FFMPEG_DEFAULT_PRESET = "medium" # see https://trac.ffmpeg.org/wiki/Encode/H.264
+```
+
+Available presets include:
+- ultrafast
+- superfast
+- veryfast
+- faster
+- fast
+- medium (default)
+- slow
+- slower
+- veryslow
+
+Faster presets result in larger file sizes for the same quality, while slower presets provide better compression but take longer to encode.
+
+### Other Transcoding Settings
+
+Additional transcoding settings in `settings.py` include:
+
+- `FFMPEG_COMMAND`: Path to the FFmpeg executable
+- `FFPROBE_COMMAND`: Path to the FFprobe executable
+- `DO_NOT_TRANSCODE_VIDEO`: If set to True, only the original video is shown without transcoding
+- `CHUNKIZE_VIDEO_DURATION`: For videos longer than this duration (in seconds), they get split into chunks and encoded independently
+- `VIDEO_CHUNKS_DURATION`: Duration of each chunk (must be smaller than CHUNKIZE_VIDEO_DURATION)
+- `MINIMUM_RESOLUTIONS_TO_ENCODE`: Always encode these resolutions, even if upscaling is required
+
+## Advanced Configuration
+
+For more advanced transcoding settings, you may need to modify the following in `files/helpers.py`:
+
+- Video bitrates for different codecs and resolutions
+- Audio encoders and bitrates
+- CRF (Constant Rate Factor) values
+- Keyframe settings
+- Encoding parameters for different codecs (H.264, H.265, VP9)

docs/user_docs.md

@@ -11,6 +11,7 @@
 - [Share media](#share-media)
 - [Embed media](#embed-media)
 - [Customize my profile options](#customize-my-profile-options)
+- [Trim videos](#trim-videos)
 
 ## Uploading media
 
@@ -257,3 +258,7 @@ How to use the embed media option
 
 ## Customize my profile options
 Customize profile and channel
+
+## Trim videos
+Once a video is uploaded, you can trim it to create a new video or to replace the original one. You can also create segments of the video, which will be available as separate videos. Edit the video and click on the "Trime Video" option. If the original video has finished processing (encodings are created for all resolutions), then this is an action that runs instantly. If the original video hasn't processed, which is the case when you upload a video and edit it right away, then the trim action will trigger processing of the video and will take some time to finish. In all cases, you get to see the original video (or the trimmed versions) immediately, so you are sure of what you have uploaded or trimmed, with a message that the video is being processed.
+

files/admin.py

@@ -1,4 +1,11 @@
+from django import forms
+from django.conf import settings
 from django.contrib import admin
+from django.core.exceptions import ValidationError
+from django.db import transaction
+from tinymce.widgets import TinyMCE
+
+from rbac.models import RBACGroup
 
 from .models import (
     Category,
@@ -7,8 +14,12 @@ from .models import (
     Encoding,
     Language,
     Media,
+    Page,
     Subtitle,
     Tag,
+    TinyMCEMedia,
+    TranscriptionRequest,
+    VideoTrimRequest,
 )
 
 
@@ -49,12 +60,126 @@ class MediaAdmin(admin.ModelAdmin):
     get_comments_count.short_description = "Comments count"
 
 
+class CategoryAdminForm(forms.ModelForm):
+    rbac_groups = forms.ModelMultipleChoiceField(queryset=RBACGroup.objects.all(), required=False, widget=admin.widgets.FilteredSelectMultiple('Groups', False))
+
+    class Meta:
+        model = Category
+        fields = '__all__'
+
+    def clean(self):
+        cleaned_data = super().clean()
+        is_rbac_category = cleaned_data.get('is_rbac_category')
+        identity_provider = cleaned_data.get('identity_provider')
+        # Check if this category has any RBAC groups
+        if self.instance.pk:
+            has_rbac_groups = cleaned_data.get('rbac_groups')
+        else:
+            has_rbac_groups = False
+
+        if not is_rbac_category:
+            if has_rbac_groups:
+                cleaned_data['is_rbac_category'] = True
+                # self.add_error('is_rbac_category', ValidationError('This category has RBAC groups assigned. "Is RBAC Category" must be enabled.'))
+
+        for rbac_group in cleaned_data.get('rbac_groups'):
+            if rbac_group.identity_provider != identity_provider:
+                self.add_error('rbac_groups', ValidationError('Chosen Groups are associated with a different Identity Provider than the one selected here.'))
+
+        return cleaned_data
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance.pk:
+            self.fields['rbac_groups'].initial = self.instance.rbac_groups.all()
+
+    def save(self, commit=True):
+        category = super().save(commit=True)
+
+        if commit:
+            self.save_m2m()
+
+        if self.instance.rbac_groups.exists() or self.cleaned_data.get('rbac_groups'):
+            if not self.cleaned_data['is_rbac_category']:
+                category.is_rbac_category = True
+                category.save(update_fields=['is_rbac_category'])
+        return category
+
+    @transaction.atomic
+    def save_m2m(self):
+        if self.instance.pk:
+            rbac_groups = self.cleaned_data['rbac_groups']
+            self._update_rbac_groups(rbac_groups)
+
+    def _update_rbac_groups(self, rbac_groups):
+        new_rbac_group_ids = RBACGroup.objects.filter(pk__in=rbac_groups).values_list('pk', flat=True)
+
+        existing_rbac_groups = RBACGroup.objects.filter(categories=self.instance)
+        existing_rbac_groups_ids = existing_rbac_groups.values_list('pk', flat=True)
+
+        rbac_groups_to_add = RBACGroup.objects.filter(pk__in=new_rbac_group_ids).exclude(pk__in=existing_rbac_groups_ids)
+        rbac_groups_to_remove = existing_rbac_groups.exclude(pk__in=new_rbac_group_ids)
+
+        for rbac_group in rbac_groups_to_add:
+            rbac_group.categories.add(self.instance)
+
+        for rbac_group in rbac_groups_to_remove:
+            rbac_group.categories.remove(self.instance)
+
+
 class CategoryAdmin(admin.ModelAdmin):
-    search_fields = ["title"]
+    form = CategoryAdminForm
-    list_display = ["title", "user", "add_date", "is_global", "media_count"]
+
-    list_filter = ["is_global"]
+    search_fields = ["title", "uid"]
+    list_display = ["title", "user", "add_date", "media_count"]
+    list_filter = []
     ordering = ("-add_date",)
     readonly_fields = ("user", "media_count")
+    change_form_template = 'admin/files/category/change_form.html'
+
+    def get_list_filter(self, request):
+        list_filter = list(self.list_filter)
+
+        if getattr(settings, 'USE_RBAC', False):
+            list_filter.insert(0, "is_rbac_category")
+        if getattr(settings, 'USE_IDENTITY_PROVIDERS', False):
+            list_filter.insert(-1, "identity_provider")
+
+        return list_filter
+
+    def get_list_display(self, request):
+        list_display = list(self.list_display)
+        if getattr(settings, 'USE_RBAC', False):
+            list_display.insert(-1, "is_rbac_category")
+        if getattr(settings, 'USE_IDENTITY_PROVIDERS', False):
+            list_display.insert(-1, "identity_provider")
+
+        return list_display
+
+    def get_fieldsets(self, request, obj=None):
+        basic_fieldset = [
+            (
+                'Category Information',
+                {
+                    'fields': ['uid', 'title', 'description', 'user', 'media_count', 'thumbnail', 'listings_thumbnail'],
+                },
+            ),
+        ]
+
+        if getattr(settings, 'USE_RBAC', False):
+            rbac_fieldset = [
+                ('RBAC Settings', {'fields': ['is_rbac_category'], 'classes': ['tab'], 'description': 'Role-Based Access Control settings'}),
+                ('Group Access', {'fields': ['rbac_groups'], 'description': 'Select the Groups that have access to category'}),
+            ]
+            if getattr(settings, 'USE_IDENTITY_PROVIDERS', False):
+                rbac_fieldset = [
+                    ('RBAC Settings', {'fields': ['is_rbac_category', 'identity_provider'], 'classes': ['tab'], 'description': 'Role-Based Access Control settings'}),
+                    ('Group Access', {'fields': ['rbac_groups'], 'description': 'Select the Groups that have access to category'}),
+                ]
+            return basic_fieldset + rbac_fieldset
+        else:
+            return basic_fieldset
 
 
 class TagAdmin(admin.ModelAdmin):
@@ -79,6 +204,10 @@ class SubtitleAdmin(admin.ModelAdmin):
     pass
 
 
+class VideoTrimRequestAdmin(admin.ModelAdmin):
+    pass
+
+
 class EncodingAdmin(admin.ModelAdmin):
     list_display = ["get_title", "chunk", "profile", "progress", "status", "has_file"]
     list_filter = ["chunk", "profile", "status"]
@@ -94,11 +223,47 @@ class EncodingAdmin(admin.ModelAdmin):
     has_file.short_description = "Has file"
 
 
+class TranscriptionRequestAdmin(admin.ModelAdmin):
+    pass
+
+
+class PageAdminForm(forms.ModelForm):
+    description = forms.CharField(widget=TinyMCE())
+
+    def clean_description(self):
+        content = self.cleaned_data['description']
+        # Add sandbox attribute to all iframes
+        content = content.replace('<iframe ', '<iframe sandbox="allow-scripts allow-same-origin allow-presentation" ')
+        return content
+
+    class Meta:
+        model = Page
+        fields = "__all__"
+
+
+class PageAdmin(admin.ModelAdmin):
+    form = PageAdminForm
+
+
+@admin.register(TinyMCEMedia)
+class TinyMCEMediaAdmin(admin.ModelAdmin):
+    list_display = ['original_filename', 'file_type', 'uploaded_at', 'user']
+    list_filter = ['file_type', 'uploaded_at']
+    search_fields = ['original_filename']
+    readonly_fields = ['uploaded_at']
+    date_hierarchy = 'uploaded_at'
+
+
 admin.site.register(EncodeProfile, EncodeProfileAdmin)
 admin.site.register(Comment, CommentAdmin)
 admin.site.register(Media, MediaAdmin)
 admin.site.register(Encoding, EncodingAdmin)
 admin.site.register(Category, CategoryAdmin)
+admin.site.register(Page, PageAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(Subtitle, SubtitleAdmin)
 admin.site.register(Language, LanguageAdmin)
+admin.site.register(VideoTrimRequest, VideoTrimRequestAdmin)
+admin.site.register(TranscriptionRequest, TranscriptionRequestAdmin)
+
+Media._meta.app_config.verbose_name = "Media"

files/context_processors.py

@@ -1,5 +1,7 @@
 from django.conf import settings
 
+from cms.version import VERSION
+
 from .frontend_translations import get_translation, get_translation_strings
 from .methods import is_mediacms_editor, is_mediacms_manager
 
@@ -10,6 +12,12 @@ def stuff(request):
     ret["FRONTEND_HOST"] = request.build_absolute_uri('/').rstrip('/')
     ret["DEFAULT_THEME"] = settings.DEFAULT_THEME
     ret["PORTAL_NAME"] = settings.PORTAL_NAME
+
+    ret["PORTAL_LOGO_DARK_SVG"] = getattr(settings, 'PORTAL_LOGO_DARK_SVG', "")
+    ret["PORTAL_LOGO_DARK_PNG"] = getattr(settings, 'PORTAL_LOGO_DARK_PNG', "")
+    ret["PORTAL_LOGO_LIGHT_SVG"] = getattr(settings, 'PORTAL_LOGO_LIGHT_SVG', "")
+    ret["PORTAL_LOGO_LIGHT_PNG"] = getattr(settings, 'PORTAL_LOGO_LIGHT_PNG', "")
+    ret["EXTRA_CSS_PATHS"] = getattr(settings, 'EXTRA_CSS_PATHS', [])
     ret["PORTAL_DESCRIPTION"] = settings.PORTAL_DESCRIPTION
     ret["LOAD_FROM_CDN"] = settings.LOAD_FROM_CDN
     ret["CAN_LOGIN"] = settings.LOGIN_ALLOWED
@@ -24,16 +32,33 @@ def stuff(request):
     ret["UPLOAD_MAX_SIZE"] = settings.UPLOAD_MAX_SIZE
     ret["UPLOAD_MAX_FILES_NUMBER"] = settings.UPLOAD_MAX_FILES_NUMBER
     ret["PRE_UPLOAD_MEDIA_MESSAGE"] = settings.PRE_UPLOAD_MEDIA_MESSAGE
+    ret["SIDEBAR_FOOTER_TEXT"] = settings.SIDEBAR_FOOTER_TEXT
     ret["POST_UPLOAD_AUTHOR_MESSAGE_UNLISTED_NO_COMMENTARY"] = settings.POST_UPLOAD_AUTHOR_MESSAGE_UNLISTED_NO_COMMENTARY
     ret["IS_MEDIACMS_ADMIN"] = request.user.is_superuser
     ret["IS_MEDIACMS_EDITOR"] = is_mediacms_editor(request.user)
     ret["IS_MEDIACMS_MANAGER"] = is_mediacms_manager(request.user)
+    ret["USERS_NEEDS_TO_BE_APPROVED"] = settings.USERS_NEEDS_TO_BE_APPROVED
+
+    can_see_members_page = False
+    if request.user.is_authenticated:
+        if settings.CAN_SEE_MEMBERS_PAGE == "all":
+            can_see_members_page = True
+        elif settings.CAN_SEE_MEMBERS_PAGE == "editors" and is_mediacms_editor(request.user):
+            can_see_members_page = True
+        elif settings.CAN_SEE_MEMBERS_PAGE == "admins" and request.user.is_superuser:
+            can_see_members_page = True
+    ret["CAN_SEE_MEMBERS_PAGE"] = can_see_members_page
     ret["ALLOW_RATINGS"] = settings.ALLOW_RATINGS
     ret["ALLOW_RATINGS_CONFIRMED_EMAIL_ONLY"] = settings.ALLOW_RATINGS_CONFIRMED_EMAIL_ONLY
     ret["VIDEO_PLAYER_FEATURED_VIDEO_ON_INDEX_PAGE"] = settings.VIDEO_PLAYER_FEATURED_VIDEO_ON_INDEX_PAGE
     ret["RSS_URL"] = "/rss"
     ret["TRANSLATION"] = get_translation(request.LANGUAGE_CODE)
     ret["REPLACEMENTS"] = get_translation_strings(request.LANGUAGE_CODE)
+    ret["USE_SAML"] = settings.USE_SAML
+    ret["USE_RBAC"] = settings.USE_RBAC
+    ret["USE_ROUNDED_CORNERS"] = settings.USE_ROUNDED_CORNERS
+    ret["VERSION"] = VERSION
+
     if request.user.is_superuser:
         ret["DJANGO_ADMIN_URL"] = settings.DJANGO_ADMIN_URL
 

files/feeds.py

@@ -83,7 +83,7 @@ class IndexRSSFeed(Feed):
         return item.edit_date
 
     def item_link(self, item):
-        return reverse("get_media") + "?m={0}".format(item.friendly_token)
+        return f"{reverse('get_media')}?m={item.friendly_token}"
 
     def item_extra_kwargs(self, item):
         item = {
@@ -151,7 +151,7 @@ class SearchRSSFeed(Feed):
         return item.edit_date
 
     def item_link(self, item):
-        return reverse("get_media") + "?m={0}".format(item.friendly_token)
+        return f"{reverse('get_media')}?m={item.friendly_token}"
 
     def item_extra_kwargs(self, item):
         item = {

files/forms.py

@@ -1,48 +1,104 @@
+from crispy_forms.bootstrap import FormActions
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import HTML, Field, Layout, Submit
 from django import forms
+from django.conf import settings
 
 from .methods import get_next_state, is_mediacms_editor
-from .models import Media, Subtitle
+from .models import MEDIA_STATES, Category, Media, Subtitle
+
+
+class CustomField(Field):
+    template = 'cms/crispy_custom_field.html'
 
 
 class MultipleSelect(forms.CheckboxSelectMultiple):
     input_type = "checkbox"
 
 
-class MediaForm(forms.ModelForm):
+class MediaMetadataForm(forms.ModelForm):
-    new_tags = forms.CharField(label="Tags", help_text="a comma separated list of new tags.", required=False)
+    new_tags = forms.CharField(label="Tags", help_text="a comma separated list of tags.", required=False)
 
     class Meta:
         model = Media
         fields = (
+            "friendly_token",
             "title",
-            "category",
             "new_tags",
             "add_date",
             "uploaded_poster",
             "description",
-            "state",
             "enable_comments",
-            "featured",
             "thumbnail_time",
-            "reported_times",
-            "is_reviewed",
-            "allow_download",
         )
+
         widgets = {
-            "tags": MultipleSelect(),
+            "new_tags": MultipleSelect(),
+            "description": forms.Textarea(attrs={'rows': 4}),
+            "add_date": forms.DateTimeInput(attrs={'type': 'datetime-local', 'step': '1'}, format='%Y-%m-%dT%H:%M:%S'),
+            "thumbnail_time": forms.NumberInput(attrs={'min': 0, 'step': 0.1}),
+        }
+        labels = {
+            "friendly_token": "Slug",
+            "uploaded_poster": "Poster Image",
+            "thumbnail_time": "Thumbnail Time (seconds)",
+        }
+        help_texts = {
+            "title": "",
+            "friendly_token": "Media URL slug",
+            "thumbnail_time": "Select the time in seconds for the video thumbnail",
+            "uploaded_poster": "Maximum file size: 5MB",
         }
 
     def __init__(self, user, *args, **kwargs):
         self.user = user
-        super(MediaForm, self).__init__(*args, **kwargs)
+        super(MediaMetadataForm, self).__init__(*args, **kwargs)
+        if not getattr(settings, 'ALLOW_CUSTOM_MEDIA_URLS', False):
+            self.fields.pop("friendly_token")
         if self.instance.media_type != "video":
             self.fields.pop("thumbnail_time")
-        if not is_mediacms_editor(user):
+        if self.instance.media_type == "image":
-            self.fields.pop("featured")
+            self.fields.pop("uploaded_poster")
-            self.fields.pop("reported_times")
+
-            self.fields.pop("is_reviewed")
         self.fields["new_tags"].initial = ", ".join([tag.title for tag in self.instance.tags.all()])
 
+        self.helper = FormHelper()
+        self.helper.form_tag = True
+        self.helper.form_class = 'post-form'
+        self.helper.form_method = 'post'
+        self.helper.form_enctype = "multipart/form-data"
+        self.helper.form_show_errors = False
+
+        layout_fields = [
+            CustomField('title'),
+            CustomField('new_tags'),
+            CustomField('add_date'),
+            CustomField('description'),
+            CustomField('enable_comments'),
+        ]
+        if self.instance.media_type != "image":
+            layout_fields.append(CustomField('uploaded_poster'))
+
+        self.helper.layout = Layout(*layout_fields)
+
+        if self.instance.media_type == "video":
+            self.helper.layout.append(CustomField('thumbnail_time'))
+        if getattr(settings, 'ALLOW_CUSTOM_MEDIA_URLS', False):
+            self.helper.layout.insert(0, CustomField('friendly_token'))
+
+        self.helper.layout.append(FormActions(Submit('submit', 'Update Media', css_class='primaryAction')))
+
+    def clean_friendly_token(self):
+        token = self.cleaned_data.get("friendly_token", "").strip()
+
+        if token:
+            if not all(c.isalnum() or c in "-_" for c in token):
+                raise forms.ValidationError("Slug can only contain alphanumeric characters, underscores, or hyphens.")
+
+            if Media.objects.filter(friendly_token=token).exclude(pk=self.instance.pk).exists():
+                raise forms.ValidationError("This slug is already in use. Please choose a different one.")
+            return token
+
     def clean_uploaded_poster(self):
         image = self.cleaned_data.get("uploaded_poster", False)
         if image:
@@ -50,26 +106,203 @@ class MediaForm(forms.ModelForm):
                 raise forms.ValidationError("Image file too large ( > 5mb )")
             return image
 
+    def save(self, *args, **kwargs):
+        data = self.cleaned_data  # noqa
+
+        media = super(MediaMetadataForm, self).save(*args, **kwargs)
+        return media
+
+
+class MediaPublishForm(forms.ModelForm):
+    confirm_state = forms.BooleanField(required=False, initial=False, label="Acknowledge sharing status", help_text="")
+
+    class Meta:
+        model = Media
+        fields = ("category", "state", "featured", "reported_times", "is_reviewed", "allow_download")
+
+        widgets = {
+            "category": MultipleSelect(),
+        }
+
+    def __init__(self, user, *args, **kwargs):
+        self.user = user
+        super(MediaPublishForm, self).__init__(*args, **kwargs)
+
+        if not is_mediacms_editor(user):
+            for field in ["featured", "reported_times", "is_reviewed"]:
+                self.fields[field].disabled = True
+                self.fields[field].widget.attrs['class'] = 'read-only-field'
+                self.fields[field].widget.attrs['title'] = "This field can only be modified by MediaCMS admins or editors"
+
+            if settings.PORTAL_WORKFLOW not in ["public"]:
+                valid_states = ["unlisted", "private"]
+                if self.instance.state and self.instance.state not in valid_states:
+                    valid_states.append(self.instance.state)
+                self.fields["state"].choices = [(state, dict(MEDIA_STATES).get(state, state)) for state in valid_states]
+
+        if getattr(settings, 'USE_RBAC', False) and 'category' in self.fields:
+            if is_mediacms_editor(user):
+                pass
+            else:
+                self.fields['category'].initial = self.instance.category.all()
+
+                non_rbac_categories = Category.objects.filter(is_rbac_category=False)
+                rbac_categories = user.get_rbac_categories_as_contributor()
+                combined_category_ids = list(non_rbac_categories.values_list('id', flat=True)) + list(rbac_categories.values_list('id', flat=True))
+
+                if self.instance.pk:
+                    instance_category_ids = list(self.instance.category.all().values_list('id', flat=True))
+                    combined_category_ids = list(set(combined_category_ids + instance_category_ids))
+
+                self.fields['category'].queryset = Category.objects.filter(id__in=combined_category_ids).order_by('title')
+
+        self.helper = FormHelper()
+        self.helper.form_tag = True
+        self.helper.form_class = 'post-form'
+        self.helper.form_method = 'post'
+        self.helper.form_enctype = "multipart/form-data"
+        self.helper.form_show_errors = False
+        self.helper.layout = Layout(
+            CustomField('category'),
+            CustomField('state'),
+            CustomField('featured'),
+            CustomField('reported_times'),
+            CustomField('is_reviewed'),
+            CustomField('allow_download'),
+        )
+
+        self.helper.layout.append(FormActions(Submit('submit', 'Publish Media', css_class='primaryAction')))
+
+    def clean(self):
+        cleaned_data = super().clean()
+        state = cleaned_data.get("state")
+        categories = cleaned_data.get("category")
+
+        if getattr(settings, 'USE_RBAC', False) and 'category' in self.fields:
+            rbac_categories = categories.filter(is_rbac_category=True).values_list('title', flat=True)
+
+            if rbac_categories and state in ['private', 'unlisted']:
+                # Make the confirm_state field visible and add it to the layout
+                self.fields['confirm_state'].widget = forms.CheckboxInput()
+
+                # add it after the state field
+                state_index = None
+                for i, layout_item in enumerate(self.helper.layout):
+                    if isinstance(layout_item, CustomField) and layout_item.fields[0] == 'state':
+                        state_index = i
+                        break
+
+                if state_index:
+                    layout_items = list(self.helper.layout)
+                    layout_items.insert(state_index + 1, CustomField('confirm_state'))
+                    self.helper.layout = Layout(*layout_items)
+
+                if not cleaned_data.get('confirm_state'):
+                    error_message = f"I understand that although media state is {state}, the media is also shared with users that have access to the following categories: {', '.join(rbac_categories)}"
+                    self.add_error('confirm_state', error_message)
+
+        return cleaned_data
+
     def save(self, *args, **kwargs):
         data = self.cleaned_data
         state = data.get("state")
         if state != self.initial["state"]:
             self.instance.state = get_next_state(self.user, self.initial["state"], self.instance.state)
 
-        media = super(MediaForm, self).save(*args, **kwargs)
+        media = super(MediaPublishForm, self).save(*args, **kwargs)
+
         return media
 
 
+class WhisperSubtitlesForm(forms.ModelForm):
+    class Meta:
+        model = Media
+        fields = (
+            "allow_whisper_transcribe",
+            "allow_whisper_transcribe_and_translate",
+        )
+        labels = {
+            "allow_whisper_transcribe": "Transcription",
+            "allow_whisper_transcribe_and_translate": "English Translation",
+        }
+        help_texts = {
+            "allow_whisper_transcribe": "",
+            "allow_whisper_transcribe_and_translate": "",
+        }
+
+    def __init__(self, user, *args, **kwargs):
+        self.user = user
+        super(WhisperSubtitlesForm, self).__init__(*args, **kwargs)
+
+        if self.instance.allow_whisper_transcribe:
+            self.fields['allow_whisper_transcribe'].widget.attrs['readonly'] = True
+            self.fields['allow_whisper_transcribe'].widget.attrs['disabled'] = True
+        if self.instance.allow_whisper_transcribe_and_translate:
+            self.fields['allow_whisper_transcribe_and_translate'].widget.attrs['readonly'] = True
+            self.fields['allow_whisper_transcribe_and_translate'].widget.attrs['disabled'] = True
+
+        both_readonly = self.instance.allow_whisper_transcribe and self.instance.allow_whisper_transcribe_and_translate
+
+        self.helper = FormHelper()
+        self.helper.form_tag = True
+        self.helper.form_class = 'post-form'
+        self.helper.form_method = 'post'
+        self.helper.form_enctype = "multipart/form-data"
+        self.helper.form_show_errors = False
+        self.helper.layout = Layout(
+            CustomField('allow_whisper_transcribe'),
+            CustomField('allow_whisper_transcribe_and_translate'),
+        )
+
+        if not both_readonly:
+            self.helper.layout.append(FormActions(Submit('submit_whisper', 'Submit', css_class='primaryAction')))
+        else:
+            # Optional: Add a disabled button with explanatory text
+            self.helper.layout.append(
+                FormActions(Submit('submit_whisper', 'Submit', css_class='primaryAction', disabled=True), HTML('<small class="text-muted">Cannot submit - both options are already enabled</small>'))
+            )
+
+    def clean_allow_whisper_transcribe(self):
+        # Ensure the field value doesn't change if it was originally True
+        if self.instance and self.instance.allow_whisper_transcribe:
+            return self.instance.allow_whisper_transcribe
+        return self.cleaned_data['allow_whisper_transcribe']
+
+    def clean_allow_whisper_transcribe_and_translate(self):
+        # Ensure the field value doesn't change if it was originally True
+        if self.instance and self.instance.allow_whisper_transcribe_and_translate:
+            return self.instance.allow_whisper_transcribe_and_translate
+        return self.cleaned_data['allow_whisper_transcribe_and_translate']
+
+
 class SubtitleForm(forms.ModelForm):
     class Meta:
         model = Subtitle
         fields = ["language", "subtitle_file"]
 
+        labels = {
+            "subtitle_file": "Upload Caption File",
+        }
+        help_texts = {
+            "subtitle_file": "SubRip (.srt) and WebVTT (.vtt) are supported file formats.",
+        }
+
     def __init__(self, media_item, *args, **kwargs):
         super(SubtitleForm, self).__init__(*args, **kwargs)
         self.instance.media = media_item
-        self.fields["subtitle_file"].help_text = "SubRip (.srt) and WebVTT (.vtt) are supported file formats."
+
-        self.fields["subtitle_file"].label = "Subtitle or Closed Caption File"
+        self.helper = FormHelper()
+        self.helper.form_tag = True
+        self.helper.form_class = 'post-form'
+        self.helper.form_method = 'post'
+        self.helper.form_enctype = "multipart/form-data"
+        self.helper.form_show_errors = False
+        self.helper.layout = Layout(
+            CustomField('subtitle_file'),
+            CustomField('language'),
+        )
+
+        self.helper.layout.append(FormActions(Submit('submit', 'Submit', css_class='primaryAction')))
 
     def save(self, *args, **kwargs):
         self.instance.user = self.instance.media.user

files/frontend_translations/ar.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "تشغيل تلقائي",
     "About": "حول",
     "Add a ": "أضف ",
+    "Browse your files": "تصفح ملفاتك",
     "COMMENT": "تعليق",
     "Categories": "الفئات",
     "Category": "الفئة",
     "Change Language": "تغيير اللغة",
     "Change password": "تغيير كلمة المرور",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "انقر على 'بدء التسجيل' واختر الشاشة أو علامة التبويب المراد تسجيلها. بمجرد الانتهاء من التسجيل، انقر على 'إيقاف التسجيل'، وسيتم تحميل التسجيل.",
     "Comment": "تعليق",
     "Comments": "تعليقات",
     "Comments are disabled": "التعليقات معطلة",
     "Contact": "اتصل",
     "DELETE MEDIA": "حذف الوسائط",
     "DOWNLOAD": "تحميل",
+    "Drag and drop files": "سحب وإفلات الملفات",
     "EDIT MEDIA": "تعديل الوسائط",
     "EDIT PROFILE": "تعديل الملف الشخصي",
     "EDIT SUBTITLE": "تعديل الترجمة",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "قوائم التشغيل",
     "Playlists": "قوائم التشغيل",
     "Powered by": "مدعوم من",
+    "Publish": "نشر",
     "Published on": "نشر في",
     "Recommended": "موصى به",
+    "Record Screen": "تسجيل الشاشة",
     "Register": "تسجيل",
     "SAVE": "حفظ",
     "SEARCH": "بحث",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "اختر",
     "Sign in": "تسجيل الدخول",
     "Sign out": "تسجيل الخروج",
+    "Start Recording": "بدء التسجيل",
+    "Stop Recording": "إيقاف التسجيل",
     "Subtitle was added": "تمت إضافة الترجمة",
+    "Subtitles": "ترجمات",
     "Tags": "العلامات",
     "Terms": "الشروط",
+    "This works in Chrome, Safari and Edge browsers.": "هذا يعمل في متصفحات Chrome و Safari و Edge.",
+    "Trim": "قص",
     "UPLOAD": "رفع",
     "Up next": "التالي",
     "Upload": "رفع",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "التحميلات",
     "VIEW ALL": "عرض الكل",
     "View all": "عرض الكل",
+    "View media": "عرض الوسائط",
     "comment": "تعليق",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "هو نظام إدارة محتوى فيديو ووسائط مفتوح المصدر وحديث ومتكامل. تم تطويره لتلبية احتياجات المنصات الويب الحديثة لمشاهدة ومشاركة الوسائط",
     "media in category": "وسائط في الفئة",
     "media in tag": "وسائط في العلامة",
+    "or": "أو",
     "view": "عرض",
     "views": "مشاهدات",
     "yet": "بعد",

files/frontend_translations/bn.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "স্বয়ংক্রিয় প্লে",
     "About": "সম্পর্কে",
     "Add a ": "যোগ করুন",
+    "Browse your files": "আপনার ফাইল ব্রাউজ করুন",
     "COMMENT": "মন্তব্য",
     "Categories": "বিভাগসমূহ",
     "Category": "বিভাগ",
     "Change Language": "ভাষা পরিবর্তন করুন",
     "Change password": "পাসওয়ার্ড পরিবর্তন করুন",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "'রেকর্ডিং শুরু করুন'-এ ক্লিক করুন এবং রেকর্ড করার জন্য স্ক্রিন বা ট্যাব নির্বাচন করুন। রেকর্ডিং শেষ হলে, 'রেকর্ডিং বন্ধ করুন'-এ ক্লিক করুন এবং রেকর্ডিং আপলোড হয়ে যাবে।",
     "Comment": "মন্তব্য",
     "Comments": "মন্তব্যসমূহ",
     "Comments are disabled": "মন্তব্য নিষ্ক্রিয় করা হয়েছে",
     "Contact": "যোগাযোগ",
     "DELETE MEDIA": "মিডিয়া মুছুন",
     "DOWNLOAD": "ডাউনলোড",
+    "Drag and drop files": "ফাইল টেনে আনুন",
     "EDIT MEDIA": "মিডিয়া সম্পাদনা করুন",
     "EDIT PROFILE": "প্রোফাইল সম্পাদনা করুন",
     "EDIT SUBTITLE": "সাবটাইটেল সম্পাদনা করুন",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "প্লেলিস্ট",
     "Playlists": "প্লেলিস্ট",
     "Powered by": "দ্বারা চালিত",
+    "Publish": "প্রকাশ করুন",
     "Published on": "প্রকাশিত",
     "Recommended": "প্রস্তাবিত",
+    "Record Screen": "স্ক্রিন রেকর্ড করুন",
     "Register": "নিবন্ধন করুন",
     "SAVE": "সংরক্ষণ করুন",
     "SEARCH": "অনুসন্ধান",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "নির্বাচন করুন",
     "Sign in": "সাইন ইন করুন",
     "Sign out": "সাইন আউট করুন",
+    "Start Recording": "রেকর্ডিং শুরু করুন",
+    "Stop Recording": "রেকর্ডিং বন্ধ করুন",
     "Subtitle was added": "সাবটাইটেল যোগ করা হয়েছে",
+    "Subtitles": "সাবটাইটেল",
     "Tags": "ট্যাগ",
     "Terms": "শর্তাবলী",
+    "This works in Chrome, Safari and Edge browsers.": "এটি ক্রোম, সাফারি এবং এজ ব্রাউজারে কাজ করে।",
+    "Trim": "ছাঁটাই",
     "UPLOAD": "আপলোড করুন",
     "Up next": "পরবর্তী",
     "Upload": "আপলোড করুন",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "আপলোডসমূহ",
     "VIEW ALL": "সব দেখুন",
     "View all": "সব দেখুন",
+    "View media": "মিডিয়া দেখুন",
     "comment": "মন্তব্য",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "একটি আধুনিক, সম্পূর্ণ বৈশিষ্ট্যযুক্ত ওপেন সোর্স ভিডিও এবং মিডিয়া CMS। এটি আধুনিক ওয়েব প্ল্যাটফর্মের জন্য মিডিয়া দেখার এবং শেয়ার করার প্রয়োজন মেটাতে তৈরি করা হয়েছে",
     "media in category": "বিভাগে মিডিয়া",
     "media in tag": "ট্যাগে মিডিয়া",
+    "or": "অথবা",
     "view": "দেখুন",
     "views": "দেখা হয়েছে",
     "yet": "এখনও",

files/frontend_translations/da.py

@@ -0,0 +1,116 @@
+translation_strings = {
+    "ABOUT": "OM",
+    "AUTOPLAY": "Automatisk afspilning",
+    "About": "Om",
+    "Add a ": "Tilføj en ",
+    "Browse your files": "Gennemse dine filer",
+    "COMMENT": "KOMMENTAR",
+    "Categories": "Kategorier",
+    "Category": "Kategori",
+    "Change Language": "Skift sprog",
+    "Change password": "Skift adgangskode",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Klik på 'Start optagelse' og vælg den skærm eller fane, du vil optage. Når optagelsen er færdig, skal du klikke på 'Stop optagelse', og optagelsen vil blive uploadet.",
+    "Comment": "Kommentar",
+    "Comments": "Kommentarer",
+    "Comments are disabled": "Kommentarer er slået fra",
+    "Contact": "Kontakt",
+    "DELETE MEDIA": "SLET MEDIE",
+    "DOWNLOAD": "HENT",
+    "Drag and drop files": "Træk og slip filer",
+    "EDIT MEDIA": "REDIGER MEDIE",
+    "EDIT PROFILE": "REDIGER PROFIL",
+    "EDIT SUBTITLE": "REDIGER UNDERTEKSTER",
+    "Edit media": "Rediger medie",
+    "Edit profile": "Rediger profil",
+    "Edit subtitle": "Rediger undertekster",
+    "Featured": "Fremhævede",
+    "Go": "Vælg",
+    "History": "Historik",
+    "Home": "Hjem",
+    "Language": "Sprog",
+    "Latest": "Nyeste",
+    "Liked media": "Medier du har liket",
+    "Manage comments": "Administrer kommentarer",
+    "Manage media": "Administrer medier",
+    "Manage users": "Administrer brugere",
+    "Media": "Medier",
+    "Media was edited": "Mediet er blevet redigeret",
+    "Members": "Medlemmer",
+    "My media": "Mine medier",
+    "My playlists": "Mine playlister",
+    "No": "Nej",
+    "No comment yet": "Ingen kommentar endnu",
+    "No comments yet": "Ingen komentarer endnu",
+    "No results for": "Ingen resultater for",
+    "PLAYLISTS": "PLAYLISTER",
+    "Playlists": "Playlister",
+    "Powered by": "Drevet af",
+    "Publish": "Udgiv",
+    "Published on": "Udgivet på",
+    "Recommended": "Anbefalet",
+    "Record Screen": "Optag skærm",
+    "Register": "Registrer",
+    "SAVE": "GEM",
+    "SEARCH": "SØG",
+    "SHARE": "DEL",
+    "SHOW MORE": "VIS MERE",
+    "SUBMIT": "INDSEND",
+    "Search": "Søg",
+    "Select": "Vælg",
+    "Sign in": "Log ind",
+    "Sign out": "Log ud",
+    "Start Recording": "Start optagelse",
+    "Stop Recording": "Stop optagelse",
+    "Subtitle was added": "Undertekster tilføjet",
+    "Subtitles": "Undertekster",
+    "Tags": "Tags",
+    "Terms": "Vilkår",
+    "This works in Chrome, Safari and Edge browsers.": "Dette virker i Chrome, Safari og Edge browsere.",
+    "Trim": "Beskær",
+    "UPLOAD": "UPLOAD",
+    "Up next": "Næste",
+    "Upload": "Upload",
+    "Upload media": "Upload medie",
+    "Uploads": "Uploads",
+    "VIEW ALL": "SE ALLE",
+    "View all": "Se alle",
+    "View media": "Se medie",
+    "comment": "kommentar",
+    "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "er et moderne, fuldt udstyret open source video og medie CMS. Det er udviklet til at imødekomme behovene for moderne webplatforme til visning og deling af medier.",
+    "media in category": "medier i kategori",
+    "media in tag": "medier i tag",
+    "or": "eller",
+    "view": "visning",
+    "views": "visninger",
+    "yet": "endnu",
+}
+
+replacement_strings = {
+    "Apr": "Apr",
+    "Aug": "Aug",
+    "Dec": "Dec",
+    "Feb": "Feb",
+    "Jan": "Jan",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mar",
+    "May": "Maj",
+    "Nov": "Nov",
+    "Oct": "Okt",
+    "Sep": "Sep",
+    "day ago": "dag siden",
+    "days ago": "dage siden",
+    "hour ago": "time siden",
+    "hours ago": "timer siden",
+    "just now": "lige nu",
+    "minute ago": "minut siden",
+    "minutes ago": "minutter siden",
+    "month ago": "måned siden",
+    "months ago": "måneder siden",
+    "second ago": "sekund siden",
+    "seconds ago": "sekunder siden",
+    "week ago": "uge siden",
+    "weeks ago": "uger siden",
+    "year ago": "år siden",
+    "years ago": "år siden",
+}

files/frontend_translations/de.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "Automatische Wiedergabe",
     "About": "Über",
     "Add a ": "Hinzufügen eines ",
+    "Browse your files": "Durchsuchen Sie Ihre Dateien",
     "COMMENT": "KOMMENTAR",
     "Categories": "Kategorien",
     "Category": "Kategorie",
     "Change Language": "Sprache ändern",
     "Change password": "Passwort ändern",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Klicken Sie auf 'Aufnahme starten' und wählen Sie den Bildschirm oder Tab aus, den Sie aufnehmen möchten. Sobald die Aufnahme beendet ist, klicken Sie auf 'Aufnahme beenden', und die Aufnahme wird hochgeladen.",
     "Comment": "Kommentar",
     "Comments": "Kommentare",
     "Comments are disabled": "Kommentare sind deaktiviert",
     "Contact": "Kontakt",
     "DELETE MEDIA": "MEDIEN LÖSCHEN",
     "DOWNLOAD": "HERUNTERLADEN",
+    "Drag and drop files": "Dateien per Drag & Drop verschieben",
     "EDIT MEDIA": "MEDIEN BEARBEITEN",
     "EDIT PROFILE": "PROFIL BEARBEITEN",
     "EDIT SUBTITLE": "UNTERTITEL BEARBEITEN",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "PLAYLISTS",
     "Playlists": "Playlists",
     "Powered by": "Bereitgestellt von",
+    "Publish": "Veröffentlichen",
     "Published on": "Veröffentlicht am",
     "Recommended": "Empfohlen",
+    "Record Screen": "Bildschirm aufnehmen",
     "Register": "Registrieren",
     "SAVE": "SPEICHERN",
     "SEARCH": "SUCHE",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Auswählen",
     "Sign in": "Anmelden",
     "Sign out": "Abmelden",
+    "Start Recording": "Aufnahme starten",
+    "Stop Recording": "Aufnahme stoppen",
     "Subtitle was added": "Untertitel wurde hinzugefügt",
+    "Subtitles": "Untertitel",
     "Tags": "Tags",
     "Terms": "Bedingungen",
+    "This works in Chrome, Safari and Edge browsers.": "Dies funktioniert in den Browsern Chrome, Safari und Edge.",
+    "Trim": "Trimmen",
     "UPLOAD": "HOCHLADEN",
     "Up next": "Als nächstes",
     "Upload": "Hochladen",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Uploads",
     "VIEW ALL": "ALLE ANZEIGEN",
     "View all": "Alle anzeigen",
+    "View media": "Medien anzeigen",
     "comment": "Kommentar",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "ist ein modernes, voll ausgestattetes Open-Source-Video- und Medien-CMS. Es wurde entwickelt, um den Anforderungen moderner Webplattformen für das Ansehen und Teilen von Medien gerecht zu werden",
     "media in category": "Medien in Kategorie",
     "media in tag": "Medien in Tag",
+    "or": "oder",
     "view": "Ansicht",
     "views": "Ansichten",
     "yet": "noch",

files/frontend_translations/el.py

@@ -3,30 +3,33 @@ translation_strings = {
     "AUTOPLAY": "Αυτόματη αναπαραγωγή",
     "About": "Σχετικά",
     "Add a ": "Προσθέστε ένα ",
+    "Browse your files": "Περιήγηση στα αρχεία σας",
     "COMMENT": "ΣΧΟΛΙΟ",
     "Categories": "Κατηγορίες",
     "Category": "Κατηγορία",
     "Change Language": "Αλλαγή Γλώσσας",
     "Change password": "Αλλαγή κωδικού",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Κάντε κλικ στο 'Έναρξη εγγραφής' και επιλέξτε την οθόνη ή την καρτέλα για εγγραφή. Μόλις ολοκληρωθεί η εγγραφή, κάντε κλικ στο 'Διακοπή εγγραφής' και η εγγραφή θα μεταφορτωθεί.",
     "Comment": "Σχόλιο",
     "Comments": "Σχόλια",
     "Comments are disabled": "Τα σχόλια είναι απενεργοποιημένα",
     "Contact": "Επικοινωνία",
     "DELETE MEDIA": "ΔΙΑΓΡΑΦΗ ΑΡΧΕΙΟΥ",
     "DOWNLOAD": "ΚΑΤΕΒΑΣΜΑ",
+    "Drag and drop files": "Σύρετε και αποθέστε αρχεία",
     "EDIT MEDIA": "ΕΠΕΞΕΡΓΑΣΙΑ ΑΡΧΕΙΟΥ",
     "EDIT PROFILE": "ΕΠΕΞΕΡΓΑΣΙΑ ΠΡΟΦΙΛ",
     "EDIT SUBTITLE": "ΕΠΕΞΕΡΓΑΣΙΑ ΥΠΟΤΙΤΛΩΝ",
     "Edit media": "Επεξεργασία αρχείου",
-    "Edit profile": "Επεξεργασία προφιλ",
+    "Edit profile": "Επεξεργασία προφίλ",
     "Edit subtitle": "Επεξεργασία υποτίτλων",
     "Featured": "Επιλεγμένα",
-    "Go": "Πήγαινε",
+    "Go": "Μετάβαση",
     "History": "Ιστορικό",
     "Home": "Αρχική",
     "Language": "Γλώσσα",
     "Latest": "Πρόσφατα",
-    "Liked media": "Αγαπημένα",
+    "Liked media": "Αγαπημένα αρχεία",
     "Manage comments": "Διαχείριση σχολίων",
     "Manage media": "Διαχείριση αρχείων",
     "Manage users": "Διαχείριση χρηστών",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "ΛΙΣΤΕΣ",
     "Playlists": "Λίστες",
     "Powered by": "Υποστηρίζεται από το",
+    "Publish": "Δημοσίευση",
     "Published on": "Δημοσιεύτηκε στις",
     "Recommended": "Προτεινόμενα",
+    "Record Screen": "Καταγραφή οθόνης",
     "Register": "Εγγραφή",
     "SAVE": "ΑΠΟΘΗΚΕΥΣΗ",
     "SEARCH": "ΑΝΑΖΗΤΗΣΗ",
@@ -54,20 +59,27 @@ translation_strings = {
     "Select": "Επιλογή",
     "Sign in": "Σύνδεση",
     "Sign out": "Αποσύνδεση",
+    "Start Recording": "Έναρξη εγγραφής",
+    "Stop Recording": "Διακοπή εγγραφής",
     "Subtitle was added": "Οι υπότιτλοι προστέθηκαν",
+    "Subtitles": "Υπότιτλοι",
     "Tags": "Ετικέτες",
     "Terms": "Όροι",
+    "This works in Chrome, Safari and Edge browsers.": "Αυτό λειτουργεί σε προγράμματα περιήγησης Chrome, Safari και Edge.",
+    "Trim": "Περικοπή",
     "UPLOAD": "ΑΝΕΒΑΣΜΑ",
     "Up next": "Επόμενο",
-    "Upload": "Ανέβασμα αρχείου",
+    "Upload": "Ανέβασμα",
     "Upload media": "Ανέβασμα αρχείων",
     "Uploads": "Ανεβάσματα",
     "VIEW ALL": "ΔΕΣ ΤΑ ΟΛΑ",
-    "View all": "Δές τα όλα",
+    "View all": "Δες τα όλα",
+    "View media": "Προβολή αρχείου",
     "comment": "σχόλιο",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "είναι ένα σύγχρονο, πλήρως λειτουργικό ανοιχτού κώδικα CMS βίντεο και πολυμέσων. Αναπτύχθηκε για να καλύψει τις ανάγκες των σύγχρονων πλατφορμών ιστού για την προβολή και την κοινοποίηση πολυμέσων",
     "media in category": "αρχεία στην κατηγορία",
     "media in tag": "αρχεία με ετικέτα",
+    "or": "ή",
     "view": "προβολή",
     "views": "προβολές",
     "yet": "ακόμα",
@@ -82,10 +94,10 @@ replacement_strings = {
     "Jul": "Ιουλ",
     "Jun": "Ιουν",
     "Mar": "Μαρ",
-    "May": "Μαϊ",
+    "May": "Μάι",
     "Nov": "Νοε",
     "Oct": "Οκτ",
-    "Sep": "Σεπτ",
+    "Sep": "Σεπ",
     "day ago": "μέρα πριν",
     "days ago": "μέρες πριν",
     "hour ago": "ώρα πριν",

files/frontend_translations/en.py

@@ -2,17 +2,20 @@ translation_strings = {
     "ABOUT": "",
     "AUTOPLAY": "",
     "Add a ": "",
+    "Browse your files": "",
     "COMMENT": "",
     "Categories": "",
     "Category": "",
     "Change Language": "",
     "Change password": "",
     "About": "",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "",
     "Comment": "",
     "Comments": "",
     "Comments are disabled": "",
     "Contact": "",
     "DELETE MEDIA": "",
+    "Drag and drop files": "",
     "DOWNLOAD": "",
     "EDIT MEDIA": "",
     "EDIT PROFILE": "",
@@ -42,21 +45,28 @@ translation_strings = {
     "PLAYLISTS": "",
     "Playlists": "",
     "Powered by": "",
+    "Publish": "",
     "Published on": "",
     "Recommended": "",
+    "Record Screen": "",
     "Register": "",
     "SAVE": "",
     "SEARCH": "",
     "SHARE": "",
     "SHOW MORE": "",
     "SUBMIT": "",
+    "Subtitles": "",
     "Search": "",
     "Select": "",
     "Sign in": "",
     "Sign out": "",
+    "Start Recording": "",
+    "Stop Recording": "",
     "Subtitle was added": "",
     "Tags": "",
     "Terms": "",
+    "This works in Chrome, Safari and Edge browsers.": "",
+    "Trim": "",
     "UPLOAD": "",
     "Up next": "",
     "Upload": "",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "",
     "VIEW ALL": "",
     "View all": "",
+    "View media": "",
     "comment": "",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "",
     "media in category": "",
     "media in tag": "",
+    "or": "",
     "view": "",
     "views": "",
     "yet": "",

files/frontend_translations/es.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "Reproducción automática",
     "About": "Acerca de",
     "Add a ": "Agregar un ",
+    "Browse your files": "Explorar sus archivos",
     "COMMENT": "COMENTARIO",
     "Categories": "Categorías",
     "Category": "Categoría",
     "Change Language": "Cambiar idioma",
     "Change password": "Cambiar contraseña",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Haga clic en 'Iniciar grabación' y seleccione la pantalla o pestaña para grabar. Una vez finalizada la grabación, haga clic en 'Detener grabación' y la grabación se subirá.",
     "Comment": "Comentario",
     "Comments": "Comentarios",
     "Comments are disabled": "Los comentarios están deshabilitados",
     "Contact": "Contacto",
     "DELETE MEDIA": "ELIMINAR MEDIOS",
     "DOWNLOAD": "DESCARGAR",
+    "Drag and drop files": "Arrastre y suelte archivos",
     "EDIT MEDIA": "EDITAR MEDIOS",
     "EDIT PROFILE": "EDITAR PERFIL",
     "EDIT SUBTITLE": "EDITAR SUBTÍTULO",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "LISTAS DE REPRODUCCIÓN",
     "Playlists": "Listas de reproducción",
     "Powered by": "Desarrollado por",
+    "Publish": "Publicar",
     "Published on": "Publicado en",
     "Recommended": "Recomendado",
+    "Record Screen": "Grabar pantalla",
     "Register": "Registrarse",
     "SAVE": "GUARDAR",
     "SEARCH": "BUSCAR",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Seleccionar",
     "Sign in": "Iniciar sesión",
     "Sign out": "Cerrar sesión",
+    "Start Recording": "Iniciar grabación",
+    "Stop Recording": "Detener grabación",
     "Subtitle was added": "El subtítulo fue agregado",
+    "Subtitles": "Subtítulos",
     "Tags": "Etiquetas",
     "Terms": "Términos",
+    "This works in Chrome, Safari and Edge browsers.": "Esto funciona en los navegadores Chrome, Safari y Edge.",
+    "Trim": "Recortar",
     "UPLOAD": "SUBIR",
     "Up next": "A continuación",
     "Upload": "Subir",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Subidas",
     "VIEW ALL": "VER TODO",
     "View all": "Ver todo",
+    "View media": "Ver medios",
     "comment": "comentario",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "es un CMS de video y medios de código abierto, moderno y completamente equipado. Está desarrollado para satisfacer las necesidades de las plataformas web modernas para ver y compartir medios",
     "media in category": "medios en la categoría",
     "media in tag": "medios en la etiqueta",
+    "or": "o",
     "view": "vista",
     "views": "vistas",
     "yet": "aún",

files/frontend_translations/fr.py

@@ -3,18 +3,21 @@ translation_strings = {
     "AUTOPLAY": "Lecture automatique",
     "About": "À propos",
     "Add a": "Ajouter un",
-    "Add a ": "",
+    "Add a ": "Ajouter un ",
+    "Browse your files": "Parcourir vos fichiers",
     "COMMENT": "COMMENTAIRE",
     "Categories": "Catégories",
     "Category": "Catégorie",
     "Change Language": "Changer de langue",
     "Change password": "Changer le mot de passe",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Cliquez sur 'Démarrer l'enregistrement' et sélectionnez l'écran ou l'onglet à enregistrer. Une fois l'enregistrement terminé, cliquez sur 'Arrêter l'enregistrement', et l'enregistrement sera téléversé.",
     "Comment": "Commentaire",
     "Comments": "Commentaires",
     "Comments are disabled": "Les commentaires sont désactivés",
     "Contact": "Contact",
     "DELETE MEDIA": "SUPPRIMER LE MÉDIA",
     "DOWNLOAD": "TÉLÉCHARGER",
+    "Drag and drop files": "Glisser-déposer des fichiers",
     "EDIT MEDIA": "MODIFIER LE MÉDIA",
     "EDIT PROFILE": "MODIFIER LE PROFIL",
     "EDIT SUBTITLE": "MODIFIER LE SOUS-TITRE",
@@ -43,8 +46,10 @@ translation_strings = {
     "PLAYLISTS": "PLAYLISTS",
     "Playlists": "Playlists",
     "Powered by": "Propulsé par",
+    "Publish": "Publier",
     "Published on": "Publié le",
     "Recommended": "Recommandé",
+    "Record Screen": "Enregistrer l'écran",
     "Register": "S'inscrire",
     "SAVE": "ENREGISTRER",
     "SEARCH": "RECHERCHER",
@@ -55,9 +60,14 @@ translation_strings = {
     "Select": "Sélectionner",
     "Sign in": "Se connecter",
     "Sign out": "Se déconnecter",
+    "Start Recording": "Commencer l'enregistrement",
+    "Stop Recording": "Arrêter l'enregistrement",
     "Subtitle was added": "Le sous-titre a été ajouté",
+    "Subtitles": "Sous-titres",
     "Tags": "Tags",
     "Terms": "Conditions",
+    "This works in Chrome, Safari and Edge browsers.": "Cela fonctionne dans les navigateurs Chrome, Safari et Edge.",
+    "Trim": "Couper",
     "UPLOAD": "TÉLÉCHARGER",
     "Up next": "À suivre",
     "Upload": "Télécharger",
@@ -65,10 +75,12 @@ translation_strings = {
     "Uploads": "Téléchargements",
     "VIEW ALL": "VOIR TOUT",
     "View all": "Voir tout",
+    "View media": "Voir le média",
     "comment": "commentaire",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "est un CMS vidéo et média open source moderne et complet. Il est développé pour répondre aux besoins des plateformes web modernes pour la visualisation et le partage de médias",
     "media in category": "média dans la catégorie",
     "media in tag": "média dans le tag",
+    "or": "ou",
     "view": "vue",
     "views": "vues",
     "yet": "encore",

files/frontend_translations/he.py

@@ -0,0 +1,116 @@
+translation_strings = {
+    "ABOUT": "על אודות",
+    "AUTOPLAY": "ניגון אוטומטי",
+    "About": "על אודות",
+    "Add a ": "הוסף",
+    "Browse your files": "עיין בקבצים שלך",
+    "COMMENT": "תגובה",
+    "Categories": "קטגוריות",
+    "Category": "קטגוריה",
+    "Change Language": "שנה שפה",
+    "Change password": "שנה סיסמה",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "לחץ על 'התחל הקלטה' ובחר את המסך או הכרטיסייה להקלטה. לאחר סיום ההקלטה, לחץ על 'עצור הקלטה', וההקלטה תועלה.",
+    "Comment": "תגובה",
+    "Comments": "תגובות",
+    "Comments are disabled": "התגובות מושבתות",
+    "Contact": "צור קשר",
+    "DELETE MEDIA": "מחק מדיה",
+    "DOWNLOAD": "הורד",
+    "Drag and drop files": "גרור ושחרר קבצים",
+    "EDIT MEDIA": "ערוך מדיה",
+    "EDIT PROFILE": "ערוך פרופיל",
+    "EDIT SUBTITLE": "ערוך כתוביות",
+    "Edit media": "ערוך מדיה",
+    "Edit profile": "ערוך פרופיל",
+    "Edit subtitle": "ערוך כתוביות",
+    "Featured": "מומלצים",
+    "Go": "בצע",
+    "History": "היסטוריה",
+    "Home": "דף הבית",
+    "Language": "שפה",
+    "Latest": "העדכונים האחרונים",
+    "Liked media": "מדיה שאהבתי",
+    "Manage comments": "ניהול תגובות",
+    "Manage media": "ניהול מדיה",
+    "Manage users": "ניהול משתמשים",
+    "Media": "מדיה",
+    "Media was edited": "המדיה נערכה",
+    "Members": "משתמשים",
+    "My media": "המדיה שלי",
+    "My playlists": "הפלייליסטים שלי",
+    "No": "לא",
+    "No comment yet": "עדיין אין תגובות",
+    "No comments yet": "עדיין אין תגובות",
+    "No results for": "אין תוצאות עבור",
+    "PLAYLISTS": "פלייליסטים",
+    "Playlists": "פלייליסטים",
+    "Powered by": "מופעל על ידי",
+    "Publish": "פרסם",
+    "Published on": "פורסם בתאריך",
+    "Recommended": "מומלץ",
+    "Record Screen": "הקלטת מסך",
+    "Register": "הרשמה",
+    "SAVE": "שמור",
+    "SEARCH": "חפש",
+    "SHARE": "שתף",
+    "SHOW MORE": "הצג עוד",
+    "SUBMIT": "שלח",
+    "Search": "חפש",
+    "Select": "בחר",
+    "Sign in": "התחבר",
+    "Sign out": "התנתק",
+    "Start Recording": "התחל הקלטה",
+    "Stop Recording": "עצור הקלטה",
+    "Subtitle was added": "הכתובית נוספה",
+    "Subtitles": "כתוביות",
+    "Tags": "תגיות",
+    "Terms": "תנאים",
+    "This works in Chrome, Safari and Edge browsers.": "זה עובד בדפדפני Chrome, Safari ו-Edge.",
+    "Trim": "גזירה",
+    "UPLOAD": "העלה",
+    "Up next": "הבא בתור",
+    "Upload": "העלה",
+    "Upload media": "העלה מדיה",
+    "Uploads": "העלאות",
+    "VIEW ALL": "הצג הכל",
+    "View all": "הצג הכל",
+    "View media": "צפה במדיה",
+    "comment": "תגובה",
+    "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "מערכת ניהול מדיה ווידאו מודרנית, פתוחה ומלאה בפיצ׳רים. פותחה כדי לענות על הצרכים של פלטפורמות אינטרנט מודרניות לצפייה ושיתוף מדיה.",
+    "media in category": "מדיה בקטגוריה",
+    "media in tag": "מדיה בתגית",
+    "or": "או",
+    "view": "צפיות",
+    "views": "צפיות",
+    "yet": "עדיין",
+}
+
+replacement_strings = {
+    "Apr": "אפריל",
+    "Aug": "אוגוסט",
+    "Dec": "דצמבר",
+    "Feb": "פברואר",
+    "Jan": "ינואר",
+    "Jul": "יולי",
+    "Jun": "יוני",
+    "Mar": "מרץ",
+    "May": "מאי",
+    "Nov": "נובמבר",
+    "Oct": "אוקטובר",
+    "Sep": "ספטמבר",
+    "day ago": "לפני יום",
+    "days ago": "לפני ימים",
+    "hour ago": "לפני שעה",
+    "hours ago": "לפני שעות",
+    "just now": "הרגע",
+    "minute ago": "לפני דקה",
+    "minutes ago": "לפני דקות",
+    "month ago": "לפני חודש",
+    "months ago": "לפני חודשים",
+    "second ago": "לפני שנייה",
+    "seconds ago": "לפני שניות",
+    "week ago": "לפני שבוע",
+    "weeks ago": "לפני שבועות",
+    "year ago": "לפני שנה",
+    "years ago": "לפני שנים",
+}

files/frontend_translations/hi.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "स्वतः चलाएं",
     "About": "के बारे में",
     "Add a ": "जोड़ें",
+    "Browse your files": "अपनी फ़ाइलें ब्राउज़ करें",
     "COMMENT": "टिप्पणी",
     "Categories": "श्रेणियाँ",
     "Category": "श्रेणी",
     "Change Language": "भाषा बदलें",
     "Change password": "पासवर्ड बदलें",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "'रिकॉर्डिंग प्रारंभ करें' पर क्लिक करें और रिकॉर्ड करने के लिए स्क्रीन या टैब का चयन करें। रिकॉर्डिंग समाप्त होने के बाद, 'रिकॉर्डिंग रोकें' पर क्लिक करें, और रिकॉर्डिंग अपलोड हो जाएगी।",
     "Comment": "टिप्पणी",
     "Comments": "टिप्पणियाँ",
     "Comments are disabled": "टिप्पणियाँ अक्षम हैं",
     "Contact": "संपर्क करें",
     "DELETE MEDIA": "मीडिया हटाएं",
     "DOWNLOAD": "डाउनलोड करें",
+    "Drag and drop files": "फ़ाइलें खींचें और छोड़ें",
     "EDIT MEDIA": "मीडिया संपादित करें",
     "EDIT PROFILE": "प्रोफ़ाइल संपादित करें",
     "EDIT SUBTITLE": "उपशीर्षक संपादित करें",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "प्लेलिस्ट",
     "Playlists": "प्लेलिस्ट",
     "Powered by": "द्वारा संचालित",
+    "Publish": "प्रकाशित करें",
     "Published on": "पर प्रकाशित",
     "Recommended": "अनुशंसित",
+    "Record Screen": "स्क्रीन रिकॉर्ड करें",
     "Register": "पंजीकरण करें",
     "SAVE": "सहेजें",
     "SEARCH": "खोजें",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "चुनें",
     "Sign in": "साइन इन करें",
     "Sign out": "साइन आउट करें",
+    "Start Recording": "रिकॉर्डिंग प्रारंभ करें",
+    "Stop Recording": "रिकॉर्डिंग रोकें",
     "Subtitle was added": "उपशीर्षक जोड़ा गया",
+    "Subtitles": "उपशीर्षक",
     "Tags": "टैग",
     "Terms": "शर्तें",
+    "This works in Chrome, Safari and Edge browsers.": "यह क्रोम, सफारी और एज ब्राउज़र में काम करता है।",
+    "Trim": "छांटें",
     "UPLOAD": "अपलोड करें",
     "Up next": "अगला",
     "Upload": "अपलोड करें",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "अपलोड",
     "VIEW ALL": "सभी देखें",
     "View all": "सभी देखें",
+    "View media": "मीडिया देखें",
     "comment": "टिप्पणी",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "एक आधुनिक, पूर्ण विशेषताओं वाला ओपन सोर्स वीडियो और मीडिया CMS है। इसे मीडिया देखने और साझा करने के लिए आधुनिक वेब प्लेटफार्मों की आवश्यकताओं को पूरा करने के लिए विकसित किया गया है",
     "media in category": "श्रेणी में मीडिया",
     "media in tag": "टैग में मीडिया",
+    "or": "या",
     "view": "देखें",
     "views": "दृश्य",
     "yet": "अभी तक",

files/frontend_translations/id.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "PUTAR OTOMATIS",
     "About": "Tentang",
     "Add a ": "Tambahkan ",
+    "Browse your files": "Jelajahi file Anda",
     "COMMENT": "KOMENTAR",
     "Categories": "Kategori",
     "Category": "Kategori",
     "Change Language": "Ganti Bahasa",
     "Change password": "Ganti kata sandi",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Klik 'Mulai Merekam' dan pilih layar atau tab untuk merekam. Setelah perekaman selesai, klik 'Hentikan Perekaman,' dan rekaman akan diunggah.",
     "Comment": "Komentar",
     "Comments": "Komentar",
     "Comments are disabled": "Komentar dinonaktifkan",
     "Contact": "Kontak",
     "DELETE MEDIA": "HAPUS MEDIA",
     "DOWNLOAD": "UNDUH",
+    "Drag and drop files": "Seret dan lepas file",
     "EDIT MEDIA": "EDIT MEDIA",
     "EDIT PROFILE": "EDIT PROFIL",
     "EDIT SUBTITLE": "EDIT SUBTITLE",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "DAFTAR PUTAR",
     "Playlists": "Daftar putar",
     "Powered by": "Didukung oleh",
+    "Publish": "Terbitkan",
     "Published on": "Diterbitkan pada",
     "Recommended": "Direkomendasikan",
+    "Record Screen": "Rekam Layar",
     "Register": "Daftar",
     "SAVE": "SIMPAN",
     "SEARCH": "CARI",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Pilih",
     "Sign in": "Masuk",
     "Sign out": "Keluar",
+    "Start Recording": "Mulai Merekam",
+    "Stop Recording": "Hentikan Perekaman",
     "Subtitle was added": "Subtitle telah ditambahkan",
+    "Subtitles": "Subtitel",
     "Tags": "Tag",
     "Terms": "Ketentuan",
+    "This works in Chrome, Safari and Edge browsers.": "Ini berfungsi di browser Chrome, Safari, dan Edge.",
+    "Trim": "Potong",
     "UPLOAD": "UNGGAH",
     "Up next": "Selanjutnya",
     "Upload": "Unggah",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Unggahan",
     "VIEW ALL": "LIHAT SEMUA",
     "View all": "Lihat semua",
+    "View media": "Lihat media",
     "comment": "komentar",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "adalah CMS video dan media open source yang modern dan lengkap. Ini dikembangkan untuk memenuhi kebutuhan platform web modern untuk menonton dan berbagi media",
     "media in category": "media dalam kategori",
     "media in tag": "media dalam tag",
+    "or": "atau",
     "view": "lihat",
     "views": "tampilan",
     "yet": "belum",

files/frontend_translations/it.py

@@ -0,0 +1,117 @@
+translation_strings = {
+    "ABOUT": "SU DI NOI",
+    "AUTOPLAY": "RIPRODUZIONE AUTOMATICA",
+    "About": "Su di noi",
+    "Add a": "Aggiungi un",
+    "Add a ": "Aggiungi un ",
+    "Browse your files": "Sfoglia i tuoi file",
+    "COMMENT": "COMMENTA",
+    "Categories": "Categorie",
+    "Category": "Categoria",
+    "Change Language": "Cambia lingua",
+    "Change password": "Cambia password",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Fai clic su 'Avvia registrazione' e seleziona lo schermo o la scheda da registrare. Una volta terminata la registrazione, fai clic su 'Interrompi registrazione' e la registrazione verrà caricata.",
+    "Comment": "Commento",
+    "Comments": "Commenti",
+    "Comments are disabled": "I commenti sono disabilitati",
+    "Contact": "Contatti",
+    "DELETE MEDIA": "ELIMINA MEDIA",
+    "DOWNLOAD": "SCARICA",
+    "Drag and drop files": "Trascina e rilascia i file",
+    "EDIT MEDIA": "MODIFICA IL MEDIA",
+    "EDIT PROFILE": "MODIFICA IL PROFILO",
+    "EDIT SUBTITLE": "MODIFICA I SOTTOTITOLI",
+    "Edit media": "Modifica il media",
+    "Edit profile": "Modifica il profilo",
+    "Edit subtitle": "Modifica i sottotitoli",
+    "Featured": "In evidenza",
+    "Go": "Vai",
+    "History": "Cronologia",
+    "Home": "Home",
+    "Language": "Lingua",
+    "Latest": "Ultimi",
+    "Liked media": "Piaciuti",
+    "Manage comments": "Gestisci i commenti",
+    "Manage media": "Gestisci i media",
+    "Manage users": "Gestisci gli utenti",
+    "Media": "Media",
+    "Media was edited": "Il media è stato modificato",
+    "Members": "Membri",
+    "My media": "I miei media",
+    "My playlists": "Le mie playlist",
+    "No": "No",
+    "No comment yet": "Ancora nessun commento",
+    "No comments yet": "Ancora nessun commento",
+    "No results for": "Nessun risultato per",
+    "PLAYLISTS": "PLAYLIST",
+    "Playlists": "Playlist",
+    "Powered by": "Powered by",
+    "Publish": "Pubblica",
+    "Published on": "Pubblicato il",
+    "Recommended": "Raccomandati",
+    "Record Screen": "Registra schermo",
+    "Register": "Registrati",
+    "SAVE": "SALVA",
+    "SEARCH": "CERCA",
+    "SHARE": "CONDIVIDI",
+    "SHOW MORE": "MOSTRA DI PIÙ",
+    "SUBMIT": "INVIA",
+    "Search": "Cerca",
+    "Select": "Seleziona",
+    "Sign in": "Login",
+    "Sign out": "Logout",
+    "Start Recording": "Inizia registrazione",
+    "Stop Recording": "Interrompi registrazione",
+    "Subtitle was added": "I sottotitoli sono stati aggiunti",
+    "Subtitles": "Sottotitoli",
+    "Tags": "Tag",
+    "Terms": "Termini e condizioni",
+    "This works in Chrome, Safari and Edge browsers.": "Questo funziona nei browser Chrome, Safari e Edge.",
+    "Trim": "Taglia",
+    "UPLOAD": "CARICA",
+    "Up next": "A seguire",
+    "Upload": "Carica",
+    "Upload media": "Carica i media",
+    "Uploads": "Caricamenti",
+    "VIEW ALL": "MOSTRA TUTTI",
+    "View all": "Mostra tutti",
+    "View media": "Visualizza media",
+    "comment": "commento",
+    "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "è un CMS per media open source moderno e completo. È stato sviluppato per rispondere per venire incontro alle esigenze delle moderne piattaforme web di visualizzazione e condivisione media",
+    "media in category": "media nella categoria",
+    "media in tag": "media con tag",
+    "or": "o",
+    "view": "visualizzazione",
+    "views": "visualizzazioni",
+    "yet": "ancora",
+}
+
+replacement_strings = {
+    "Apr": "Apr",
+    "Aug": "Ago",
+    "Dec": "Dic",
+    "Feb": "Feb",
+    "Jan": "Gen",
+    "Jul": "Lug",
+    "Jun": "Giu",
+    "Mar": "Mar",
+    "May": "Mag",
+    "Nov": "Nov",
+    "Oct": "Ott",
+    "Sep": "Set",
+    "day ago": "giorno fa",
+    "days ago": "giorni fa",
+    "hour ago": "ora fa",
+    "hours ago": "ore fa",
+    "just now": "adesso",
+    "minute ago": "minuto fa",
+    "minutes ago": "minuti fa",
+    "month ago": "mese fa",
+    "months ago": "mesi fa",
+    "second ago": "secondo fa",
+    "seconds ago": "secondi fa",
+    "week ago": "settimana fa",
+    "weeks ago": "settimane fa",
+    "year ago": "anno fa",
+    "years ago": "anni fa",
+}

files/frontend_translations/ja.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "自動再生",
     "About": "約",
     "Add a ": "追加",
+    "Browse your files": "ファイルを参照",
     "COMMENT": "コメント",
     "Categories": "カテゴリー",
     "Category": "カテゴリー",
     "Change Language": "言語を変更",
     "Change password": "パスワードを変更",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "「録画開始」をクリックして、録画する画面またはタブを選択します。録画が終了したら、「録画停止」をクリックすると、録画がアップロードされます。",
     "Comment": "コメント",
     "Comments": "コメント",
     "Comments are disabled": "コメントは無効です",
     "Contact": "連絡先",
     "DELETE MEDIA": "メディアを削除",
     "DOWNLOAD": "ダウンロード",
+    "Drag and drop files": "ファイルをドラッグアンドドロップ",
     "EDIT MEDIA": "メディアを編集",
     "EDIT PROFILE": "プロフィールを編集",
     "EDIT SUBTITLE": "字幕を編集",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "プレイリスト",
     "Playlists": "プレイリスト",
     "Powered by": "提供",
+    "Publish": "公開",
     "Published on": "公開日",
     "Recommended": "おすすめ",
+    "Record Screen": "画面を録画",
     "Register": "登録",
     "SAVE": "保存",
     "SEARCH": "検索",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "選択",
     "Sign in": "サインイン",
     "Sign out": "サインアウト",
+    "Start Recording": "録画開始",
+    "Stop Recording": "録画停止",
     "Subtitle was added": "字幕が追加されました",
+    "Subtitles": "字幕",
     "Tags": "タグ",
     "Terms": "利用規約",
+    "This works in Chrome, Safari and Edge browsers.": "これはChrome、Safari、Edgeブラウザで動作します。",
+    "Trim": "トリム",
     "UPLOAD": "アップロード",
     "Up next": "次に再生",
     "Upload": "アップロード",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "アップロード",
     "VIEW ALL": "すべて表示",
     "View all": "すべて表示",
+    "View media": "メディアを見る",
     "comment": "コメント",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "は、現代のウェブプラットフォームのニーズに応えるために開発された、最新のフル機能のオープンソースビデオおよびメディアCMSです。",
     "media in category": "カテゴリー内のメディア",
     "media in tag": "タグ内のメディア",
+    "or": "または",
     "view": "ビュー",
     "views": "ビュー",
     "yet": "まだ",

files/frontend_translations/ko.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "자동 재생",
     "About": "정보",
     "Add a ": "추가",
+    "Browse your files": "파일 찾아보기",
     "COMMENT": "댓글",
     "Categories": "카테고리",
     "Category": "카테고리",
     "Change Language": "언어 변경",
     "Change password": "비밀번호 변경",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "'녹화 시작'을 클릭하고 녹화할 화면이나 탭을 선택하세요. 녹화가 끝나면 '녹화 중지'를 클릭하면 녹화 파일이 업로드됩니다.",
     "Comment": "댓글",
     "Comments": "댓글",
     "Comments are disabled": "댓글이 비활성화되었습니다",
     "Contact": "연락처",
     "DELETE MEDIA": "미디어 삭제",
     "DOWNLOAD": "다운로드",
+    "Drag and drop files": "파일을 끌어다 놓기",
     "EDIT MEDIA": "미디어 편집",
     "EDIT PROFILE": "프로필 편집",
     "EDIT SUBTITLE": "자막 편집",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "재생 목록",
     "Playlists": "재생 목록",
     "Powered by": "제공",
+    "Publish": "게시",
     "Published on": "게시일",
     "Recommended": "추천",
+    "Record Screen": "화면 녹화",
     "Register": "등록",
     "SAVE": "저장",
     "SEARCH": "검색",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "선택",
     "Sign in": "로그인",
     "Sign out": "로그아웃",
+    "Start Recording": "녹화 시작",
+    "Stop Recording": "녹화 중지",
     "Subtitle was added": "자막이 추가되었습니다",
+    "Subtitles": "자막",
     "Tags": "태그",
     "Terms": "약관",
+    "This works in Chrome, Safari and Edge browsers.": "이 기능은 Chrome, Safari 및 Edge 브라우저에서 작동합니다.",
+    "Trim": "자르기",
     "UPLOAD": "업로드",
     "Up next": "다음",
     "Upload": "업로드",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "업로드",
     "VIEW ALL": "모두 보기",
     "View all": "모두 보기",
+    "View media": "미디어 보기",
     "comment": "댓글",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "현대적인, 완전한 기능을 갖춘 오픈 소스 비디오 및 미디어 CMS입니다. 미디어를 시청하고 공유하기 위한 현대 웹 플랫폼의 요구를 충족시키기 위해 개발되었습니다",
     "media in category": "카테고리의 미디어",
     "media in tag": "태그의 미디어",
+    "or": "또는",
     "view": "보기",
     "views": "조회수",
     "yet": "아직",

files/frontend_translations/nl.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "AUTOMATISCH AFSPELEN",
     "About": "Over",
     "Add a ": "Voeg een ",
+    "Browse your files": "Blader door uw bestanden",
     "COMMENT": "REACTIE",
     "Categories": "Categorieën",
     "Category": "Categorie",
     "Change Language": "Taal wijzigen",
     "Change password": "Wachtwoord wijzigen",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Klik op 'Opname starten' en selecteer het scherm of tabblad dat u wilt opnemen. Zodra de opname is voltooid, klikt u op 'Opname stoppen' en de opname wordt geüpload.",
     "Comment": "Reactie",
     "Comments": "Reacties",
     "Comments are disabled": "Reacties zijn uitgeschakeld",
     "Contact": "Contact",
     "DELETE MEDIA": "MEDIA VERWIJDEREN",
     "DOWNLOAD": "DOWNLOADEN",
+    "Drag and drop files": "Sleep bestanden en zet ze neer",
     "EDIT MEDIA": "MEDIA BEWERKEN",
     "EDIT PROFILE": "PROFIEL BEWERKEN",
     "EDIT SUBTITLE": "ONDERTITEL BEWERKEN",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "AFSPEELLIJSTEN",
     "Playlists": "Afspeellijsten",
     "Powered by": "Aangedreven door",
+    "Publish": "Publiceren",
     "Published on": "Gepubliceerd op",
     "Recommended": "Aanbevolen",
+    "Record Screen": "Scherm opnemen",
     "Register": "Registreren",
     "SAVE": "OPSLAAN",
     "SEARCH": "ZOEKEN",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Selecteer",
     "Sign in": "Inloggen",
     "Sign out": "Uitloggen",
+    "Start Recording": "Opname starten",
+    "Stop Recording": "Opname stoppen",
     "Subtitle was added": "Ondertitel is toegevoegd",
+    "Subtitles": "Ondertitels",
     "Tags": "Tags",
     "Terms": "Voorwaarden",
+    "This works in Chrome, Safari and Edge browsers.": "Dit werkt in Chrome, Safari en Edge browsers.",
+    "Trim": "Bijsnijden",
     "UPLOAD": "UPLOADEN",
     "Up next": "Hierna",
     "Upload": "Uploaden",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Uploads",
     "VIEW ALL": "BEKIJK ALLES",
     "View all": "Bekijk alles",
+    "View media": "Media bekijken",
     "comment": "reactie",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "is een modern, volledig uitgerust open source video- en media-CMS. Het is ontwikkeld om te voldoen aan de behoeften van moderne webplatforms voor het bekijken en delen van media",
     "media in category": "media in categorie",
     "media in tag": "media in tag",
+    "or": "of",
     "view": "bekijk",
     "views": "weergaven",
     "yet": "nog",

files/frontend_translations/pt.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "REPRODUÇÃO AUTOMÁTICA",
     "About": "Sobre",
     "Add a ": "Adicionar um ",
+    "Browse your files": "Procurar seus arquivos",
     "COMMENT": "COMENTÁRIO",
     "Categories": "Categorias",
     "Category": "Categoria",
     "Change Language": "Mudar idioma",
     "Change password": "Mudar senha",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Clique em 'Iniciar gravação' e selecione a tela ou guia para gravar. Quando a gravação terminar, clique em 'Parar gravação' e a gravação será enviada.",
     "Comment": "Comentário",
     "Comments": "Comentários",
     "Comments are disabled": "Comentários estão desativados",
     "Contact": "Contato",
     "DELETE MEDIA": "EXCLUIR MÍDIA",
     "DOWNLOAD": "BAIXAR",
+    "Drag and drop files": "Arraste e solte arquivos",
     "EDIT MEDIA": "EDITAR MÍDIA",
     "EDIT PROFILE": "EDITAR PERFIL",
     "EDIT SUBTITLE": "EDITAR LEGENDA",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "PLAYLISTS",
     "Playlists": "Playlists",
     "Powered by": "Desenvolvido por",
+    "Publish": "Publicar",
     "Published on": "Publicado em",
     "Recommended": "Recomendado",
+    "Record Screen": "Gravar tela",
     "Register": "Registrar",
     "SAVE": "SALVAR",
     "SEARCH": "PESQUISAR",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Selecionar",
     "Sign in": "Entrar",
     "Sign out": "Sair",
+    "Start Recording": "Iniciar Gravação",
+    "Stop Recording": "Parar Gravação",
     "Subtitle was added": "Legenda foi adicionada",
+    "Subtitles": "Legendas",
     "Tags": "Tags",
     "Terms": "Termos",
+    "This works in Chrome, Safari and Edge browsers.": "Isso funciona nos navegadores Chrome, Safari e Edge.",
+    "Trim": "Cortar",
     "UPLOAD": "CARREGAR",
     "Up next": "A seguir",
     "Upload": "Carregar",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Uploads",
     "VIEW ALL": "VER TODOS",
     "View all": "Ver todos",
+    "View media": "Ver mídia",
     "comment": "comentário",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "é um CMS de vídeo e mídia de código aberto, moderno e completo. Foi desenvolvido para atender às necessidades das plataformas web modernas para visualização e compartilhamento de mídia",
     "media in category": "mídia na categoria",
     "media in tag": "mídia na tag",
+    "or": "ou",
     "view": "visualização",
     "views": "visualizações",
     "yet": "ainda",

files/frontend_translations/ru.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "Автовоспроизведение",
     "About": "О",
     "Add a ": "Добавить ",
+    "Browse your files": "Просмотреть файлы",
     "COMMENT": "КОММЕНТАРИЙ",
     "Categories": "Категории",
     "Category": "Категория",
     "Change Language": "Изменить язык",
     "Change password": "Изменить пароль",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Нажмите 'Начать запись' и выберите экран или вкладку для записи. После окончания записи нажмите 'Остановить запись', и запись будет загружена.",
     "Comment": "Комментарий",
     "Comments": "Комментарии",
     "Comments are disabled": "Комментарии отключены",
     "Contact": "Контакт",
     "DELETE MEDIA": "УДАЛИТЬ МЕДИА",
     "DOWNLOAD": "СКАЧАТЬ",
+    "Drag and drop files": "Перетащите файлы",
     "EDIT MEDIA": "РЕДАКТИРОВАТЬ МЕДИА",
     "EDIT PROFILE": "РЕДАКТИРОВАТЬ ПРОФИЛЬ",
     "EDIT SUBTITLE": "РЕДАКТИРОВАТЬ СУБТИТРЫ",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "ПЛЕЙЛИСТЫ",
     "Playlists": "Плейлисты",
     "Powered by": "Работает на",
+    "Publish": "Опубликовать",
     "Published on": "Опубликовано",
     "Recommended": "Рекомендуемое",
+    "Record Screen": "Запись экрана",
     "Register": "Регистрация",
     "SAVE": "СОХРАНИТЬ",
     "SEARCH": "ПОИСК",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Выбрать",
     "Sign in": "Войти",
     "Sign out": "Выйти",
+    "Start Recording": "Начать запись",
+    "Stop Recording": "Остановить запись",
     "Subtitle was added": "Субтитры были добавлены",
+    "Subtitles": "Субтитры",
     "Tags": "Теги",
     "Terms": "Условия",
+    "This works in Chrome, Safari and Edge browsers.": "Это работает в браузерах Chrome, Safari и Edge.",
+    "Trim": "Обрезать",
     "UPLOAD": "ЗАГРУЗИТЬ",
     "Up next": "Далее",
     "Upload": "Загрузить",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Загрузки",
     "VIEW ALL": "ПОКАЗАТЬ ВСЕ",
     "View all": "Показать все",
+    "View media": "Просмотр медиа",
     "comment": "комментарий",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "это современная, полнофункциональная система управления видео и медиа с открытым исходным кодом. Она разработана для удовлетворения потребностей современных веб-платформ для просмотра и обмена медиа",
     "media in category": "медиа в категории",
     "media in tag": "медиа в теге",
+    "or": "или",
     "view": "просмотр",
     "views": "просмотры",
     "yet": "еще",

files/frontend_translations/sl.py

@@ -0,0 +1,116 @@
+translation_strings = {
+    "ABOUT": "O NAS",
+    "AUTOPLAY": "SAMODEJNO PREDVAJANJE",
+    "About": "O nas",
+    "Add a ": "Dodaj ",
+    "Browse your files": "Prebrskaj datoteke",
+    "COMMENT": "KOMENTAR",
+    "Categories": "Kategorije",
+    "Category": "Kategorija",
+    "Change Language": "Spremeni jezik",
+    "Change password": "Spremeni geslo",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "Kliknite 'Začni snemanje' in izberite zaslon ali zavihek za snemanje. Ko je snemanje končano, kliknite 'Ustavi snemanje' in posnetek bo naložen.",
+    "Comment": "Komentar",
+    "Comments": "Komentarji",
+    "Comments are disabled": "Komentarji so onemogočeni",
+    "Contact": "Kontakt",
+    "DELETE MEDIA": "IZBRIŠI MEDIJ",
+    "DOWNLOAD": "PRENESI",
+    "Drag and drop files": "Povleci in spusti datoteke",
+    "EDIT MEDIA": "UREDI MEDIJ",
+    "EDIT PROFILE": "UREDI PROFIL",
+    "EDIT SUBTITLE": "UREDI PODNAPISE",
+    "Edit media": "Uredi medij",
+    "Edit profile": "Uredi profil",
+    "Edit subtitle": "Uredi podnapise",
+    "Featured": "Izbrani",
+    "Go": "Pojdi",
+    "History": "Zgodovina",
+    "Home": "Domov",
+    "Language": "Jezik",
+    "Latest": "Najnovejši",
+    "Liked media": "Všečkani mediji",
+    "Manage comments": "Upravljaj komentarje",
+    "Manage media": "Upravljaj medije",
+    "Manage users": "Upravljaj uporabnike",
+    "Media": "Mediji",
+    "Media was edited": "Medij je bil urejen",
+    "Members": "Člani",
+    "My media": "Moji mediji",
+    "My playlists": "Moji seznami predvajanja",
+    "No": "Ne",
+    "No comment yet": "Brez komentarja",
+    "No comments yet": "Brez komentarjev",
+    "No results for": "Ni rezultatov za",
+    "PLAYLISTS": "SEZNAMI PREDVAJANJA",
+    "Playlists": "Seznami predvajanja",
+    "Powered by": "Poganja",
+    "Publish": "Objavi",
+    "Published on": "Objavljeno",
+    "Recommended": "Priporočeno",
+    "Record Screen": "Snemanje zaslona",
+    "Register": "Registracija",
+    "SAVE": "SHRANI",
+    "SEARCH": "ISKANJE",
+    "SHARE": "DELI",
+    "SHOW MORE": "PRIKAŽI VEČ",
+    "SUBMIT": "POŠLJI",
+    "Search": "Iskanje",
+    "Select": "Izberi",
+    "Sign in": "Prijava",
+    "Sign out": "Odjava",
+    "Start Recording": "Začni snemanje",
+    "Stop Recording": "Ustavi snemanje",
+    "Subtitle was added": "Podnapisi so bili dodani",
+    "Subtitles": "Podnapisi",
+    "Tags": "Oznake",
+    "Terms": "Pogoji",
+    "This works in Chrome, Safari and Edge browsers.": "To deluje v brskalnikih Chrome, Safari in Edge.",
+    "Trim": "Obreži",
+    "UPLOAD": "NALOŽI",
+    "Up next": "Naslednji",
+    "Upload": "Naloži",
+    "Upload media": "Naloži medij",
+    "Uploads": "Naloženi",
+    "VIEW ALL": "PRIKAŽI VSE",
+    "View all": "Prikaži vse",
+    "View media": "Ogled medija",
+    "comment": "komentar",
+    "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "je moderni, popolnoma opremljen odprtokodni video in medijski CMS. Razvit je za potrebe sodobnih spletnih platform za ogled in deljenje medijev",
+    "media in category": "mediji v kategoriji",
+    "media in tag": "mediji z oznako",
+    "or": "ali",
+    "view": "ogled",
+    "views": "ogledi",
+    "yet": "še",
+}
+
+replacement_strings = {
+    "Apr": "Apr",
+    "Aug": "Avg",
+    "Dec": "Dec",
+    "Feb": "Feb",
+    "Jan": "Jan",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mar",
+    "May": "Maj",
+    "Nov": "Nov",
+    "Oct": "Okt",
+    "Sep": "Sep",
+    "day ago": "dan nazaj",
+    "days ago": "dni nazaj",
+    "hour ago": "ura nazaj",
+    "hours ago": "ur nazaj",
+    "just now": "pravkar",
+    "minute ago": "minuta nazaj",
+    "minutes ago": "minut nazaj",
+    "month ago": "mesec nazaj",
+    "months ago": "mesecev nazaj",
+    "second ago": "sekunda nazaj",
+    "seconds ago": "sekund nazaj",
+    "week ago": "teden nazaj",
+    "weeks ago": "tednov nazaj",
+    "year ago": "leto nazaj",
+    "years ago": "let nazaj",
+}

files/frontend_translations/tr.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "OTOMATİK OYNATMA",
     "About": "Hakkında",
     "Add a ": "Ekle ",
+    "Browse your files": "Dosyalarınıza göz atın",
     "COMMENT": "YORUM",
     "Categories": "Kategoriler",
     "Category": "Kategori",
     "Change Language": "Dili Değiştir",
     "Change password": "Şifreyi Değiştir",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "'Kaydı Başlat'a tıklayın ve kaydedilecek ekranı veya sekmeyi seçin. Kayıt bittiğinde, 'Kaydı Durdur'a tıklayın ve kayıt yüklenecektir.",
     "Comment": "Yorum",
     "Comments": "Yorumlar",
     "Comments are disabled": "Yorumlar devre dışı",
     "Contact": "İletişim",
     "DELETE MEDIA": "MEDYAYI SİL",
     "DOWNLOAD": "İNDİR",
+    "Drag and drop files": "Dosyaları sürükleyip bırakın",
     "EDIT MEDIA": "MEDYAYI DÜZENLE",
     "EDIT PROFILE": "PROFİLİ DÜZENLE",
     "EDIT SUBTITLE": "ALT YAZIYI DÜZENLE",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "ÇALMA LİSTELERİ",
     "Playlists": "Çalma listeleri",
     "Powered by": "Tarafından desteklenmektedir",
+    "Publish": "Yayınla",
     "Published on": "Yayınlanma tarihi",
     "Recommended": "Önerilen",
+    "Record Screen": "Ekranı Kaydet",
     "Register": "Kayıt Ol",
     "SAVE": "KAYDET",
     "SEARCH": "ARA",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "Seç",
     "Sign in": "Giriş Yap",
     "Sign out": "Çıkış Yap",
+    "Start Recording": "Kaydı Başlat",
+    "Stop Recording": "Kaydı Durdur",
     "Subtitle was added": "Alt yazı eklendi",
+    "Subtitles": "Altyazılar",
     "Tags": "Etiketler",
     "Terms": "Şartlar",
+    "This works in Chrome, Safari and Edge browsers.": "Bu, Chrome, Safari ve Edge tarayıcılarında çalışır.",
+    "Trim": "Kırp",
     "UPLOAD": "YÜKLE",
     "Up next": "Sıradaki",
     "Upload": "Yükle",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "Yüklemeler",
     "VIEW ALL": "HEPSİNİ GÖR",
     "View all": "Hepsini gör",
+    "View media": "Medyayı Görüntüle",
     "comment": "yorum",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "modern, tam özellikli açık kaynaklı bir video ve medya CMS'sidir. Medya izleme ve paylaşma ihtiyaçlarını karşılamak için geliştirilmiştir",
     "media in category": "kategorideki medya",
     "media in tag": "etiketteki medya",
+    "or": "veya",
     "view": "görünüm",
     "views": "görünümler",
     "yet": "henüz",

files/frontend_translations/ur.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "خودکار پلے",
     "About": "کے بارے میں",
     "Add a ": "شامل کریں",
+    "Browse your files": "اپنی فائلیں براؤز کریں",
     "COMMENT": "تبصرہ",
     "Categories": "اقسام",
     "Category": "قسم",
     "Change Language": "زبان تبدیل کریں",
     "Change password": "پاس ورڈ تبدیل کریں",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "'ریکارڈنگ شروع کریں' پر کلک کریں اور ریکارڈ کرنے کے لیے اسکرین یا ٹیب منتخب کریں۔ ریکارڈنگ مکمل ہونے کے بعد، 'ریکارڈنگ بند کریں' پر کلک کریں، اور ریکارڈنگ اپ لوڈ ہو جائے گی۔",
     "Comment": "تبصرہ",
     "Comments": "تبصرے",
     "Comments are disabled": "تبصرے غیر فعال ہیں",
     "Contact": "رابطہ کریں",
     "DELETE MEDIA": "میڈیا حذف کریں",
     "DOWNLOAD": "ڈاؤن لوڈ",
+    "Drag and drop files": "فائلیں گھسیٹیں اور چھوڑیں",
     "EDIT MEDIA": "میڈیا ترمیم کریں",
     "EDIT PROFILE": "پروفائل ترمیم کریں",
     "EDIT SUBTITLE": "سب ٹائٹل ترمیم کریں",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "پلے لسٹس",
     "Playlists": "پلے لسٹس",
     "Powered by": "کے ذریعہ تقویت یافتہ",
+    "Publish": "شائع کریں",
     "Published on": "پر شائع ہوا",
     "Recommended": "تجویز کردہ",
+    "Record Screen": "اسکرین ریکارڈ کریں",
     "Register": "رجسٹر کریں",
     "SAVE": "محفوظ کریں",
     "SEARCH": "تلاش کریں",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "منتخب کریں",
     "Sign in": "سائن ان کریں",
     "Sign out": "سائن آؤٹ کریں",
+    "Start Recording": "ریکارڈنگ شروع کریں",
+    "Stop Recording": "ریکارڈنگ روکیں",
     "Subtitle was added": "سب ٹائٹل شامل کیا گیا",
+    "Subtitles": "سب ٹائٹلز",
     "Tags": "ٹیگز",
     "Terms": "شرائط",
+    "This works in Chrome, Safari and Edge browsers.": "یہ کروم، سفاری اور ایج براؤزرز میں کام کرتا ہے۔",
+    "Trim": "تراشیں",
     "UPLOAD": "اپ لوڈ کریں",
     "Up next": "اگلا",
     "Upload": "اپ لوڈ کریں",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "اپ لوڈز",
     "VIEW ALL": "سب دیکھیں",
     "View all": "سب دیکھیں",
+    "View media": "میڈیا دیکھیں",
     "comment": "تبصرہ",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "ایک جدید، مکمل خصوصیات والا اوپن سورس ویڈیو اور میڈیا CMS ہے۔ یہ جدید ویب پلیٹ فارمز کی ضروریات کو پورا کرنے کے لئے تیار کیا گیا ہے تاکہ میڈیا دیکھنے اور شیئر کرنے کے لئے",
     "media in category": "زمرے میں میڈیا",
     "media in tag": "ٹیگ میں میڈیا",
+    "or": "یا",
     "view": "دیکھیں",
     "views": "دیکھے گئے",
     "yet": "ابھی تک",

files/frontend_translations/zh_hans.py

@@ -3,17 +3,20 @@ translation_strings = {
     "AUTOPLAY": "自动播放",
     "About": "关于",
     "Add a ": "添加一个",
+    "Browse your files": "浏览文件",
     "COMMENT": "评论",
     "Categories": "分类",
     "Category": "类别",
     "Change Language": "更改语言",
     "Change password": "更改密码",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "点击“开始录制”并选择要录制的屏幕或标签页。录制完成后，点击“停止录制”，录制内容将被上传。",
     "Comment": "评论",
     "Comments": "评论",
     "Comments are disabled": "评论已禁用",
     "Contact": "联系",
     "DELETE MEDIA": "删除媒体",
     "DOWNLOAD": "下载",
+    "Drag and drop files": "拖放文件",
     "EDIT MEDIA": "编辑媒体",
     "EDIT PROFILE": "编辑个人资料",
     "EDIT SUBTITLE": "编辑字幕",
@@ -42,8 +45,10 @@ translation_strings = {
     "PLAYLISTS": "播放列表",
     "Playlists": "播放列表",
     "Powered by": "由...提供技术支持",
+    "Publish": "发布",
     "Published on": "发布于",
     "Recommended": "推荐",
+    "Record Screen": "录制屏幕",
     "Register": "注册",
     "SAVE": "保存",
     "SEARCH": "搜索",
@@ -54,9 +59,14 @@ translation_strings = {
     "Select": "选择",
     "Sign in": "登录",
     "Sign out": "登出",
+    "Start Recording": "开始录制",
+    "Stop Recording": "停止录制",
     "Subtitle was added": "字幕已添加",
+    "Subtitles": "字幕",
     "Tags": "标签",
     "Terms": "条款",
+    "This works in Chrome, Safari and Edge browsers.": "此功能适用于 Chrome、Safari 和 Edge 浏览器。",
+    "Trim": "修剪",
     "UPLOAD": "上传",
     "Up next": "接下来",
     "Upload": "上传",
@@ -64,10 +74,12 @@ translation_strings = {
     "Uploads": "上传",
     "VIEW ALL": "查看全部",
     "View all": "查看全部",
+    "View media": "查看媒体",
     "comment": "评论",
     "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "是一个现代化、功能齐全的开源视频和媒体CMS。它是为了满足现代网络平台观看和分享媒体的需求而开发的",
     "media in category": "类别中的媒体",
     "media in tag": "标签中的媒体",
+    "or": "或",
     "view": "查看",
     "views": "查看",
     "yet": "还",

files/frontend_translations/zh_hant.py

@@ -0,0 +1,116 @@
+translation_strings = {
+    "ABOUT": "關於",
+    "AUTOPLAY": "自動播放",
+    "About": "關於",
+    "Add a ": "新增",
+    "Browse your files": "瀏覽您的檔案",
+    "COMMENT": "留言",
+    "Categories": "分類",
+    "Category": "分類",
+    "Change Language": "切換語言",
+    "Change password": "變更密碼",
+    "Click 'Start Recording' and select the screen or tab to record. Once recording is finished, click 'Stop Recording,' and the recording will be uploaded.": "點擊「開始錄製」並選擇要錄製的螢幕或分頁。錄製完成後，點擊「停止錄製」，錄製的內容將會上傳。",
+    "Comment": "留言",
+    "Comments": "留言",
+    "Comments are disabled": "留言功能已關閉",
+    "Contact": "聯絡資訊",
+    "DELETE MEDIA": "刪除影片",
+    "DOWNLOAD": "下載",
+    "Drag and drop files": "拖放檔案",
+    "EDIT MEDIA": "編輯影片",
+    "EDIT PROFILE": "編輯個人資料",
+    "EDIT SUBTITLE": "編輯字幕",
+    "Edit media": "編輯影片",
+    "Edit profile": "編輯個人資料",
+    "Edit subtitle": "編輯字幕",
+    "Featured": "精選內容",
+    "Go": "執行",
+    "History": "觀看紀錄",
+    "Home": "首頁",
+    "Language": "語言",
+    "Latest": "最新內容",
+    "Liked media": "我喜歡的影片",
+    "Manage comments": "留言管理",
+    "Manage media": "媒體管理",
+    "Manage users": "使用者管理",
+    "Media": "媒體",
+    "Media was edited": "媒體已更新",
+    "Members": "會員",
+    "My media": "我的媒體",
+    "My playlists": "我的播放清單",
+    "No": "無",
+    "No comment yet": "尚無留言",
+    "No comments yet": "尚未有留言",
+    "No results for": "查無相關結果：",
+    "PLAYLISTS": "播放清單",
+    "Playlists": "播放清單",
+    "Powered by": "技術提供為",
+    "Publish": "發布",
+    "Published on": "發布日期為",
+    "Recommended": "推薦內容",
+    "Record Screen": "螢幕錄製",
+    "Register": "註冊",
+    "SAVE": "儲存",
+    "SEARCH": "搜尋",
+    "SHARE": "分享",
+    "SHOW MORE": "顯示更多",
+    "SUBMIT": "送出",
+    "Search": "搜尋",
+    "Select": "選擇",
+    "Sign in": "登入",
+    "Sign out": "登出",
+    "Start Recording": "開始錄製",
+    "Stop Recording": "停止錄製",
+    "Subtitle was added": "字幕已新增",
+    "Subtitles": "字幕",
+    "Tags": "標籤",
+    "Terms": "使用條款",
+    "This works in Chrome, Safari and Edge browsers.": "此功能適用於 Chrome、Safari 和 Edge 瀏覽器。",
+    "Trim": "修剪",
+    "UPLOAD": "上傳",
+    "Up next": "即將播放",
+    "Upload": "上傳",
+    "Upload media": "上傳媒體",
+    "Uploads": "上傳內容",
+    "VIEW ALL": "查看全部",
+    "View all": "瀏覽全部",
+    "View media": "查看媒體",
+    "comment": "留言",
+    "is a modern, fully featured open source video and media CMS. It is developed to meet the needs of modern web platforms for viewing and sharing media": "這是一個現代化且功能完整的開源影音內容管理系統，專為現代網路平台的觀賞與分享需求所打造。",
+    "media in category": "此分類下的媒體",
+    "media in tag": "此標籤下的媒體",
+    "or": "或者",
+    "view": "次觀看",
+    "views": "次觀看",
+    "yet": " ",
+}
+
+replacement_strings = {
+    "Apr": "四月",
+    "Aug": "八月",
+    "Dec": "十二月",
+    "Feb": "二月",
+    "Jan": "一月",
+    "Jul": "七月",
+    "Jun": "六月",
+    "Mar": "三月",
+    "May": "五月",
+    "Nov": "十一月",
+    "Oct": "十月",
+    "Sep": "九月",
+    "day ago": "天前",
+    "days ago": "天前",
+    "hour ago": "小時前",
+    "hours ago": "小時前",
+    "just now": "剛剛",
+    "minute ago": "分鐘前",
+    "minutes ago": "分鐘前",
+    "month ago": "個月前",
+    "months ago": "個月前",
+    "second ago": "秒前",
+    "seconds ago": "秒前",
+    "week ago": "週前",
+    "weeks ago": "週前",
+    "year ago": "年前",
+    "years ago": "年前",
+}

files/helpers.py

@@ -3,6 +3,7 @@
 
 import hashlib
 import json
+import logging
 import os
 import random
 import shutil
@@ -15,6 +16,9 @@ from django.conf import settings
 
 CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
+logger = logging.getLogger(__name__)
+
+
 CRF_ENCODING_NUM_SECONDS = 2  # 0 * 60 # videos with greater duration will get
 # CRF encoding and not two-pass
 # Encoding individual chunks may yield quality variations if you use a
@@ -30,12 +34,6 @@ BUF_SIZE_MULTIPLIER = 1.5
 KEYFRAME_DISTANCE = 4
 KEYFRAME_DISTANCE_MIN = 2
 
-# speed presets
-# see https://trac.ffmpeg.org/wiki/Encode/H.264
-X26x_PRESET = "medium"  # "medium"
-X265_PRESET = "medium"
-X26x_PRESET_BIG_HEIGHT = "faster"
-
 # VP9_SPEED = 1  # between 0 and 4, lower is slower
 VP9_SPEED = 2
 
@@ -51,6 +49,7 @@ VIDEO_CRFS = {
 VIDEO_BITRATES = {
     "h264": {
         25: {
+            144: 150,
             240: 300,
             360: 500,
             480: 1000,
@@ -63,6 +62,7 @@ VIDEO_BITRATES = {
     },
     "h265": {
         25: {
+            144: 75,
             240: 150,
             360: 275,
             480: 500,
@@ -75,6 +75,7 @@ VIDEO_BITRATES = {
     },
     "vp9": {
         25: {
+            144: 75,
             240: 150,
             360: 275,
             480: 500,
@@ -169,7 +170,7 @@ def rm_dir(directory):
 
 def url_from_path(filename):
     # TODO: find a way to preserver http - https ...
-    return "{0}{1}".format(settings.MEDIA_URL, filename.replace(settings.MEDIA_ROOT, ""))
+    return f"{settings.MEDIA_URL}{filename.replace(settings.MEDIA_ROOT, '')}"
 
 
 def create_temp_file(suffix=None, dir=settings.TEMP_DIRECTORY):
@@ -484,7 +485,7 @@ def show_file_size(size):
     if size:
         size = size / 1000000
         size = round(size, 1)
-        size = "{0}MB".format(str(size))
+        size = f"{str(size)}MB"
     return size
 
 
@@ -592,17 +593,13 @@ def get_base_ffmpeg_command(
     cmd = base_cmd[:]
 
     # preset settings
+    preset = getattr(settings, "FFMPEG_DEFAULT_PRESET", "medium")
+
     if encoder == "libvpx-vp9":
         if pass_number == 1:
             speed = 4
         else:
             speed = VP9_SPEED
-    elif encoder in ["libx264"]:
-        preset = X26x_PRESET
-    elif encoder in ["libx265"]:
-        preset = X265_PRESET
-    if target_height >= 720:
-        preset = X26x_PRESET_BIG_HEIGHT
 
     if encoder == "libx264":
         level = "4.2" if target_height <= 1080 else "5.2"
@@ -726,7 +723,7 @@ def produce_ffmpeg_commands(media_file, media_info, resolution, codec, output_fi
         return False
 
     if media_info.get("video_height") < resolution:
-        if resolution not in [240, 360]:  # always get these two
+        if resolution not in settings.MINIMUM_RESOLUTIONS_TO_ENCODE:
             return False
 
     #    if codec == "h264_baseline":
@@ -787,6 +784,179 @@ def clean_query(query):
     return query.lower()
 
 
+def timestamp_to_seconds(timestamp):
+    """Convert a timestamp in format HH:MM:SS.mmm to seconds
+
+    Args:
+        timestamp (str): Timestamp in format HH:MM:SS.mmm
+
+    Returns:
+        float: Timestamp in seconds
+    """
+    h, m, s = timestamp.split(':')
+    s, ms = s.split('.')
+    return int(h) * 3600 + int(m) * 60 + int(s) + float('0.' + ms)
+
+
+def seconds_to_timestamp(seconds):
+    """Convert seconds to timestamp in format HH:MM:SS.mmm
+
+    Args:
+        seconds (float): Time in seconds
+
+    Returns:
+        str: Timestamp in format HH:MM:SS.mmm
+    """
+    hours = int(seconds // 3600)
+    minutes = int((seconds % 3600) // 60)
+    seconds_remainder = seconds % 60
+    seconds_int = int(seconds_remainder)
+    milliseconds = int((seconds_remainder - seconds_int) * 1000)
+
+    return f"{hours:02d}:{minutes:02d}:{seconds_int:02d}.{milliseconds:03d}"  # noqa
+
+
+def get_trim_timestamps(media_file_path, timestamps_list, run_ffprobe=False):
+    """Process a list of timestamps to align start times with I-frames for better video trimming
+
+    Args:
+        media_file_path (str): Path to the media file
+        timestamps_list (list): List of dictionaries with startTime and endTime
+
+    Returns:
+        list: Processed timestamps with adjusted startTime values
+    """
+    if not isinstance(timestamps_list, list):
+        return []
+
+    timestamps_results = []
+    timestamps_to_process = []
+
+    for item in timestamps_list:
+        if isinstance(item, dict) and 'startTime' in item and 'endTime' in item:
+            timestamps_to_process.append(item)
+
+    if not timestamps_to_process:
+        return []
+
+    # just a single timestamp with no startTime, no need to process
+    if len(timestamps_to_process) == 1 and timestamps_to_process[0]['startTime'] == "00:00:00.000":
+        return timestamps_list
+
+    # Process each timestamp
+    for item in timestamps_to_process:
+        startTime = item['startTime']
+        endTime = item['endTime']
+
+        # with ffmpeg -ss -i that is getting run, there is no need to call ffprobe to find the I-frame,
+        # as ffmpeg will do that. Keeping this for now in case it is needed
+
+        i_frames = []
+        if run_ffprobe:
+            SEC_TO_SUBTRACT = 10
+            start_seconds = timestamp_to_seconds(startTime)
+            search_start = max(0, start_seconds - SEC_TO_SUBTRACT)
+
+            # Create ffprobe command to find nearest I-frame
+            cmd = [
+                settings.FFPROBE_COMMAND,
+                "-v",
+                "error",
+                "-select_streams",
+                "v:0",
+                "-show_entries",
+                "frame=pts_time,pict_type",
+                "-of",
+                "csv=p=0",
+                "-read_intervals",
+                f"{search_start}%{startTime}",
+                media_file_path,
+            ]
+            cmd = [str(s) for s in cmd]
+            logger.info(f"trim cmd: {cmd}")
+
+            stdout = run_command(cmd).get("out")
+
+            if stdout:
+                for line in stdout.strip().split('\n'):
+                    if line and line.endswith(',I'):
+                        i_frames.append(line.replace(',I', ''))
+
+            if i_frames:
+                adjusted_startTime = seconds_to_timestamp(float(i_frames[-1]))
+
+        if not i_frames:
+            adjusted_startTime = startTime
+
+        timestamps_results.append({'startTime': adjusted_startTime, 'endTime': endTime})
+
+    return timestamps_results
+
+
+def trim_video_method(media_file_path, timestamps_list):
+    """Trim a video file based on a list of timestamps
+
+    Args:
+        media_file_path (str): Path to the media file
+        timestamps_list (list): List of dictionaries with startTime and endTime
+
+    Returns:
+        bool: True if successful, False otherwise
+    """
+    if not isinstance(timestamps_list, list) or not timestamps_list:
+        return False
+
+    if not os.path.exists(media_file_path):
+        return False
+
+    with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as temp_dir:
+        output_file = os.path.join(temp_dir, "output.mp4")
+
+        segment_files = []
+        for i, item in enumerate(timestamps_list):
+            start_time = timestamp_to_seconds(item['startTime'])
+            end_time = timestamp_to_seconds(item['endTime'])
+            duration = end_time - start_time
+
+            # For single timestamp, we can use the output file directly
+            # For multiple timestamps, we need to create segment files
+            segment_file = output_file if len(timestamps_list) == 1 else os.path.join(temp_dir, f"segment_{i}.mp4")
+
+            cmd = [settings.FFMPEG_COMMAND, "-y", "-ss", str(item['startTime']), "-i", media_file_path, "-t", str(duration), "-c", "copy", "-avoid_negative_ts", "1", segment_file]
+
+            result = run_command(cmd)  # noqa
+
+            if os.path.exists(segment_file) and os.path.getsize(segment_file) > 0:
+                if len(timestamps_list) > 1:
+                    segment_files.append(segment_file)
+            else:
+                return False
+
+        if len(timestamps_list) > 1:
+            if not segment_files:
+                return False
+
+            concat_list_path = os.path.join(temp_dir, "concat_list.txt")
+            with open(concat_list_path, "w") as f:
+                for segment in segment_files:
+                    f.write(f"file '{segment}'\n")
+            concat_cmd = [settings.FFMPEG_COMMAND, "-y", "-f", "concat", "-safe", "0", "-i", concat_list_path, "-c", "copy", output_file]
+
+            concat_result = run_command(concat_cmd)  # noqa
+
+            if not os.path.exists(output_file) or os.path.getsize(output_file) == 0:
+                return False
+
+        # Replace the original file with the trimmed version
+        try:
+            rm_file(media_file_path)
+            shutil.copy2(output_file, media_file_path)
+            return True
+        except Exception as e:
+            logger.info(f"Failed to replace original file: {str(e)}")
+            return False
+
+
 def get_alphanumeric_only(string):
     """Returns a query that contains only alphanumeric characters
     This include characters other than the English alphabet too

files/management_views.py

@@ -1,3 +1,5 @@
+from django.conf import settings
+from django.db.models import Q
 from drf_yasg import openapi as openapi
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import status
@@ -46,6 +48,7 @@ class MediaList(APIView):
 
         featured = params.get("featured", "").strip()
         is_reviewed = params.get("is_reviewed", "").strip()
+        category = params.get("category", "").strip()
 
         sort_by_options = [
             "title",
@@ -98,6 +101,9 @@ class MediaList(APIView):
         if is_reviewed != "all":
             qs = qs.filter(is_reviewed=is_reviewed)
 
+        if category:
+            qs = qs.filter(category__title__contains=category)
+
         media = qs.order_by(f"{ordering}{sort_by}")
 
         paginator = pagination_class()
@@ -215,6 +221,13 @@ class UserList(APIView):
         elif role == "editor":
             qs = qs.filter(is_editor=True)
 
+        if settings.USERS_NEEDS_TO_BE_APPROVED:
+            is_approved = request.GET.get("is_approved")
+            if is_approved == "true":
+                qs = qs.filter(is_approved=True)
+            elif is_approved == "false":
+                qs = qs.filter(Q(is_approved=False) | Q(is_approved__isnull=True))
+
         users = qs.order_by(f"{ordering}{sort_by}")
 
         paginator = pagination_class()

files/methods.py

@@ -5,16 +5,19 @@ import itertools
 import logging
 import random
 import re
+import subprocess
 from datetime import datetime
 
 from django.conf import settings
 from django.core.cache import cache
+from django.core.files import File
 from django.core.mail import EmailMessage
 from django.db.models import Q
+from django.utils import timezone
 
 from cms import celery_app
 
-from . import models
+from . import helpers, models
 from .helpers import mask_ip
 
 logger = logging.getLogger(__name__)
@@ -163,14 +166,14 @@ Media becomes private if it gets reported %s times\n
         )
 
         if settings.ADMINS_NOTIFICATIONS.get("MEDIA_REPORTED", False):
-            title = "[{}] - Media was reported".format(settings.PORTAL_NAME)
+            title = f"[{settings.PORTAL_NAME}] - Media was reported"
             d = {}
             d["title"] = title
             d["msg"] = msg
             d["to"] = settings.ADMIN_EMAIL_LIST
             notify_items.append(d)
         if settings.USERS_NOTIFICATIONS.get("MEDIA_REPORTED", False):
-            title = "[{}] - Media was reported".format(settings.PORTAL_NAME)
+            title = f"[{settings.PORTAL_NAME}] - Media was reported"
             d = {}
             d["title"] = title
             d["msg"] = msg
@@ -179,7 +182,7 @@ Media becomes private if it gets reported %s times\n
 
     if action == "media_added" and media:
         if settings.ADMINS_NOTIFICATIONS.get("MEDIA_ADDED", False):
-            title = "[{}] - Media was added".format(settings.PORTAL_NAME)
+            title = f"[{settings.PORTAL_NAME}] - Media was added"
             msg = """
 Media %s was added by user %s.
 """ % (
@@ -192,7 +195,7 @@ Media %s was added by user %s.
             d["to"] = settings.ADMIN_EMAIL_LIST
             notify_items.append(d)
         if settings.USERS_NOTIFICATIONS.get("MEDIA_ADDED", False):
-            title = "[{}] - Your media was added".format(settings.PORTAL_NAME)
+            title = f"[{settings.PORTAL_NAME}] - Your media was added"
             msg = """
 Your media has been added! It will be encoded and will be available soon.
 URL: %s
@@ -262,7 +265,7 @@ def show_related_media_content(media, request, limit):
         "user_featured",
         "-user_featured",
     ]
-    # TODO: MAke this mess more readable, and add TAGS support - aka related
+    # TODO: Make this mess more readable, and add TAGS support - aka related
     # tags rather than random media
     if len(m) < limit:
         category = media.category.first()
@@ -336,7 +339,7 @@ def notify_user_on_comment(friendly_token):
     media_url = settings.SSL_FRONTEND_HOST + media.get_absolute_url()
 
     if user.notification_on_comments:
-        title = "[{}] - A comment was added".format(settings.PORTAL_NAME)
+        title = f"[{settings.PORTAL_NAME}] - A comment was added"
         msg = """
 A comment has been added to your media %s .
 View it on %s
@@ -360,7 +363,7 @@ def notify_user_on_mention(friendly_token, user_mentioned, cleaned_comment):
     media_url = settings.SSL_FRONTEND_HOST + media.get_absolute_url()
 
     if user.notification_on_comments:
-        title = "[{}] - You were mentioned in a comment".format(settings.PORTAL_NAME)
+        title = f"[{settings.PORTAL_NAME}] - You were mentioned in a comment"
         msg = """
 You were mentioned in a comment on  %s .
 View it on %s
@@ -398,6 +401,149 @@ def clean_comment(raw_comment):
     return cleaned_comment
 
 
+def user_allowed_to_upload(request):
+    """Any custom logic for whether a user is allowed
+    to upload content lives here
+    """
+
+    if request.user.is_anonymous:
+        return False
+    if is_mediacms_editor(request.user):
+        return True
+
+    # Check if user has reached the maximum number of uploads
+    if hasattr(settings, 'NUMBER_OF_MEDIA_USER_CAN_UPLOAD'):
+        if models.Media.objects.filter(user=request.user).count() >= settings.NUMBER_OF_MEDIA_USER_CAN_UPLOAD:
+            return False
+
+    if settings.CAN_ADD_MEDIA == "all":
+        return True
+    elif settings.CAN_ADD_MEDIA == "email_verified":
+        if request.user.email_is_verified:
+            return True
+    elif settings.CAN_ADD_MEDIA == "advancedUser":
+        if request.user.advancedUser:
+            return True
+    return False
+
+
+def can_transcribe_video(user):
+    """Checks if a user can transcribe a video."""
+    if not getattr(settings, 'USE_WHISPER_TRANSCRIBE', False):
+        return False
+
+    if is_mediacms_editor(user):
+        return True
+    if getattr(settings, 'USER_CAN_TRANSCRIBE_VIDEO', False):
+        return True
+    return False
+
+
+def kill_ffmpeg_process(filepath):
+    """Kill ffmpeg process that is processing a specific file
+
+    Args:
+        filepath: Path to the file being processed by ffmpeg
+
+    Returns:
+        subprocess.CompletedProcess: Result of the kill command
+    """
+    if not filepath:
+        return False
+    cmd = "ps aux|grep 'ffmpeg'|grep %s|grep -v grep |awk '{print $2}'" % filepath
+    result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+    pid = result.stdout.decode("utf-8").strip()
+    if pid:
+        cmd = "kill -9 %s" % pid
+        result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+    return result
+
+
+def copy_video(original_media, copy_encodings=True, title_suffix="(Trimmed)"):
+    """Create a copy of a media object
+
+    Args:
+        original_media: Original Media object to copy
+        copy_encodings: Whether to copy the encodings too
+
+    Returns:
+        New Media object
+    """
+
+    with open(original_media.media_file.path, "rb") as f:
+        myfile = File(f)
+        new_media = models.Media(
+            media_file=myfile,
+            title=f"{original_media.title} {title_suffix}",
+            description=original_media.description,
+            user=original_media.user,
+            media_type="video",
+            enable_comments=original_media.enable_comments,
+            allow_download=original_media.allow_download,
+            state=original_media.state,
+            is_reviewed=original_media.is_reviewed,
+            encoding_status=original_media.encoding_status,
+            listable=original_media.listable,
+            add_date=timezone.now(),
+            video_height=original_media.video_height,
+            media_info=original_media.media_info,
+        )
+        models.Media.objects.bulk_create([new_media])
+        # avoids calling signals since signals will call media_init and we don't want that
+
+    if copy_encodings:
+        for encoding in original_media.encodings.filter(chunk=False, status="success"):
+            if encoding.media_file:
+                with open(encoding.media_file.path, "rb") as f:
+                    myfile = File(f)
+                    new_encoding = models.Encoding(
+                        media_file=myfile, media=new_media, profile=encoding.profile, status="success", progress=100, chunk=False, logs=f"Copied from encoding {encoding.id}"
+                    )
+                    models.Encoding.objects.bulk_create([new_encoding])
+                    # avoids calling signals as this is still not ready
+
+    # Copy categories and tags
+    for category in original_media.category.all():
+        new_media.category.add(category)
+
+    for tag in original_media.tags.all():
+        new_media.tags.add(tag)
+
+    if original_media.thumbnail:
+        with open(original_media.thumbnail.path, 'rb') as f:
+            thumbnail_name = helpers.get_file_name(original_media.thumbnail.path)
+            new_media.thumbnail.save(thumbnail_name, File(f))
+
+    if original_media.poster:
+        with open(original_media.poster.path, 'rb') as f:
+            poster_name = helpers.get_file_name(original_media.poster.path)
+            new_media.poster.save(poster_name, File(f))
+
+    return new_media
+
+
+def create_video_trim_request(media, data):
+    """Create a video trim request for a media
+
+    Args:
+        media: Media object
+        data: Dictionary with trim request data
+
+    Returns:
+        VideoTrimRequest object
+    """
+
+    video_action = "replace"
+    if data.get('saveIndividualSegments'):
+        video_action = "create_segments"
+    elif data.get('saveAsCopy'):
+        video_action = "save_new"
+
+    video_trim_request = models.VideoTrimRequest.objects.create(media=media, status="initial", video_action=video_action, media_trim_style='no_encoding', timestamps=data.get('segments', {}))
+
+    return video_trim_request
+
+
 def list_tasks():
     """Lists celery tasks
     To be used in an admin dashboard
@@ -448,3 +594,59 @@ def list_tasks():
     ret["task_ids"] = task_ids
     ret["media_profile_pairs"] = media_profile_pairs
     return ret
+
+
+def handle_video_chapters(media, chapters):
+    video_chapter = models.VideoChapterData.objects.filter(media=media).first()
+    if video_chapter:
+        video_chapter.data = chapters
+        video_chapter.save()
+    else:
+        video_chapter = models.VideoChapterData.objects.create(media=media, data=chapters)
+
+    return {'chapters': media.chapter_data}
+
+
+def change_media_owner(media_id, new_user):
+    """Change the owner of a media
+
+    Args:
+        media_id: ID of the media to change owner
+        new_user: New user object to set as owner
+
+    Returns:
+        Media object or None if media not found
+    """
+    media = models.Media.objects.filter(id=media_id).first()
+    if not media:
+        return None
+
+    # Change the owner
+    media.user = new_user
+    media.save(update_fields=["user"])
+
+    # Update any related permissions
+    media_permissions = models.MediaPermission.objects.filter(media=media)
+    for permission in media_permissions:
+        permission.owner_user = new_user
+        permission.save(update_fields=["owner_user"])
+
+    return media
+
+
+def copy_media(media_id):
+    """Create a copy of a media
+
+    Args:
+        media_id: ID of the media to copy
+
+    Returns:
+        None
+    """
+    pass
+
+
+def is_media_allowed_type(media):
+    if "all" in settings.ALLOWED_MEDIA_UPLOAD_TYPES:
+        return True
+    return media.media_type in settings.ALLOWED_MEDIA_UPLOAD_TYPES

files/migrations/0004_alter_subtitle_options_category_identity_provider_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 5.1.6 on 2025-03-18 17:40
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0003_auto_20210927_1245'),
+        ('socialaccount', '0006_alter_socialaccount_extra_data'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='subtitle',
+            options={'ordering': ['language__title']},
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='identity_provider',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='If category is related with a specific Identity Provider',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='categories',
+                to='socialaccount.socialapp',
+                verbose_name='IDP Config Name',
+            ),
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='is_rbac_category',
+            field=models.BooleanField(db_index=True, default=False, help_text='If access to Category is controlled by role based membership of Groups'),
+        ),
+        migrations.AlterField(
+            model_name='media',
+            name='state',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public'), ('unlisted', 'Unlisted')], db_index=True, default='private', help_text='state of Media', max_length=20),
+        ),
+    ]

files/migrations/0005_alter_category_uid.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.6 on 2025-03-25 14:13
+
+from django.db import migrations, models
+
+import files.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0004_alter_subtitle_options_category_identity_provider_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='uid',
+            field=models.CharField(default=files.models.generate_uid, max_length=36, unique=True),
+        ),
+    ]

files/migrations/0006_alter_category_title.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.6 on 2025-03-27 09:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0005_alter_category_uid'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='title',
+            field=models.CharField(db_index=True, max_length=100),
+        ),
+    ]

files/migrations/0007_alter_media_state_videochapterdata.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.6 on 2025-04-15 07:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0006_alter_category_title'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VideoChapterData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('data', models.JSONField(help_text='Chapter data')),
+                ('media', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chapters', to='files.media')),
+            ],
+            options={
+                'unique_together': {('media',)},
+            },
+        ),
+    ]

files/migrations/0008_alter_media_state_videotrimrequest.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.1.6 on 2025-05-02 14:23
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0007_alter_media_state_videochapterdata'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='media',
+            name='state',
+            field=models.CharField(choices=[('private', 'Private'), ('public', 'Public'), ('unlisted', 'Unlisted')], db_index=True, default='public', help_text='state of Media', max_length=20),
+        ),
+        migrations.CreateModel(
+            name='VideoTrimRequest',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('status', models.CharField(choices=[('initial', 'Initial'), ('running', 'Running'), ('success', 'Success'), ('fail', 'Fail')], default='initial', max_length=20)),
+                ('add_date', models.DateTimeField(auto_now_add=True)),
+                ('video_action', models.CharField(choices=[('replace', 'Replace Original'), ('save_new', 'Save as New'), ('create_segments', 'Create Segments')], max_length=20)),
+                ('media_trim_style', models.CharField(choices=[('no_encoding', 'No Encoding'), ('precise', 'Precise')], default='no_encoding', max_length=20)),
+                ('timestamps', models.JSONField(help_text='Timestamps for trimming')),
+                ('media', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trim_requests', to='files.media')),
+            ],
+        ),
+    ]

files/migrations/0009_alter_media_friendly_token.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.6 on 2025-06-20 08:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0008_alter_media_state_videotrimrequest'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='media',
+            name='friendly_token',
+            field=models.CharField(blank=True, db_index=True, help_text='Identifier for the Media', max_length=150, unique=True),
+        ),
+    ]

files/migrations/0010_alter_encodeprofile_resolution.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.6 on 2025-07-05 11:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0009_alter_media_friendly_token'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='encodeprofile',
+            name='resolution',
+            field=models.IntegerField(blank=True, choices=[(2160, '2160'), (1440, '1440'), (1080, '1080'), (720, '720'), (480, '480'), (360, '360'), (240, '240'), (144, '144')], null=True),
+        ),
+    ]

files/migrations/0011_mediapermission.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.1.6 on 2025-07-08 19:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0010_alter_encodeprofile_resolution'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MediaPermission',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('permission', models.CharField(choices=[('viewer', 'Viewer'), ('editor', 'Editor'), ('owner', 'Owner')], max_length=20)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('media', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='permissions', to='files.media')),
+                ('owner_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='granted_permissions', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'unique_together': {('user', 'media')},
+            },
+        ),
+    ]

files/migrations/0012_media_allow_whisper_transcribe_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 5.1.6 on 2025-08-31 08:28
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0011_mediapermission'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='language',
+            name='code',
+            field=models.CharField(help_text='language code', max_length=30),
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='allow_whisper_transcribe',
+            field=models.BooleanField(default=False, verbose_name='Transcribe auto-detected language'),
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='allow_whisper_transcribe_and_translate',
+            field=models.BooleanField(default=False, verbose_name='Transcribe auto-detected language and translate to English'),
+        ),
+        migrations.CreateModel(
+            name='TranscriptionRequest',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('add_date', models.DateTimeField(auto_now_add=True)),
+                ('status', models.CharField(choices=[('pending', 'Pending'), ('running', 'Running'), ('fail', 'Fail'), ('success', 'Success')], db_index=True, default='pending', max_length=20)),
+                ('translate_to_english', models.BooleanField(default=False)),
+                ('logs', models.TextField(blank=True, null=True)),
+                ('media', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transcriptionrequests', to='files.media')),
+            ],
+        ),
+    ]

files/migrations/0013_page_tinymcemedia.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.2.6 on 2025-09-21 11:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0012_media_allow_whisper_transcribe_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Page',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug', models.SlugField(max_length=200, unique=True)),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField(blank=True)),
+                ('add_date', models.DateTimeField(auto_now_add=True)),
+                ('edit_date', models.DateTimeField(auto_now=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TinyMCEMedia',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('file', models.FileField(upload_to='tinymce_media/')),
+                ('uploaded_at', models.DateTimeField(auto_now_add=True)),
+                ('file_type', models.CharField(choices=[('image', 'Image'), ('media', 'Media')], max_length=10)),
+                ('original_filename', models.CharField(max_length=255)),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'TinyMCE Media',
+                'verbose_name_plural': 'TinyMCE Media',
+                'ordering': ['-uploaded_at'],
+            },
+        ),
+    ]

files/models/__init__.py

@@ -0,0 +1,26 @@
+# Import all models for backward compatibility
+from .category import Category, Tag  # noqa: F401
+from .comment import Comment  # noqa: F401
+from .encoding import EncodeProfile, Encoding  # noqa: F401
+from .license import License  # noqa: F401
+from .media import Media, MediaPermission  # noqa: F401
+from .page import Page, TinyMCEMedia  # noqa: F401
+from .playlist import Playlist, PlaylistMedia  # noqa: F401
+from .rating import Rating, RatingCategory  # noqa: F401
+from .subtitle import Language, Subtitle, TranscriptionRequest  # noqa: F401
+from .utils import CODECS  # noqa: F401
+from .utils import ENCODE_EXTENSIONS  # noqa: F401
+from .utils import ENCODE_EXTENSIONS_KEYS  # noqa: F401
+from .utils import ENCODE_RESOLUTIONS  # noqa: F401
+from .utils import ENCODE_RESOLUTIONS_KEYS  # noqa: F401
+from .utils import MEDIA_ENCODING_STATUS  # noqa: F401
+from .utils import MEDIA_STATES  # noqa: F401
+from .utils import MEDIA_TYPES_SUPPORTED  # noqa: F401
+from .utils import category_thumb_path  # noqa: F401
+from .utils import encoding_media_file_path  # noqa: F401
+from .utils import generate_uid  # noqa: F401
+from .utils import original_media_file_path  # noqa: F401
+from .utils import original_thumbnail_file_path  # noqa: F401
+from .utils import subtitles_file_path  # noqa: F401
+from .utils import validate_rating  # noqa: F401
+from .video_data import VideoChapterData, VideoTrimRequest  # noqa: F401

files/models/category.py

@@ -0,0 +1,156 @@
+from django.db import models
+from django.urls import reverse
+from django.utils.html import strip_tags
+from imagekit.models import ProcessedImageField
+from imagekit.processors import ResizeToFit
+
+from .. import helpers
+from .utils import category_thumb_path, generate_uid
+
+
+class Category(models.Model):
+    """A Category base model"""
+
+    uid = models.CharField(unique=True, max_length=36, default=generate_uid)
+
+    add_date = models.DateTimeField(auto_now_add=True)
+
+    title = models.CharField(max_length=100, db_index=True)
+
+    description = models.TextField(blank=True)
+
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE, blank=True, null=True)
+
+    is_global = models.BooleanField(default=False, help_text="global categories or user specific")
+
+    media_count = models.IntegerField(default=0, help_text="number of media")
+
+    thumbnail = ProcessedImageField(
+        upload_to=category_thumb_path,
+        processors=[ResizeToFit(width=344, height=None)],
+        format="JPEG",
+        options={"quality": 85},
+        blank=True,
+    )
+
+    listings_thumbnail = models.CharField(max_length=400, blank=True, null=True, help_text="Thumbnail to show on listings")
+
+    is_rbac_category = models.BooleanField(default=False, db_index=True, help_text='If access to Category is controlled by role based membership of Groups')
+
+    identity_provider = models.ForeignKey(
+        'socialaccount.SocialApp',
+        blank=True,
+        null=True,
+        on_delete=models.CASCADE,
+        related_name='categories',
+        help_text='If category is related with a specific Identity Provider',
+        verbose_name='IDP Config Name',
+    )
+
+    def __str__(self):
+        return self.title
+
+    class Meta:
+        ordering = ["title"]
+        verbose_name_plural = "Categories"
+
+    def get_absolute_url(self):
+        return f"{reverse('search')}?c={self.title}"
+
+    def update_category_media(self):
+        """Set media_count"""
+
+        # Always set number of Category the total number of media
+        # Depending on how RBAC is set and Permissions etc it is
+        # possible that users won't see all media in a Category
+        # but it's worth to handle this on the UI level
+        # (eg through a message that says that you see only files you have permissions to see)
+
+        self.media_count = Media.objects.filter(category=self).count()
+        self.save(update_fields=["media_count"])
+
+        # OLD logic
+        # if getattr(settings, 'USE_RBAC', False) and self.is_rbac_category:
+        #    self.media_count = Media.objects.filter(category=self).count()
+        # else:
+        #    self.media_count = Media.objects.filter(listable=True, category=self).count()
+
+        self.save(update_fields=["media_count"])
+        return True
+
+    @property
+    def thumbnail_url(self):
+        """Return thumbnail for category
+        prioritize processed value of listings_thumbnail
+        then thumbnail
+        """
+
+        if self.thumbnail:
+            return helpers.url_from_path(self.thumbnail.path)
+
+        if self.listings_thumbnail:
+            return self.listings_thumbnail
+
+        if Media.objects.filter(category=self, state="public").exists():
+            media = Media.objects.filter(category=self, state="public").order_by("-views").first()
+            if media:
+                return media.thumbnail_url
+
+        return None
+
+    def save(self, *args, **kwargs):
+        strip_text_items = ["title", "description"]
+        for item in strip_text_items:
+            setattr(self, item, strip_tags(getattr(self, item, None)))
+        super(Category, self).save(*args, **kwargs)
+
+
+class Tag(models.Model):
+    """A Tag model"""
+
+    title = models.CharField(max_length=100, unique=True, db_index=True)
+
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE, blank=True, null=True)
+
+    media_count = models.IntegerField(default=0, help_text="number of media")
+
+    listings_thumbnail = models.CharField(
+        max_length=400,
+        blank=True,
+        null=True,
+        help_text="Thumbnail to show on listings",
+        db_index=True,
+    )
+
+    def __str__(self):
+        return self.title
+
+    class Meta:
+        ordering = ["title"]
+
+    def get_absolute_url(self):
+        return f"{reverse('search')}?t={self.title}"
+
+    def update_tag_media(self):
+        self.media_count = Media.objects.filter(state="public", is_reviewed=True, tags=self).count()
+        self.save(update_fields=["media_count"])
+        return True
+
+    def save(self, *args, **kwargs):
+        self.title = helpers.get_alphanumeric_only(self.title)
+        self.title = self.title[:100]
+        super(Tag, self).save(*args, **kwargs)
+
+    @property
+    def thumbnail_url(self):
+        if self.listings_thumbnail:
+            return self.listings_thumbnail
+        media = Media.objects.filter(tags=self, state="public").order_by("-views").first()
+        if media:
+            return media.thumbnail_url
+
+        return None
+
+
+# Import Media to avoid circular imports
+from .media import Media  # noqa

files/models/comment.py

@@ -0,0 +1,46 @@
+import uuid
+
+from django.conf import settings
+from django.db import models
+from django.urls import reverse
+from django.utils.html import strip_tags
+from mptt.models import MPTTModel, TreeForeignKey
+
+
+class Comment(MPTTModel):
+    """Comments model"""
+
+    add_date = models.DateTimeField(auto_now_add=True)
+
+    media = models.ForeignKey("Media", on_delete=models.CASCADE, db_index=True, related_name="comments")
+
+    parent = TreeForeignKey("self", on_delete=models.CASCADE, null=True, blank=True, related_name="children")
+
+    text = models.TextField(help_text="text")
+
+    uid = models.UUIDField(unique=True, default=uuid.uuid4)
+
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE, db_index=True)
+
+    class MPTTMeta:
+        order_insertion_by = ["add_date"]
+
+    def __str__(self):
+        return f"On {self.media.title} by {self.user.username}"
+
+    def save(self, *args, **kwargs):
+        strip_text_items = ["text"]
+        for item in strip_text_items:
+            setattr(self, item, strip_tags(getattr(self, item, None)))
+
+        if self.text:
+            self.text = self.text[: settings.MAX_CHARS_FOR_COMMENT]
+
+        super(Comment, self).save(*args, **kwargs)
+
+    def get_absolute_url(self):
+        return f"{reverse('get_media')}?m={self.media.friendly_token}"
+
+    @property
+    def media_url(self):
+        return self.get_absolute_url()

files/models/encoding.py

@@ -0,0 +1,303 @@
+import json
+import tempfile
+
+from django.conf import settings
+from django.core.files import File
+from django.db import models
+from django.db.models.signals import post_delete, post_save
+from django.dispatch import receiver
+from django.urls import reverse
+
+from .. import helpers
+from .utils import (
+    CODECS,
+    ENCODE_EXTENSIONS,
+    ENCODE_RESOLUTIONS,
+    MEDIA_ENCODING_STATUS,
+    encoding_media_file_path,
+)
+
+
+class EncodeProfile(models.Model):
+    """Encode Profile model
+    keeps information for each profile
+    """
+
+    name = models.CharField(max_length=90)
+
+    extension = models.CharField(max_length=10, choices=ENCODE_EXTENSIONS)
+
+    resolution = models.IntegerField(choices=ENCODE_RESOLUTIONS, blank=True, null=True)
+
+    codec = models.CharField(max_length=10, choices=CODECS, blank=True, null=True)
+
+    description = models.TextField(blank=True, help_text="description")
+
+    active = models.BooleanField(default=True)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        ordering = ["resolution"]
+
+
+class Encoding(models.Model):
+    """Encoding Media Instances"""
+
+    add_date = models.DateTimeField(auto_now_add=True)
+
+    commands = models.TextField(blank=True, help_text="commands run")
+
+    chunk = models.BooleanField(default=False, db_index=True, help_text="is chunk?")
+
+    chunk_file_path = models.CharField(max_length=400, blank=True)
+
+    chunks_info = models.TextField(blank=True)
+
+    logs = models.TextField(blank=True)
+
+    md5sum = models.CharField(max_length=50, blank=True, null=True)
+
+    media = models.ForeignKey("Media", on_delete=models.CASCADE, related_name="encodings")
+
+    media_file = models.FileField("encoding file", upload_to=encoding_media_file_path, blank=True, max_length=500)
+
+    profile = models.ForeignKey(EncodeProfile, on_delete=models.CASCADE)
+
+    progress = models.PositiveSmallIntegerField(default=0)
+
+    update_date = models.DateTimeField(auto_now=True)
+
+    retries = models.IntegerField(default=0)
+
+    size = models.CharField(max_length=20, blank=True)
+
+    status = models.CharField(max_length=20, choices=MEDIA_ENCODING_STATUS, default="pending")
+
+    temp_file = models.CharField(max_length=400, blank=True)
+
+    task_id = models.CharField(max_length=100, blank=True)
+
+    total_run_time = models.IntegerField(default=0)
+
+    worker = models.CharField(max_length=100, blank=True)
+
+    @property
+    def media_encoding_url(self):
+        if self.media_file:
+            return helpers.url_from_path(self.media_file.path)
+        return None
+
+    @property
+    def media_chunk_url(self):
+        if self.chunk_file_path:
+            return helpers.url_from_path(self.chunk_file_path)
+        return None
+
+    def save(self, *args, **kwargs):
+        if self.media_file:
+            cmd = ["stat", "-c", "%s", self.media_file.path]
+            stdout = helpers.run_command(cmd).get("out")
+            if stdout:
+                size = int(stdout.strip())
+                self.size = helpers.show_file_size(size)
+        if self.chunk_file_path and not self.md5sum:
+            cmd = ["md5sum", self.chunk_file_path]
+            stdout = helpers.run_command(cmd).get("out")
+            if stdout:
+                md5sum = stdout.strip().split()[0]
+                self.md5sum = md5sum
+
+        super(Encoding, self).save(*args, **kwargs)
+
+    def update_size_without_save(self):
+        """Update the size of an encoding without saving to avoid calling signals"""
+        if self.media_file:
+            cmd = ["stat", "-c", "%s", self.media_file.path]
+            stdout = helpers.run_command(cmd).get("out")
+            if stdout:
+                size = int(stdout.strip())
+                size = helpers.show_file_size(size)
+                Encoding.objects.filter(pk=self.pk).update(size=size)
+                return True
+        return False
+
+    def set_progress(self, progress, commit=True):
+        if isinstance(progress, int):
+            if 0 <= progress <= 100:
+                self.progress = progress
+                # save object with filter update
+                # to avoid calling signals
+                Encoding.objects.filter(pk=self.pk).update(progress=progress)
+                return True
+        return False
+
+    def __str__(self):
+        return f"{self.profile.name}-{self.media.title}"
+
+    def get_absolute_url(self):
+        return reverse("api_get_encoding", kwargs={"encoding_id": self.id})
+
+
+@receiver(post_save, sender=Encoding)
+def encoding_file_save(sender, instance, created, **kwargs):
+    """Performs actions on encoding file delete
+    For example, if encoding is a chunk file, with encoding_status success,
+    perform a check if this is the final chunk file of a media, then
+    concatenate chunks, create final encoding file and delete chunks
+    """
+
+    if instance.chunk and instance.status == "success":
+        # a chunk got completed
+
+        # check if all chunks are OK
+        # then concatenate to new Encoding - and remove chunks
+        # this should run only once!
+        if instance.media_file:
+            try:
+                orig_chunks = json.loads(instance.chunks_info).keys()
+            except BaseException:
+                instance.delete()
+                return False
+
+            chunks = Encoding.objects.filter(
+                media=instance.media,
+                profile=instance.profile,
+                chunks_info=instance.chunks_info,
+                chunk=True,
+            ).order_by("add_date")
+
+            complete = True
+
+            # perform validation, make sure everything is there
+            for chunk in orig_chunks:
+                if not chunks.filter(chunk_file_path=chunk):
+                    complete = False
+                    break
+
+            for chunk in chunks:
+                if not (chunk.media_file and chunk.media_file.path):
+                    complete = False
+                    break
+
+            if complete:
+                # concatenate chunks and create final encoding file
+                chunks_paths = [f.media_file.path for f in chunks]
+
+                with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as temp_dir:
+                    seg_file = helpers.create_temp_file(suffix=".txt", dir=temp_dir)
+                    tf = helpers.create_temp_file(suffix=f".{instance.profile.extension}", dir=temp_dir)
+                    with open(seg_file, "w") as ff:
+                        for f in chunks_paths:
+                            ff.write(f"file {f}\n")
+                    cmd = [
+                        settings.FFMPEG_COMMAND,
+                        "-y",
+                        "-f",
+                        "concat",
+                        "-safe",
+                        "0",
+                        "-i",
+                        seg_file,
+                        "-c",
+                        "copy",
+                        "-pix_fmt",
+                        "yuv420p",
+                        "-movflags",
+                        "faststart",
+                        tf,
+                    ]
+                    stdout = helpers.run_command(cmd)
+
+                    encoding = Encoding(
+                        media=instance.media,
+                        profile=instance.profile,
+                        status="success",
+                        progress=100,
+                    )
+                    all_logs = "\n".join([st.logs for st in chunks])
+                    encoding.logs = f"{chunks_paths}\n{stdout}\n{all_logs}"
+                    workers = list(set([st.worker for st in chunks]))
+                    encoding.worker = json.dumps({"workers": workers})
+
+                    start_date = min([st.add_date for st in chunks])
+                    end_date = max([st.update_date for st in chunks])
+                    encoding.total_run_time = (end_date - start_date).seconds
+                    encoding.save()
+
+                    with open(tf, "rb") as f:
+                        myfile = File(f)
+                        output_name = f"{helpers.get_file_name(instance.media.media_file.path)}.{instance.profile.extension}"
+                        encoding.media_file.save(content=myfile, name=output_name)
+
+                    # encoding is saved, deleting chunks
+                    # and any other encoding that might exist
+                    # first perform one last validation
+                    # to avoid that this is run twice
+                    if (
+                        len(orig_chunks)
+                        == Encoding.objects.filter(  # noqa
+                            media=instance.media,
+                            profile=instance.profile,
+                            chunks_info=instance.chunks_info,
+                        ).count()
+                    ):
+                        # if two chunks are finished at the same time, this
+                        # will be changed
+                        who = Encoding.objects.filter(media=encoding.media, profile=encoding.profile).exclude(id=encoding.id)
+                        who.delete()
+                    else:
+                        encoding.delete()
+                    if not Encoding.objects.filter(chunks_info=instance.chunks_info):
+                        # TODO: in case of remote workers, files should be deleted
+                        # example
+                        # for worker in workers:
+                        #    for chunk in json.loads(instance.chunks_info).keys():
+                        #        remove_media_file.delay(media_file=chunk)
+                        for chunk in json.loads(instance.chunks_info).keys():
+                            helpers.rm_file(chunk)
+                    instance.media.post_encode_actions(encoding=instance, action="add")
+
+    elif instance.chunk and instance.status == "fail":
+        encoding = Encoding(media=instance.media, profile=instance.profile, status="fail", progress=100)
+
+        chunks = Encoding.objects.filter(media=instance.media, chunks_info=instance.chunks_info, chunk=True).order_by("add_date")
+
+        chunks_paths = [f.media_file.path for f in chunks]
+
+        all_logs = "\n".join([st.logs for st in chunks])
+        encoding.logs = f"{chunks_paths}\n{all_logs}"
+        workers = list(set([st.worker for st in chunks]))
+        encoding.worker = json.dumps({"workers": workers})
+        start_date = min([st.add_date for st in chunks])
+        end_date = max([st.update_date for st in chunks])
+        encoding.total_run_time = (end_date - start_date).seconds
+        encoding.save()
+
+        who = Encoding.objects.filter(media=encoding.media, profile=encoding.profile).exclude(id=encoding.id)
+
+        who.delete()
+        # TODO: merge with above if, do not repeat code
+    else:
+        if instance.status in ["fail", "success"]:
+            instance.media.post_encode_actions(encoding=instance, action="add")
+
+        encodings = set([encoding.status for encoding in Encoding.objects.filter(media=instance.media)])
+        if ("running" in encodings) or ("pending" in encodings):
+            return
+
+
+@receiver(post_delete, sender=Encoding)
+def encoding_file_delete(sender, instance, **kwargs):
+    """
+    Deletes file from filesystem
+    when corresponding `Encoding` object is deleted.
+    """
+
+    if instance.media_file:
+        helpers.rm_file(instance.media_file.path)
+        if not instance.chunk:
+            instance.media.post_encode_actions(encoding=instance, action="delete")
+    # delete local chunks, and remote chunks + media file. Only when the
+    # last encoding of a media is complete

files/models/license.py

@@ -0,0 +1,11 @@
+from django.db import models
+
+
+class License(models.Model):
+    """A Base license model to be used in Media"""
+
+    title = models.CharField(max_length=100, unique=True)
+    description = models.TextField(blank=True)
+
+    def __str__(self):
+        return self.title

files/models/page.py

@@ -0,0 +1,42 @@
+from django.db import models
+from django.urls import reverse
+
+
+class Page(models.Model):
+    slug = models.SlugField(max_length=200, unique=True)
+    title = models.CharField(max_length=200)
+    description = models.TextField(blank=True)
+    add_date = models.DateTimeField(auto_now_add=True)
+    edit_date = models.DateTimeField(auto_now=True)
+
+    def __str__(self):
+        return self.title
+
+    def get_absolute_url(self):
+        return reverse("get_page", args=[str(self.slug)])
+
+
+class TinyMCEMedia(models.Model):
+    file = models.FileField(upload_to='tinymce_media/')
+    uploaded_at = models.DateTimeField(auto_now_add=True)
+    file_type = models.CharField(
+        max_length=10,
+        choices=(
+            ('image', 'Image'),
+            ('media', 'Media'),
+        ),
+    )
+    original_filename = models.CharField(max_length=255)
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE, null=True, blank=True)
+
+    class Meta:
+        verbose_name = 'TinyMCE Media'
+        verbose_name_plural = 'TinyMCE Media'
+        ordering = ['-uploaded_at']
+
+    def __str__(self):
+        return f"{self.original_filename} ({self.file_type})"
+
+    @property
+    def url(self):
+        return self.file.url

files/models/playlist.py

@@ -0,0 +1,97 @@
+import uuid
+
+from django.db import models
+from django.urls import reverse
+from django.utils.html import strip_tags
+
+from .. import helpers
+
+
+class Playlist(models.Model):
+    """Playlists model"""
+
+    add_date = models.DateTimeField(auto_now_add=True, db_index=True)
+
+    description = models.TextField(blank=True, help_text="description")
+
+    friendly_token = models.CharField(blank=True, max_length=12, db_index=True)
+
+    media = models.ManyToManyField("Media", through="playlistmedia", blank=True)
+
+    title = models.CharField(max_length=100, db_index=True)
+
+    uid = models.UUIDField(unique=True, default=uuid.uuid4)
+
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE, db_index=True, related_name="playlists")
+
+    def __str__(self):
+        return self.title
+
+    @property
+    def media_count(self):
+        return self.media.filter(listable=True).count()
+
+    def get_absolute_url(self, api=False):
+        if api:
+            return reverse("api_get_playlist", kwargs={"friendly_token": self.friendly_token})
+        else:
+            return reverse("get_playlist", kwargs={"friendly_token": self.friendly_token})
+
+    @property
+    def url(self):
+        return self.get_absolute_url()
+
+    @property
+    def api_url(self):
+        return self.get_absolute_url(api=True)
+
+    def user_thumbnail_url(self):
+        if self.user.logo:
+            return helpers.url_from_path(self.user.logo.path)
+        return None
+
+    def set_ordering(self, media, ordering):
+        if media not in self.media.all():
+            return False
+        pm = PlaylistMedia.objects.filter(playlist=self, media=media).first()
+        if pm and isinstance(ordering, int) and 0 < ordering:
+            pm.ordering = ordering
+            pm.save()
+            return True
+        return False
+
+    def save(self, *args, **kwargs):
+        strip_text_items = ["title", "description"]
+        for item in strip_text_items:
+            setattr(self, item, strip_tags(getattr(self, item, None)))
+        self.title = self.title[:100]
+
+        if not self.friendly_token:
+            while True:
+                friendly_token = helpers.produce_friendly_token()
+                if not Playlist.objects.filter(friendly_token=friendly_token):
+                    self.friendly_token = friendly_token
+                    break
+        super(Playlist, self).save(*args, **kwargs)
+
+    @property
+    def thumbnail_url(self):
+        pm = self.playlistmedia_set.filter(media__listable=True).first()
+        if pm and pm.media.thumbnail:
+            return helpers.url_from_path(pm.media.thumbnail.path)
+        return None
+
+
+class PlaylistMedia(models.Model):
+    """Helper model to store playlist specific media"""
+
+    action_date = models.DateTimeField(auto_now=True)
+
+    media = models.ForeignKey("Media", on_delete=models.CASCADE)
+
+    playlist = models.ForeignKey(Playlist, on_delete=models.CASCADE)
+
+    ordering = models.IntegerField(default=1)
+
+    class Meta:
+        ordering = ["ordering", "-action_date"]

files/models/rating.py

@@ -0,0 +1,47 @@
+from django.db import models
+
+from .utils import validate_rating
+
+
+class RatingCategory(models.Model):
+    """Rating Category
+    Facilitate user ratings.
+    One or more rating categories per Category can exist
+    will be shown to the media if they are enabled
+    """
+
+    description = models.TextField(blank=True)
+
+    enabled = models.BooleanField(default=True)
+
+    title = models.CharField(max_length=200, unique=True, db_index=True)
+
+    class Meta:
+        verbose_name_plural = "Rating Categories"
+
+    def __str__(self):
+        return f"{self.title}"
+
+
+class Rating(models.Model):
+    """User Rating"""
+
+    add_date = models.DateTimeField(auto_now_add=True)
+
+    media = models.ForeignKey("Media", on_delete=models.CASCADE, related_name="ratings")
+
+    rating_category = models.ForeignKey(RatingCategory, on_delete=models.CASCADE)
+
+    score = models.IntegerField(validators=[validate_rating])
+
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE)
+
+    class Meta:
+        verbose_name_plural = "Ratings"
+        indexes = [
+            models.Index(fields=["user", "media"]),
+        ]
+        unique_together = ("user", "media", "rating_category")
+
+    def __str__(self):
+        return f"{self.user.username}, rate for {self.media.title} for category {self.rating_category.title}"

files/models/subtitle.py

@@ -0,0 +1,84 @@
+import os
+import tempfile
+
+from django.conf import settings
+from django.db import models
+from django.urls import reverse
+
+from .. import helpers
+from .utils import MEDIA_ENCODING_STATUS, subtitles_file_path
+
+
+class Language(models.Model):
+    """Language model
+    to be used with Subtitles
+    """
+
+    code = models.CharField(max_length=30, help_text="language code")
+
+    title = models.CharField(max_length=100, help_text="language code")
+
+    class Meta:
+        ordering = ["id"]
+
+    def __str__(self):
+        return f"{self.code}-{self.title}"
+
+
+class Subtitle(models.Model):
+    """Subtitles model"""
+
+    language = models.ForeignKey(Language, on_delete=models.CASCADE)
+
+    media = models.ForeignKey("Media", on_delete=models.CASCADE, related_name="subtitles")
+
+    subtitle_file = models.FileField(
+        "Subtitle/CC file",
+        help_text="File has to be WebVTT format",
+        upload_to=subtitles_file_path,
+        max_length=500,
+    )
+
+    user = models.ForeignKey("users.User", on_delete=models.CASCADE)
+
+    class Meta:
+        ordering = ["language__title"]
+
+    def __str__(self):
+        return f"{self.media.title}-{self.language.title}"
+
+    def get_absolute_url(self):
+        return f"{reverse('edit_subtitle')}?id={self.id}"
+
+    @property
+    def url(self):
+        return self.get_absolute_url()
+
+    def convert_to_srt(self):
+        input_path = self.subtitle_file.path
+        with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as tmpdirname:
+            pysub = settings.PYSUBS_COMMAND
+
+            cmd = [pysub, input_path, "--to", "vtt", "-o", tmpdirname]
+            stdout = helpers.run_command(cmd)
+
+            list_of_files = os.listdir(tmpdirname)
+            if list_of_files:
+                subtitles_file = os.path.join(tmpdirname, list_of_files[0])
+                cmd = ["cp", subtitles_file, input_path]
+                stdout = helpers.run_command(cmd)  # noqa
+            else:
+                raise Exception("Could not convert to srt")
+        return True
+
+
+class TranscriptionRequest(models.Model):
+    # Whisper transcription request
+    media = models.ForeignKey("Media", on_delete=models.CASCADE, related_name="transcriptionrequests")
+    add_date = models.DateTimeField(auto_now_add=True)
+    status = models.CharField(max_length=20, choices=MEDIA_ENCODING_STATUS, default="pending", db_index=True)
+    translate_to_english = models.BooleanField(default=False)
+    logs = models.TextField(blank=True, null=True)
+
+    def __str__(self):
+        return f"Transcription request for {self.media.title} - {self.status}"

files/models/utils.py

@@ -0,0 +1,99 @@
+from django.conf import settings
+from django.core.exceptions import ValidationError
+from django.utils.crypto import get_random_string
+
+from .. import helpers
+
+# this is used by Media and Encoding models
+# reflects media encoding status for objects
+MEDIA_ENCODING_STATUS = (
+    ("pending", "Pending"),
+    ("running", "Running"),
+    ("fail", "Fail"),
+    ("success", "Success"),
+)
+
+# the media state of a Media object
+# this is set by default according to the portal workflow
+MEDIA_STATES = (
+    ("private", "Private"),
+    ("public", "Public"),
+    ("unlisted", "Unlisted"),
+)
+
+# each uploaded Media gets a media_type hint
+# by helpers.get_file_type
+
+MEDIA_TYPES_SUPPORTED = (
+    ("video", "Video"),
+    ("image", "Image"),
+    ("pdf", "Pdf"),
+    ("audio", "Audio"),
+)
+
+ENCODE_EXTENSIONS = (
+    ("mp4", "mp4"),
+    ("webm", "webm"),
+    ("gif", "gif"),
+)
+
+ENCODE_RESOLUTIONS = (
+    (2160, "2160"),
+    (1440, "1440"),
+    (1080, "1080"),
+    (720, "720"),
+    (480, "480"),
+    (360, "360"),
+    (240, "240"),
+    (144, "144"),
+)
+
+CODECS = (
+    ("h265", "h265"),
+    ("h264", "h264"),
+    ("vp9", "vp9"),
+)
+
+ENCODE_EXTENSIONS_KEYS = [extension for extension, name in ENCODE_EXTENSIONS]
+ENCODE_RESOLUTIONS_KEYS = [resolution for resolution, name in ENCODE_RESOLUTIONS]
+
+
+def generate_uid():
+    return get_random_string(length=16)
+
+
+def original_media_file_path(instance, filename):
+    """Helper function to place original media file"""
+    file_name = f"{instance.uid.hex}.{helpers.get_file_name(filename)}"
+    return settings.MEDIA_UPLOAD_DIR + f"user/{instance.user.username}/{file_name}"
+
+
+def encoding_media_file_path(instance, filename):
+    """Helper function to place encoded media file"""
+
+    file_name = f"{instance.media.uid.hex}.{helpers.get_file_name(filename)}"
+    return settings.MEDIA_ENCODING_DIR + f"{instance.profile.id}/{instance.media.user.username}/{file_name}"
+
+
+def original_thumbnail_file_path(instance, filename):
+    """Helper function to place original media thumbnail file"""
+
+    return settings.THUMBNAIL_UPLOAD_DIR + f"user/{instance.user.username}/{filename}"
+
+
+def subtitles_file_path(instance, filename):
+    """Helper function to place subtitle file"""
+
+    return settings.SUBTITLES_UPLOAD_DIR + f"user/{instance.media.user.username}/{filename}"
+
+
+def category_thumb_path(instance, filename):
+    """Helper function to place category thumbnail file"""
+
+    file_name = f"{instance.uid}.{helpers.get_file_name(filename)}"
+    return settings.MEDIA_UPLOAD_DIR + f"categories/{file_name}"
+
+
+def validate_rating(value):
+    if -1 >= value or value > 5:
+        raise ValidationError("score has to be between 0 and 5")

files/models/video_data.py

@@ -0,0 +1,65 @@
+from django.db import models
+from django.db.models.signals import post_delete
+from django.dispatch import receiver
+
+from .. import helpers
+
+
+class VideoChapterData(models.Model):
+    data = models.JSONField(null=False, blank=False, help_text="Chapter data")
+    media = models.ForeignKey('Media', on_delete=models.CASCADE, related_name='chapters')
+
+    class Meta:
+        unique_together = ['media']
+
+    @property
+    def chapter_data(self):
+        # ensure response is consistent
+        data = []
+        if self.data and isinstance(self.data, list):
+            for item in self.data:
+                if item.get("startTime") and item.get("endTime") and item.get("chapterTitle"):
+                    chapter_item = {
+                        'startTime': item.get("startTime"),
+                        'endTime': item.get("endTime"),
+                        'chapterTitle': item.get("chapterTitle"),
+                    }
+                    data.append(chapter_item)
+        return data
+
+
+class VideoTrimRequest(models.Model):
+    """Model to handle video trimming requests"""
+
+    VIDEO_TRIM_STATUS = (
+        ("initial", "Initial"),
+        ("running", "Running"),
+        ("success", "Success"),
+        ("fail", "Fail"),
+    )
+
+    VIDEO_ACTION_CHOICES = (
+        ("replace", "Replace Original"),
+        ("save_new", "Save as New"),
+        ("create_segments", "Create Segments"),
+    )
+
+    TRIM_STYLE_CHOICES = (
+        ("no_encoding", "No Encoding"),
+        ("precise", "Precise"),
+    )
+
+    media = models.ForeignKey('Media', on_delete=models.CASCADE, related_name='trim_requests')
+    status = models.CharField(max_length=20, choices=VIDEO_TRIM_STATUS, default="initial")
+    add_date = models.DateTimeField(auto_now_add=True)
+    video_action = models.CharField(max_length=20, choices=VIDEO_ACTION_CHOICES)
+    media_trim_style = models.CharField(max_length=20, choices=TRIM_STYLE_CHOICES, default="no_encoding")
+    timestamps = models.JSONField(null=False, blank=False, help_text="Timestamps for trimming")
+
+    def __str__(self):
+        return f"Trim request for {self.media.title} ({self.status})"
+
+
+@receiver(post_delete, sender=VideoChapterData)
+def videochapterdata_delete(sender, instance, **kwargs):
+    helpers.rm_dir(instance.media.video_chapters_folder)

files/serializers.py

@@ -1,5 +1,7 @@
+from django.conf import settings
 from rest_framework import serializers
 
+from .methods import is_mediacms_editor
 from .models import Category, Comment, EncodeProfile, Media, Playlist, Tag
 
 # TODO: put them in a more DRY way
@@ -76,8 +78,25 @@ class MediaSerializer(serializers.ModelSerializer):
             "featured",
             "user_featured",
             "size",
+            # "category",
         )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        request = self.context.get('request')
+
+        if False and request and 'category' in self.fields:
+            # this is not working
+            user = request.user
+            if is_mediacms_editor(user):
+                pass
+            else:
+                if getattr(settings, 'USE_RBAC', False):
+                    # Filter category queryset based on user permissions
+                    non_rbac_categories = Category.objects.filter(is_rbac_category=False)
+                    rbac_categories = user.get_rbac_categories_as_contributor()
+                    self.fields['category'].queryset = non_rbac_categories.union(rbac_categories)
+
 
 class SingleMediaSerializer(serializers.ModelSerializer):
     user = serializers.ReadOnlyField(source="user.username")
@@ -142,6 +161,7 @@ class SingleMediaSerializer(serializers.ModelSerializer):
             "hls_info",
             "license",
             "subtitles_info",
+            "chapter_data",
             "ratings_info",
             "add_subtitle_url",
             "allow_download",

files/tasks.py

@@ -2,13 +2,11 @@ import json
 import os
 import re
 import shutil
-import subprocess
 import tempfile
 from datetime import datetime, timedelta
 
 from celery import Task
 from celery import shared_task as task
-from celery.exceptions import SoftTimeLimitExceeded
 from celery.signals import task_revoked
 
 # from celery.task.control import revoke
@@ -16,6 +14,7 @@ from celery.utils.log import get_task_logger
 from django.conf import settings
 from django.core.cache import cache
 from django.core.files import File
+from django.db import DatabaseError
 from django.db.models import Q
 
 from actions.models import USER_MEDIA_ACTIONS, MediaAction
@@ -28,14 +27,33 @@ from .helpers import (
     create_temp_file,
     get_file_name,
     get_file_type,
+    get_trim_timestamps,
     media_file_info,
     produce_ffmpeg_commands,
     produce_friendly_token,
     rm_file,
     run_command,
+    trim_video_method,
+)
+from .methods import (
+    copy_video,
+    kill_ffmpeg_process,
+    list_tasks,
+    notify_users,
+    pre_save_action,
+)
+from .models import (
+    Category,
+    EncodeProfile,
+    Encoding,
+    Language,
+    Media,
+    Rating,
+    Subtitle,
+    Tag,
+    TranscriptionRequest,
+    VideoTrimRequest,
 )
-from .methods import list_tasks, notify_users, pre_save_action
-from .models import Category, EncodeProfile, Encoding, Media, Rating, Tag
 
 logger = get_task_logger(__name__)
 
@@ -48,6 +66,69 @@ ERRORS_LIST = [
 ]
 
 
+def handle_pending_running_encodings(media):
+    """Handle pending and running encodings for a media object.
+
+    we are trimming the original file. If there are encodings in success state, this means that the encoding has run
+    and has succeeded, so we can keep them (they will be trimmed) or if we dont keep them we dont have to delete them
+    here
+
+    However for encodings that are in pending or running phase, just delete them
+
+    Args:
+        media: The media object to handle encodings for
+
+    Returns:
+        bool: True if any encodings were deleted, False otherwise
+    """
+    encodings = media.encodings.exclude(status="success")
+    deleted = False
+    for encoding in encodings:
+        if encoding.temp_file:
+            kill_ffmpeg_process(encoding.temp_file)
+        if encoding.chunk_file_path:
+            kill_ffmpeg_process(encoding.chunk_file_path)
+        deleted = True
+        encoding.delete()
+
+    return deleted
+
+
+def pre_trim_video_actions(media):
+    # the reason for this function is to perform tasks before trimming a video
+
+    # avoid re-running unnecessary encodings (or chunkize_media, which is the first step for them)
+    # if the video is already completed
+    # however if it is a new video (user uploded the video and starts trimming
+    # before the video is processed), this is necessary, so encode has to be called to give it a chance to encode
+
+    # if a video is fully processed (all encodings are success), or if a video is new, then things are clear
+
+    # HOWEVER there is a race condition and this is that some encodings are success and some are pending/running
+    # Since we are making speed cutting, we will perform an ffmpeg -c copy on all of them and the result will be
+    # that they will end up differently cut, because ffmpeg checks for I-frames
+    # The result is fine if playing the video but is bad in case of HLS
+    # So we need to delete all encodings inevitably to produce same results, if there are some that are success and some that
+    # are still not finished.
+
+    profiles = EncodeProfile.objects.filter(active=True, extension='mp4', resolution__lte=media.video_height)
+    media_encodings = EncodeProfile.objects.filter(encoding__in=media.encodings.filter(status="success", chunk=False), extension='mp4').distinct()
+
+    picked = []
+    for profile in profiles:
+        if profile in media_encodings:
+            continue
+        else:
+            picked.append(profile)
+
+    if picked:
+        # by calling encode will re-encode all. The logic is explained above...
+        logger.info(f"Encoding media {media.friendly_token} will have to be performed for all profiles")
+        media.encode()
+
+    return True
+
+
 @task(name="chunkize_media", bind=True, queue="short_tasks", soft_time_limit=60 * 30 * 4)
 def chunkize_media(self, friendly_token, profiles, force=True):
     """Break media in chunks and start encoding tasks"""
@@ -57,8 +138,8 @@ def chunkize_media(self, friendly_token, profiles, force=True):
     cwd = os.path.dirname(os.path.realpath(media.media_file.path))
     file_name = media.media_file.path.split("/")[-1]
     random_prefix = produce_friendly_token()
-    file_format = "{0}_{1}".format(random_prefix, file_name)
+    file_format = f"{random_prefix}_{file_name}"
-    chunks_file_name = "%02d_{0}".format(file_format)
+    chunks_file_name = f"%02d_{file_format}"
     chunks_file_name += ".mkv"
     cmd = [
         settings.FFMPEG_COMMAND,
@@ -83,7 +164,7 @@ def chunkize_media(self, friendly_token, profiles, force=True):
                 chunks.append(ch[0])
     if not chunks:
         # command completely failed to segment file.putting to normal encode
-        logger.info("Failed to break file {0} in chunks." " Putting to normal encode queue".format(friendly_token))
+        logger.info(f"Failed to break file {friendly_token} in chunks. Putting to normal encode queue")
         for profile in profiles:
             if media.video_height and media.video_height < profile.resolution:
                 if profile.resolution not in settings.MINIMUM_RESOLUTIONS_TO_ENCODE:
@@ -132,7 +213,7 @@ def chunkize_media(self, friendly_token, profiles, force=True):
                 priority=priority,
             )
 
-    logger.info("got {0} chunks and will encode to {1} profiles".format(len(chunks), to_profiles))
+    logger.info(f"got {len(chunks)} chunks and will encode to {to_profiles} profiles")
     return True
 
 
@@ -145,6 +226,7 @@ class EncodingTask(Task):
                 self.encoding.status = "fail"
                 self.encoding.save(update_fields=["status"])
                 kill_ffmpeg_process(self.encoding.temp_file)
+                kill_ffmpeg_process(self.encoding.chunk_file_path)
                 if hasattr(self.encoding, "media"):
                     self.encoding.media.post_encode_actions()
         except BaseException:
@@ -171,7 +253,13 @@ def encode_media(
 ):
     """Encode a media to given profile, using ffmpeg, storing progress"""
 
-    logger.info("Encode Media started, friendly token {0}, profile id {1}, force {2}".format(friendly_token, profile_id, force))
+    logger.info(f"encode_media for {friendly_token}/{profile_id}/{encoding_id}/{force}/{chunk}")
+    # TODO: this is new behavior, check whether it performs well. Before that check it would end up saving the Encoding
+    # at some point below. Now it exits the task. Could it be that before it would give it a chance to re-run? Or it was
+    # not being used at all?
+    if not Encoding.objects.filter(id=encoding_id).exists():
+        logger.info(f"Exiting for {friendly_token}/{profile_id}/{encoding_id}/{force} since encoding id not found")
+        return False
 
     if self.request.id:
         task_id = self.request.id
@@ -269,8 +357,8 @@ def encode_media(
     #    return False
 
     with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as temp_dir:
-        tf = create_temp_file(suffix=".{0}".format(profile.extension), dir=temp_dir)
+        tf = create_temp_file(suffix=f".{profile.extension}", dir=temp_dir)
-        tfpass = create_temp_file(suffix=".{0}".format(profile.extension), dir=temp_dir)
+        tfpass = create_temp_file(suffix=f".{profile.extension}", dir=temp_dir)
         ffmpeg_commands = produce_ffmpeg_commands(
             original_media_path,
             media.media_info,
@@ -311,28 +399,37 @@ def encode_media(
                             percent = duration * 100 / media.duration
                             if n_times % 60 == 0:
                                 encoding.progress = percent
-                                try:
                                 encoding.save(update_fields=["progress", "update_date"])
-                                    logger.info("Saved {0}".format(round(percent, 2)))
+                                logger.info(f"Saved {round(percent, 2)}")
-                                except BaseException:
-                                    pass
                             n_times += 1
+                    except DatabaseError:
+                        # primary reason for this is that the encoding has been deleted, because
+                        # the media file was deleted, or also that there was a trim video request
+                        # so it would be redundant to let it complete the encoding
+                        kill_ffmpeg_process(encoding.temp_file)
+                        kill_ffmpeg_process(encoding.chunk_file_path)
+                        return False
+
                     except StopIteration:
                         break
                     except VideoEncodingError:
                         # ffmpeg error, or ffmpeg was killed
                         raise
+
             except Exception as e:
                 try:
                     # output is empty, fail message is on the exception
                     output = e.message
                 except AttributeError:
                     output = ""
-                if isinstance(e, SoftTimeLimitExceeded):
                 kill_ffmpeg_process(encoding.temp_file)
+                kill_ffmpeg_process(encoding.chunk_file_path)
                 encoding.logs = output
                 encoding.status = "fail"
+                try:
                     encoding.save(update_fields=["status", "logs"])
+                except DatabaseError:
+                    return False
                 raise_exception = True
                 # if this is an ffmpeg's valid error
                 # no need for the task to be re-run
@@ -356,7 +453,7 @@ def encode_media(
 
                 with open(tf, "rb") as f:
                     myfile = File(f)
-                    output_name = "{0}.{1}".format(get_file_name(original_media_path), profile.extension)
+                    output_name = f"{get_file_name(original_media_path)}.{profile.extension}"
                     encoding.media_file.save(content=myfile, name=output_name)
                 encoding.total_run_time = (encoding.update_date - encoding.add_date).seconds
 
@@ -370,6 +467,67 @@ def encode_media(
         return success
 
 
+@task(name="whisper_transcribe", queue="long_tasks", soft_time_limit=60 * 60 * 2)
+def whisper_transcribe(friendly_token, translate_to_english=False):
+    try:
+        media = Media.objects.get(friendly_token=friendly_token)
+    except:  # noqa
+        logger.info(f"failed to get media {friendly_token}")
+        return False
+
+    request = TranscriptionRequest.objects.filter(media=media, status="pending", translate_to_english=translate_to_english).first()
+    if not request:
+        logger.info(f"No pending transcription request for media {friendly_token}")
+        return False
+
+    if translate_to_english:
+        language = Language.objects.filter(code="whisper-translation").first()
+        if not language:
+            language = Language.objects.create(code="whisper-translation", title="English Translation")
+    else:
+        language = Language.objects.filter(code="whisper").first()
+        if not language:
+            language = Language.objects.create(code="whisper", title="Transcription")
+
+    cwd = os.path.dirname(os.path.realpath(media.media_file.path))
+    request.status = "running"
+    request.save(update_fields=["status"])
+
+    with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as tmpdirname:
+        video_file_path = get_file_name(media.media_file.name)
+        video_file_path = '.'.join(video_file_path.split('.')[:-1])  # needed by whisper without the extension
+        subtitle_name = f"{video_file_path}.vtt"
+        output_name = f"{tmpdirname}/{subtitle_name}"
+
+        cmd = f"whisper /home/mediacms.io/mediacms/media_files/{media.media_file.name} --model {settings.WHISPER_MODEL} --output_dir {tmpdirname}"
+        if translate_to_english:
+            cmd += " --task translate"
+
+        logger.info(f"Whisper transcribe: ready to run command {cmd}")
+
+        start_time = datetime.now()
+        ret = run_command(cmd, cwd=cwd)  # noqa
+        end_time = datetime.now()
+        duration = (end_time - start_time).total_seconds()
+
+        if os.path.exists(output_name):
+            subtitle = Subtitle.objects.create(media=media, user=media.user, language=language)
+
+            with open(output_name, 'rb') as f:
+                subtitle.subtitle_file.save(subtitle_name, File(f))
+
+            request.status = "success"
+            request.logs = f"Transcription took {duration:.2f} seconds."  # noqa
+            request.save(update_fields=["status", "logs"])
+            return True
+
+        request.status = "fail"
+        request.logs = f"Transcription failed after {duration:.2f} seconds. Error: {ret.get('error')}"  # noqa
+        request.save(update_fields=["status", "logs"])
+
+        return False
+
+
 @task(name="produce_sprite_from_video", queue="long_tasks")
 def produce_sprite_from_video(friendly_token):
     """Produces a sprites file for a video, uses ffmpeg"""
@@ -377,7 +535,7 @@ def produce_sprite_from_video(friendly_token):
     try:
         media = Media.objects.get(friendly_token=friendly_token)
     except BaseException:
-        logger.info("failed to get media with friendly_token %s" % friendly_token)
+        logger.info(f"failed to get media with friendly_token {friendly_token}")
         return False
 
     with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as tmpdirname:
@@ -397,10 +555,10 @@ def produce_sprite_from_video(friendly_token):
             if os.path.exists(output_name) and get_file_type(output_name) == "image":
                 with open(output_name, "rb") as f:
                     myfile = File(f)
-                    media.sprites.save(
+                    # SOS: avoid race condition, since this runs for a long time and will replace any other media changes on the meanwhile!!!
-                        content=myfile,
+                    media.sprites.save(content=myfile, name=get_file_name(media.media_file.path) + "sprites.jpg", save=False)
-                        name=get_file_name(media.media_file.path) + "sprites.jpg",
+                    media.save(update_fields=["sprites"])
-                    )
+
         except Exception as e:
             print(e)
     return True
@@ -421,7 +579,7 @@ def create_hls(friendly_token):
     try:
         media = Media.objects.get(friendly_token=friendly_token)
     except BaseException:
-        logger.info("failed to get media with friendly_token %s" % friendly_token)
+        logger.info(f"failed to get media with friendly_token {friendly_token}")
         return False
 
     p = media.uid.hex
@@ -452,8 +610,7 @@ def create_hls(friendly_token):
         pp = os.path.join(output_dir, "master.m3u8")
         if os.path.exists(pp):
             if media.hls_file != pp:
-                media.hls_file = pp
+                Media.objects.filter(pk=media.pk).update(hls_file=pp)
-                media.save(update_fields=["hls_file"])
     return True
 
 
@@ -464,7 +621,7 @@ def check_running_states():
 
     encodings = Encoding.objects.filter(status="running")
 
-    logger.info("got {0} encodings that are in state running".format(encodings.count()))
+    logger.info(f"got {encodings.count()} encodings that are in state running")
     changed = 0
     for encoding in encodings:
         now = datetime.now(encoding.update_date.tzinfo)
@@ -481,7 +638,7 @@ def check_running_states():
             # TODO: allign with new code + chunksize...
             changed += 1
     if changed:
-        logger.info("changed from running to pending on {0} items".format(changed))
+        logger.info(f"changed from running to pending on {changed} items")
     return True
 
 
@@ -491,7 +648,7 @@ def check_media_states():
     # check encoding status of not success media
     media = Media.objects.filter(Q(encoding_status="running") | Q(encoding_status="fail") | Q(encoding_status="pending"))
 
-    logger.info("got {0} media that are not in state success".format(media.count()))
+    logger.info(f"got {media.count()} media that are not in state success")
 
     changed = 0
     for m in media:
@@ -499,7 +656,7 @@ def check_media_states():
         m.save(update_fields=["encoding_status"])
         changed += 1
     if changed:
-        logger.info("changed encoding status to {0} media items".format(changed))
+        logger.info(f"changed encoding status to {changed} media items")
     return True
 
 
@@ -534,7 +691,7 @@ def check_pending_states():
             media.encode(profiles=[profile], force=False)
             changed += 1
     if changed:
-        logger.info("set to the encode queue {0} encodings that were on pending state".format(changed))
+        logger.info(f"set to the encode queue {changed} encodings that were on pending state")
     return True
 
 
@@ -558,7 +715,7 @@ def check_missing_profiles():
             # if they appear on the meanwhile (eg on a big queue)
             changed += 1
     if changed:
-        logger.info("set to the encode queue {0} profiles".format(changed))
+        logger.info(f"set to the encode queue {changed} profiles")
     return True
 
 
@@ -726,7 +883,7 @@ def update_listings_thumbnails():
     # Categories
     used_media = []
     saved = 0
-    qs = Category.objects.filter().order_by("-media_count")
+    qs = Category.objects.filter()
     for object in qs:
         media = Media.objects.exclude(friendly_token__in=used_media).filter(category=object, state="public", is_reviewed=True).order_by("-views").first()
         if media:
@@ -734,12 +891,12 @@ def update_listings_thumbnails():
             object.save(update_fields=["listings_thumbnail"])
             used_media.append(media.friendly_token)
             saved += 1
-    logger.info("updated {} categories".format(saved))
+    logger.info(f"updated {saved} categories")
 
     # Tags
     used_media = []
     saved = 0
-    qs = Tag.objects.filter().order_by("-media_count")
+    qs = Tag.objects.filter()
     for object in qs:
         media = Media.objects.exclude(friendly_token__in=used_media).filter(tags=object, state="public", is_reviewed=True).order_by("-views").first()
         if media:
@@ -747,7 +904,7 @@ def update_listings_thumbnails():
             object.save(update_fields=["listings_thumbnail"])
             used_media.append(media.friendly_token)
             saved += 1
-    logger.info("updated {} tags".format(saved))
+    logger.info(f"updated {saved} tags")
 
     return True
 
@@ -776,23 +933,150 @@ def task_sent_handler(sender=None, headers=None, body=None, **kwargs):
     return True
 
 
-def kill_ffmpeg_process(filepath):
-    # this is not ideal, ffmpeg pid could be linked to the Encoding object
-    cmd = "ps aux|grep 'ffmpeg'|grep %s|grep -v grep |awk '{print $2}'" % filepath
-    result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
-    pid = result.stdout.decode("utf-8").strip()
-    if pid:
-        cmd = "kill -9 %s" % pid
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
-    return result
-
-
 @task(name="remove_media_file", base=Task, queue="long_tasks")
 def remove_media_file(media_file=None):
     rm_file(media_file)
     return True
 
 
+@task(name="update_encoding_size", queue="short_tasks")
+def update_encoding_size(encoding_id):
+    """Update the size of an encoding without saving to avoid calling signals"""
+    encoding = Encoding.objects.filter(id=encoding_id).first()
+    if encoding:
+        encoding.update_size_without_save()
+        return True
+    return False
+
+
+@task(name="post_trim_action", queue="short_tasks", soft_time_limit=600)
+def post_trim_action(friendly_token):
+    """Perform post-processing actions after video trimming
+
+    Args:
+        friendly_token: The friendly token of the media
+
+    Returns:
+        bool: True if successful, False otherwise
+    """
+    logger.info(f"Post trim action for {friendly_token}")
+    try:
+        media = Media.objects.get(friendly_token=friendly_token)
+    except Media.DoesNotExist:
+        logger.info(f"Media with friendly token {friendly_token} not found")
+        return False
+
+    media.set_media_type()
+    encodings = media.encodings.filter(status="success", profile__extension='mp4', chunk=False)
+    # if they are still not encoded, when the first one will be encoded, it will have the chance to
+    # call post_trim_action again
+    if encodings:
+        for encoding in encodings:
+            # update encoding size, in case they don't have one, due to the
+            # way the copy_video took place
+            update_encoding_size(encoding.id)
+
+        media.produce_thumbnails_from_video()
+        produce_sprite_from_video.delay(friendly_token)
+        create_hls.delay(friendly_token)
+
+        vt_request = VideoTrimRequest.objects.filter(media=media, status="running").first()
+        if vt_request:
+            vt_request.status = "success"
+            vt_request.save(update_fields=["status"])
+
+    return True
+
+
+@task(name="video_trim_task", bind=True, queue="short_tasks", soft_time_limit=600)
+def video_trim_task(self, trim_request_id):
+    # SOS: if at some point we move from ffmpeg copy, then this need be changed
+    # to long_tasks
+    try:
+        trim_request = VideoTrimRequest.objects.get(id=trim_request_id)
+    except VideoTrimRequest.DoesNotExist:
+        logger.info(f"VideoTrimRequest with ID {trim_request_id} not found")
+        return False
+
+    trim_request.status = "running"
+    trim_request.save(update_fields=["status"])
+
+    timestamps_encodings = get_trim_timestamps(trim_request.media.trim_video_path, trim_request.timestamps)
+    timestamps_original = get_trim_timestamps(trim_request.media.media_file.path, trim_request.timestamps)
+
+    if not timestamps_encodings:
+        trim_request.status = "fail"
+        trim_request.save(update_fields=["status"])
+        return False
+
+    target_media = trim_request.media
+    original_media = trim_request.media
+
+    # splitting the logic for single file and multiple files
+    if trim_request.video_action in ["save_new", "replace"]:
+        proceed_with_single_file = True
+    if trim_request.video_action == "create_segments":
+        if len(timestamps_encodings) == 1:
+            proceed_with_single_file = True
+        else:
+            proceed_with_single_file = False
+
+    if proceed_with_single_file:
+        if trim_request.video_action == "save_new" or trim_request.video_action == "create_segments" and len(timestamps_encodings) == 1:
+            new_media = copy_video(original_media, copy_encodings=True)
+
+            target_media = new_media
+            trim_request.media = new_media
+            trim_request.save(update_fields=["media"])
+
+        # processing timestamps differently on encodings and original file, in case we do accuracy trimming (currently not)
+        # these have different I-frames and the cut is made based on the I-frames
+
+        original_trim_result = trim_video_method(target_media.media_file.path, timestamps_original)
+        if not original_trim_result:
+            logger.info(f"Failed to trim original file for media {target_media.friendly_token}")
+
+        deleted_encodings = handle_pending_running_encodings(target_media)
+        # the following could be un-necessary, read commend in pre_trim_video_actions to see why
+        encodings = target_media.encodings.filter(status="success", profile__extension='mp4', chunk=False)
+        for encoding in encodings:
+            trim_result = trim_video_method(encoding.media_file.path, timestamps_encodings)
+            if not trim_result:
+                logger.info(f"Failed to trim encoding {encoding.id} for media {target_media.friendly_token}")
+                encoding.delete()
+
+        pre_trim_video_actions(target_media)
+        post_trim_action.delay(target_media.friendly_token)
+
+    else:
+        for i, timestamp in enumerate(timestamps_encodings, start=1):
+            # copy the original file for each of the segments. This could be optimized to avoid the overhead but
+            # for now is necessary because the ffmpeg trim command will be run towards the original
+            # file on different times.
+            target_media = copy_video(original_media, title_suffix=f"(Trimmed) {i}", copy_encodings=True)
+
+            video_trim_request = VideoTrimRequest.objects.create(media=target_media, status="running", video_action="create_segments", media_trim_style='no_encoding', timestamps=[timestamp])  # noqa
+
+            original_trim_result = trim_video_method(target_media.media_file.path, [timestamp])
+            deleted_encodings = handle_pending_running_encodings(target_media)  # noqa
+            # the following could be un-necessary, read commend in pre_trim_video_actions to see why
+            encodings = target_media.encodings.filter(status="success", profile__extension='mp4', chunk=False)
+            for encoding in encodings:
+                trim_result = trim_video_method(encoding.media_file.path, [timestamp])
+                if not trim_result:
+                    logger.info(f"Failed to trim encoding {encoding.id} for media {target_media.friendly_token}")
+                    encoding.delete()
+
+            pre_trim_video_actions(target_media)
+            post_trim_action.delay(target_media.friendly_token)
+
+        # set as completed the initial trim_request
+        trim_request.status = "success"
+        trim_request.save(update_fields=["status"])
+
+    return True
+
+
 # TODO LIST
 # 1 chunks are deleted from original server when file is fully encoded.
 # however need to enter this logic in cases of fail as well

files/tinymce_handlers.py

@@ -0,0 +1,20 @@
+from django.http import JsonResponse
+from django.views.decorators.csrf import csrf_exempt
+
+from .models import TinyMCEMedia
+
+
+@csrf_exempt
+def upload_image(request):
+    if not (request.user.is_authenticated and request.user.is_active and request.user.is_staff and request.user.is_superuser):
+        return JsonResponse({'error': 'Admin access required'}, status=403)
+
+    if request.method == "POST":
+        file_obj = request.FILES.get('file')
+        if file_obj:
+            # Create a new TinyMCEMedia instance for the image
+            media = TinyMCEMedia(file=file_obj, file_type='image', original_filename=file_obj.name, user=request.user if request.user.is_authenticated else None)
+            media.save()
+
+            return JsonResponse({'location': media.url})
+    return JsonResponse({'error': 'Invalid request'}, status=400)

files/urls.py

@@ -1,11 +1,14 @@
+from allauth.account.views import LoginView
 from django.conf import settings
 from django.conf.urls import include
 from django.conf.urls.static import static
 from django.urls import path, re_path
 
-from . import management_views, views
+from . import management_views, tinymce_handlers, views
 from .feeds import IndexRSSFeed, SearchRSSFeed
 
+friendly_token = r"(?P<friendly_token>[\w\-_]*)"
+
 urlpatterns = [
     path("i18n/", include("django.conf.urls.i18n")),
     re_path(r"^$", views.index),
@@ -15,6 +18,9 @@ urlpatterns = [
     re_path(r"^edit_subtitle", views.edit_subtitle, name="edit_subtitle"),
     re_path(r"^categories$", views.categories, name="categories"),
     re_path(r"^contact$", views.contact, name="contact"),
+    re_path(r"^publish", views.publish_media, name="publish_media"),
+    re_path(r"^edit_chapters", views.edit_chapters, name="edit_chapters"),
+    re_path(r"^edit_video", views.edit_video, name="edit_video"),
     re_path(r"^edit", views.edit_media, name="edit_media"),
     re_path(r"^embed", views.embed_media, name="get_embed"),
     re_path(r"^featured$", views.featured_media),
@@ -24,12 +30,12 @@ urlpatterns = [
     re_path(r"^latest$", views.latest_media),
     re_path(r"^members", views.members, name="members"),
     re_path(
-        r"^playlist/(?P<friendly_token>[\w]*)$",
+        rf"^playlist/{friendly_token}$",
         views.view_playlist,
         name="get_playlist",
     ),
     re_path(
-        r"^playlists/(?P<friendly_token>[\w]*)$",
+        rf"^playlists/{friendly_token}$",
         views.view_playlist,
         name="get_playlist",
     ),
@@ -37,6 +43,7 @@ urlpatterns = [
     re_path(r"^recommended$", views.recommended_media),
     path("rss/", IndexRSSFeed()),
     re_path("^rss/search", SearchRSSFeed()),
+    re_path(r"^record_screen", views.record_screen, name="record_screen"),
     re_path(r"^search", views.search, name="search"),
     re_path(r"^scpublisher", views.upload_media, name="upload_media"),
     re_path(r"^tags", views.tags, name="tags"),
@@ -44,10 +51,12 @@ urlpatterns = [
     re_path(r"^view", views.view_media, name="get_media"),
     re_path(r"^upload", views.upload_media, name="upload_media"),
     # API VIEWS
+    re_path(r"^api/v1/media/user/bulk_actions$", views.MediaBulkUserActions.as_view()),
+    re_path(r"^api/v1/media/user/bulk_actions/$", views.MediaBulkUserActions.as_view()),
     re_path(r"^api/v1/media$", views.MediaList.as_view()),
     re_path(r"^api/v1/media/$", views.MediaList.as_view()),
     re_path(
-        r"^api/v1/media/(?P<friendly_token>[\w]*)$",
+        rf"^api/v1/media/{friendly_token}$",
         views.MediaDetail.as_view(),
         name="api_get_media",
     ),
@@ -58,24 +67,32 @@ urlpatterns = [
     ),
     re_path(r"^api/v1/search$", views.MediaSearch.as_view()),
     re_path(
-        r"^api/v1/media/(?P<friendly_token>[\w]*)/actions$",
+        rf"^api/v1/media/{friendly_token}/actions$",
         views.MediaActions.as_view(),
     ),
+    re_path(
+        rf"^api/v1/media/{friendly_token}/chapters$",
+        views.video_chapters,
+    ),
+    re_path(
+        rf"^api/v1/media/{friendly_token}/trim_video$",
+        views.trim_video,
+    ),
     re_path(r"^api/v1/categories$", views.CategoryList.as_view()),
     re_path(r"^api/v1/tags$", views.TagList.as_view()),
     re_path(r"^api/v1/comments$", views.CommentList.as_view()),
     re_path(
-        r"^api/v1/media/(?P<friendly_token>[\w]*)/comments$",
+        rf"^api/v1/media/{friendly_token}/comments$",
         views.CommentDetail.as_view(),
     ),
     re_path(
-        r"^api/v1/media/(?P<friendly_token>[\w]*)/comments/(?P<uid>[\w-]*)$",
+        rf"^api/v1/media/{friendly_token}/comments/(?P<uid>[\w-]*)$",
         views.CommentDetail.as_view(),
     ),
     re_path(r"^api/v1/playlists$", views.PlaylistList.as_view()),
     re_path(r"^api/v1/playlists/$", views.PlaylistList.as_view()),
     re_path(
-        r"^api/v1/playlists/(?P<friendly_token>[\w]*)$",
+        rf"^api/v1/playlists/{friendly_token}$",
         views.PlaylistDetail.as_view(),
         name="api_get_playlist",
     ),
@@ -91,7 +108,23 @@ urlpatterns = [
     re_path(r"^manage/comments$", views.manage_comments, name="manage_comments"),
     re_path(r"^manage/media$", views.manage_media, name="manage_media"),
     re_path(r"^manage/users$", views.manage_users, name="manage_users"),
+    # Media uploads in ADMIN created pages
+    re_path(r"^tinymce/upload/", tinymce_handlers.upload_image, name="tinymce_upload_image"),
+    re_path("^(?P<slug>[\w.-]*)$", views.get_page, name="get_page"),  # noqa: W605
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
+
+if settings.USERS_NEEDS_TO_BE_APPROVED:
+    urlpatterns.append(re_path(r"^approval_required/", views.approval_required, name="approval_required"))
+
+if hasattr(settings, "USE_SAML") and settings.USE_SAML:
+    urlpatterns.append(re_path(r"^saml/metadata", views.saml_metadata, name="saml-metadata"))
+
+if hasattr(settings, "USE_IDENTITY_PROVIDERS") and settings.USE_IDENTITY_PROVIDERS:
+    urlpatterns.append(path('accounts/login_system', LoginView.as_view(), name='login_system'))
+    urlpatterns.append(re_path(r"^accounts/login", views.custom_login_view, name='login'))
+else:
+    urlpatterns.append(path('accounts/login', LoginView.as_view(), name='login_system'))
+
 if hasattr(settings, "GENERATE_SITEMAP") and settings.GENERATE_SITEMAP:
     urlpatterns.append(path("sitemap.xml", views.sitemap, name="sitemap"))

files/views/__init__.py

@@ -0,0 +1,47 @@
+# Import all views for backward compatibility
+
+from .auth import custom_login_view, saml_metadata  # noqa: F401
+from .categories import CategoryList, TagList  # noqa: F401
+from .comments import CommentDetail, CommentList  # noqa: F401
+from .encoding import EncodeProfileList, EncodingDetail  # noqa: F401
+from .media import MediaActions  # noqa: F401
+from .media import MediaBulkUserActions  # noqa: F401
+from .media import MediaDetail  # noqa: F401
+from .media import MediaList  # noqa: F401
+from .media import MediaSearch  # noqa: F401
+from .pages import about  # noqa: F401
+from .pages import add_subtitle  # noqa: F401
+from .pages import approval_required  # noqa: F401
+from .pages import categories  # noqa: F401
+from .pages import contact  # noqa: F401
+from .pages import edit_chapters  # noqa: F401
+from .pages import edit_media  # noqa: F401
+from .pages import edit_subtitle  # noqa: F401
+from .pages import edit_video  # noqa: F401
+from .pages import embed_media  # noqa: F401
+from .pages import featured_media  # noqa: F401
+from .pages import get_page  # noqa: F401
+from .pages import history  # noqa: F401
+from .pages import index  # noqa: F401
+from .pages import latest_media  # noqa: F401
+from .pages import liked_media  # noqa: F401
+from .pages import manage_comments  # noqa: F401
+from .pages import manage_media  # noqa: F401
+from .pages import manage_users  # noqa: F401
+from .pages import members  # noqa: F401
+from .pages import publish_media  # noqa: F401
+from .pages import recommended_media  # noqa: F401
+from .pages import record_screen  # noqa: F401
+from .pages import search  # noqa: F401
+from .pages import setlanguage  # noqa: F401
+from .pages import sitemap  # noqa: F401
+from .pages import tags  # noqa: F401
+from .pages import tos  # noqa: F401
+from .pages import trim_video  # noqa: F401
+from .pages import upload_media  # noqa: F401
+from .pages import video_chapters  # noqa: F401
+from .pages import view_media  # noqa: F401
+from .pages import view_playlist  # noqa: F401
+from .playlists import PlaylistDetail, PlaylistList  # noqa: F401
+from .tasks import TaskDetail, TasksList  # noqa: F401
+from .user import UserActions  # noqa: F401

files/views/auth.py

@@ -0,0 +1,42 @@
+from allauth.socialaccount.models import SocialApp
+from django.conf import settings
+from django.http import Http404, HttpResponse
+from django.shortcuts import redirect, render
+from django.urls import reverse
+
+from identity_providers.models import LoginOption
+
+
+def saml_metadata(request):
+    if not (hasattr(settings, "USE_SAML") and settings.USE_SAML):
+        raise Http404
+
+    xml_parts = ['<?xml version="1.0"?>']
+    saml_social_apps = SocialApp.objects.filter(provider='saml')
+    entity_id = f"{settings.FRONTEND_HOST}/saml/metadata/"
+    xml_parts.append(f'<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Name="{entity_id}">')  # noqa
+    xml_parts.append(f'    <md:EntityDescriptor entityID="{entity_id}">')  # noqa
+    xml_parts.append('        <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">')  # noqa
+
+    # Add multiple AssertionConsumerService elements with different indices
+    for index, app in enumerate(saml_social_apps, start=1):
+        xml_parts.append(
+            f'            <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" '  # noqa
+            f'Location="{settings.FRONTEND_HOST}/accounts/saml/{app.client_id}/acs/" index="{index}"/>'  # noqa
+        )
+
+    xml_parts.append('        </md:SPSSODescriptor>')  # noqa
+    xml_parts.append('    </md:EntityDescriptor>')  # noqa
+    xml_parts.append('</md:EntitiesDescriptor>')  # noqa
+    metadata_xml = '\n'.join(xml_parts)
+    return HttpResponse(metadata_xml, content_type='application/xml')
+
+
+def custom_login_view(request):
+    if not (hasattr(settings, "USE_IDENTITY_PROVIDERS") and settings.USE_IDENTITY_PROVIDERS):
+        return redirect(reverse('login_system'))
+
+    login_options = []
+    for option in LoginOption.objects.filter(active=True):
+        login_options.append({'url': option.url, 'title': option.title})
+    return render(request, 'account/custom_login_selector.html', {'login_options': login_options})