fix: issue with import (#1245)

Fixes: L27 'as' and 'FROM' keywords' casing do not match

Signed-off-by: Sven-Thorsten Dietrich <thebigcorporation@gmail.com>

.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+---
+name: "CI"
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**/README.md'
+jobs:
+  pre-commit:
+    uses: ./.github/workflows/pre-commit.yml
+  test:
+    uses: ./.github/workflows/python.yml
+    needs: [pre-commit]
+  release:
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit # pass all secrets
+    needs: [test]
+    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'

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

@@ -0,0 +1,52 @@
+name: Docker build and push
+
+on:
+  workflow_call:
+  push:
+    tags:
+      - v*.*.*
+
+jobs:
+  release:
+    name: Build & release to DockerHub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Docker meta
+        id: meta
+        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}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+          labels: |
+            org.opencontainers.image.title=MediaCMS
+            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.
+            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: Login to Docker Hub
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/lint_test.yml

@@ -1,15 +0,0 @@
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.0
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pre-commit.yml

@@ -0,0 +1,15 @@
+name: pre-commit
+
+on:
+  workflow_call:
+
+jobs:
+  pre-commit:
+    name: Pre-Commit
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - uses: pre-commit/action@v3.0.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/python.yml

@@ -1,14 +1,11 @@
 name: Python Tests
 
 on:
-  pull_request:
-  push:
-    branches:
-      - main
+  workflow_call:
 
 jobs:
   build:
-
+    name: Build & test via docker-compose
     runs-on: ubuntu-latest
 
     steps:
@@ -16,10 +13,10 @@ jobs:
       uses: actions/checkout@v1
 
     - name: Build the Stack
-      run:  docker-compose -f docker-compose-dev.yaml build
+      run:  docker compose -f docker-compose-dev.yaml build
 
     - name: Start containers
-      run: docker-compose -f docker-compose-dev.yaml up -d
+      run: docker compose -f docker-compose-dev.yaml up -d
 
     - name: List containers
       run: docker ps
@@ -29,10 +26,10 @@ jobs:
       shell: bash
 
     - name: Run Django Tests
-      run: docker-compose -f docker-compose-dev.yaml exec --env TESTING=True -T web pytest 
+      run: docker compose -f docker-compose-dev.yaml exec --env TESTING=True -T web pytest
 
       # Run with coverage, saves report on htmlcov dir
       # run: docker-compose -f docker-compose-dev.yaml exec --env TESTING=True -T web pytest --cov --cov-report=html --cov-config=.coveragerc
 
     - name: Tear down the Stack
-      run:  docker-compose -f docker-compose-dev.yaml down
+      run:  docker compose -f docker-compose-dev.yaml down

.gitignore

@@ -16,4 +16,5 @@ static/mptt/
 static/rest_framework/
 static/drf-yasg
 cms/local_settings.py
-deploy/docker/local_settings.py
+deploy/docker/local_settings.py
+yt.readme.md

.mailmap

@@ -1 +0,0 @@
-Swift Ugandan <swiftugandan@gmail.com> <swiftugandan@gmail.com>

.pre-commit-config.yaml

@@ -1,15 +1,16 @@
 repos:
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort
-    rev: 5.5.4
+    rev: 5.12.0
     hooks:
       - id: isort
         args: ["--profile", "black"]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.1.0
     hooks:
       - id: black
-        language_version: python3  
+        language_version: python3
+        additional_dependencies: [ 'click==8.0.4' ]

AUTHORS.txt

@@ -1,5 +1 @@
-Yiannis Stergiou - ys.stergiou@gmail.com
-Markos Gogoulos - mgogoulos@gmail.com
-Swift Ugandan - swiftugandan@gmail.com
-
 Please see https://github.com/mediacms-io/mediacms/graphs/contributors for complete list of contributors to this repository!

Dockerfile

@@ -1,69 +1,88 @@
-FROM python:3.8-buster AS compile-image
+FROM python:3.13-bookworm AS build-image
 
-SHELL ["/bin/bash", "-c"]
-
-# Set up virtualenv
-ENV VIRTUAL_ENV=/home/mediacms.io
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-ENV PIP_NO_CACHE_DIR=1
-
-RUN mkdir -p /home/mediacms.io/mediacms/{logs} && cd /home/mediacms.io && python3 -m venv $VIRTUAL_ENV
-
-# Install dependencies:
-COPY requirements.txt .
-RUN pip install -r requirements.txt
-
-COPY . /home/mediacms.io/mediacms
-WORKDIR /home/mediacms.io/mediacms
-
-RUN wget -q http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip && \
-    unzip Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip -d ../bento4 && \
-    mv ../bento4/Bento4-SDK-1-6-0-637.x86_64-unknown-linux/* ../bento4/ && \
-    rm -rf ../bento4/Bento4-SDK-1-6-0-637.x86_64-unknown-linux && \
-    rm -rf ../bento4/docs && \
-    rm Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip
-
-############ RUNTIME IMAGE ############
-FROM python:3.8-slim-buster as runtime-image
-
-ENV PYTHONUNBUFFERED=1
-ENV PYTHONDONTWRITEBYTECODE=1
-
-# See: https://github.com/celery/celery/issues/6285#issuecomment-715316219
-ENV CELERY_APP='cms'
-
-# Use these to toggle which processes supervisord should run
-ENV ENABLE_UWSGI='yes'
-ENV ENABLE_NGINX='yes'
-ENV ENABLE_CELERY_BEAT='yes'
-ENV ENABLE_CELERY_SHORT='yes'
-ENV ENABLE_CELERY_LONG='yes'
-ENV ENABLE_MIGRATIONS='yes'
-
-# Set up virtualenv
-ENV VIRTUAL_ENV=/home/mediacms.io
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-
-COPY --chown=www-data:www-data --from=compile-image /home/mediacms.io /home/mediacms.io
-
-RUN apt-get update -y && apt-get -y upgrade && apt-get install --no-install-recommends \
-    supervisor nginx imagemagick procps wget xz-utils -y && \
+# Install system dependencies needed for downloading and extracting
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends wget xz-utils unzip && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get purge --auto-remove && \
     apt-get clean
 
+# Install ffmpeg
 RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
     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
 
+# Install Bento4 in the specified location
+RUN mkdir -p /home/mediacms.io/bento4 && \
+    wget -q http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip && \
+    unzip Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip -d /home/mediacms.io/bento4 && \
+    mv /home/mediacms.io/bento4/Bento4-SDK-1-6-0-637.x86_64-unknown-linux/* /home/mediacms.io/bento4/ && \
+    rm -rf /home/mediacms.io/bento4/Bento4-SDK-1-6-0-637.x86_64-unknown-linux && \
+    rm -rf /home/mediacms.io/bento4/docs && \
+    rm Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip
+
+############ RUNTIME IMAGE ############
+FROM python:3.13-bookworm AS runtime_image
+
+SHELL ["/bin/bash", "-c"]
+
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV CELERY_APP='cms'
+ENV VIRTUAL_ENV=/home/mediacms.io
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# Install runtime system dependencies
+RUN apt-get update -y && \
+    apt-get -y upgrade && \
+    apt-get install --no-install-recommends supervisor nginx imagemagick procps libxml2-dev libxmlsec1-dev libxmlsec1-openssl -y && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get purge --auto-remove && \
+    apt-get clean
+
+# Copy ffmpeg and Bento4 from build image
+COPY --from=build-image /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
+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
+ENV ENABLE_UWSGI='yes' \
+    ENABLE_NGINX='yes' \
+    ENABLE_CELERY_BEAT='yes' \
+    ENABLE_CELERY_SHORT='yes' \
+    ENABLE_CELERY_LONG='yes' \
+    ENABLE_MIGRATIONS='yes'
+
 EXPOSE 9000 80
 
 RUN chmod +x ./deploy/docker/entrypoint.sh
 
 ENTRYPOINT ["./deploy/docker/entrypoint.sh"]
-
 CMD ["./deploy/docker/start.sh"]

Dockerfile-dev

@@ -1,16 +0,0 @@
-FROM mediacms/mediacms:latest
-
-SHELL ["/bin/bash", "-c"]
-
-# Set up virtualenv
-ENV VIRTUAL_ENV=/home/mediacms.io
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-ENV PIP_NO_CACHE_DIR=1
-
-RUN cd /home/mediacms.io && python3 -m venv $VIRTUAL_ENV
-
-COPY requirements.txt . 
-COPY requirements-dev.txt .
-RUN pip install -r requirements-dev.txt
-
-WORKDIR /home/mediacms.io/mediacms

HISTORY.md

@@ -0,0 +1,23 @@
+# History
+
+## 3.0.0
+
+### Features
+- Updates Python/Django requirements and Dockerfile to use latest 3.11 Python - https://github.com/mediacms-io/mediacms/pull/826/files. This update requires some manual steps, for existing (not new) installations. Check the update section under the [Admin docs](https://github.com/mediacms-io/mediacms/blob/main/docs/admins_docs.md#2-server-installation), either for single server or for Docker Compose installations
+- Upgrade postgres on Docker Compose - https://github.com/mediacms-io/mediacms/pull/749
+
+### Fixes
+- video player options for HLS - https://github.com/mediacms-io/mediacms/pull/832
+- AVI videos not correctly recognised as videos - https://github.com/mediacms-io/mediacms/pull/833
+
+## 2.1.0
+
+### Fixes
+- Increase uwsgi buffer-size parameter. This prevents an error by uwsgi with large headers - [#5b60](https://github.com/mediacms-io/mediacms/commit/5b601698a41ad97f08c1830e14b1c18f73ab8315)
+- Fix issues with comments. These were not reported on the tracker but it is certain that they would not show comments on media files (non videos but also videos). Unfortunately this reverts work done with Timestamps on comments + Mentions on comments, more on PR [#802](https://github.com/mediacms-io/mediacms/pull/802)
+
+### Features
+- Allow tags to contains other characters too, not only English alphabet ones [#801](https://github.com/mediacms-io/mediacms/pull/801)
+- Add simple cookie consent code [#799](https://github.com/mediacms-io/mediacms/pull/799)
+- Allow password reset & email verify pages on global login required [#790](https://github.com/mediacms-io/mediacms/pull/790)
+- Add api_url field to search api [#692](https://github.com/mediacms-io/mediacms/pull/692)

Makefile

@@ -0,0 +1,19 @@
+.PHONY: admin-shell build-frontend
+
+admin-shell:
+	@container_id=$$(docker-compose ps -q web); \
+	if [ -z "$$container_id" ]; then \
+		echo "Web container not found"; \
+		exit 1; \
+	else \
+		docker exec -it $$container_id /bin/bash; \
+	fi
+
+build-frontend:
+	docker compose -f docker-compose-dev.yaml exec frontend npm run dist
+	cp -r frontend/dist/static/* static/
+	docker compose -f docker-compose-dev.yaml restart web
+
+test:
+	docker compose -f docker-compose-dev.yaml exec --env TESTING=True -T web pytest
+

README.md

@@ -1,15 +1,12 @@
 # MediaCMS
 
-[![Code Quality: Cpp](https://img.shields.io/lgtm/grade/python/g/mediacms-io/mediacms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/mediacms-io/mediacms/context:python)
-[![Code Quality: Cpp](https://img.shields.io/lgtm/grade/javascript/g/mediacms-io/mediacms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/mediacms-io/mediacms/context:javascript)
-<br/>
 [![GitHub license](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://raw.githubusercontent.com/mediacms-io/mediacms/main/LICENSE.txt)
 [![Releases](https://img.shields.io/github/v/release/mediacms-io/mediacms?color=green)](https://github.com/mediacms-io/mediacms/releases/)
-[![DockerHub](https://img.shields.io/docker/pulls/mediacms/mediacms)](https://hub.docker.com/repository/docker/mediacms/mediacms/)
+[![DockerHub](https://img.shields.io/docker/pulls/mediacms/mediacms)](https://hub.docker.com/r/mediacms/mediacms)
 
 
 
-MediaCMS 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. It can be used to build a small to medium video and media portal within minutes. 
+MediaCMS 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. It can be used to build a small to medium video and media portal within minutes.
 
 It is built mostly using the modern stack Django + React and includes a REST API.
 
@@ -26,11 +23,13 @@ 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
 - **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
+- **Role-Based Access Control (RBAC)**: create RBAC categories and connect users to groups with view/edit access on their media
+- **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
@@ -44,69 +43,73 @@ A demo is available at https://demo.mediacms.io
 - **Scalable transcoding**: transcoding through priorities. Experimental support for remote workers
 - **Chunked file uploads**: for pausable/resumable upload of content
 - **REST API**: Documented through Swagger
-
+- **Translation**: Most of the CMS is translated to a number of languages
 
 ## 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.
-
 - **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.
 
 
 ## Philosophy
 
-We believe there's a need for quality open source web applications that can be used to build community portals and support collaboration. 
-
-We have three goals for MediaCMS: a) deliver all functionality one would expect from a modern system, b) allow for easy installation and maintenance, c) allow easy customization and addition of features. 
+We believe there's a need for quality open source web applications that can be used to build community portals and support collaboration.
+We have three goals for MediaCMS: a) deliver all functionality one would expect from a modern system, b) allow for easy installation and maintenance, c) allow easy customization and addition of features.
 
 
 ## License
 
-MediaCMS is released under [GNU Affero General Public License v3.0 license](LICENSE.txt). 
-Copyright Markos Gogoulos and Yiannis Stergiou
+MediaCMS is released under [GNU Affero General Public License v3.0 license](LICENSE.txt).
+Copyright Markos Gogoulos.
 
 
 ## Support and paid services
 
 We provide custom installations, development of extra functionality, migration from existing systems, integrations with legacy systems, training and support. Contact us at info@mediacms.io for more information.
 
+### Commercial Hostings
+**Elestio**
 
+You can deploy MediaCMS on Elestio using one-click deployment. Elestio supports MediaCMS by providing revenue share so go ahead and click below to deploy and use MediaCMS.
 
-## Hardware dependencies
+[![Deploy on Elestio](https://elest.io/images/logos/deploy-to-elestio-btn.png)](https://elest.io/open-source/mediacms)
 
-For a small to medium installation, with a few hours of video uploaded daily, and a few hundreds of active daily users viewing content, 4GB Ram / 2-4 CPUs as minimum is ok. For a larger installation with many hours of video uploaded daily, consider adding more CPUs and more Ram.    
+## Hardware considerations
+
+For a small to medium installation, with a few hours of video uploaded daily, and a few hundreds of active daily users viewing content, 4GB Ram / 2-4 CPUs as minimum is ok. For a larger installation with many hours of video uploaded daily, consider adding more CPUs and more Ram.
 
 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).
 
 
-## Releases
-
-Visit [Releases Page](https://github.com/mediacms-io/mediacms/releases) for detailed Changelog
-
-
 ## Installation / Maintanance
 
 There are two ways to run MediaCMS, through Docker Compose and through installing it on a server via an automation script that installs and configures all needed services. Find the related pages:
 
-* [Single Server](docs/admins_docs.md#2-server-installation) page
-* [Docker Compose](docs/admins_docs.md#3-docker-installation) page
+- [Single Server](docs/admins_docs.md#2-server-installation) page
+- [Docker Compose](docs/admins_docs.md#3-docker-installation) page
+
+  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
 
 
 ## Technology
+
 This software uses the following list of awesome technologies: Python, Django, Django Rest Framework, Celery, PostgreSQL, Redis, Nginx, uWSGI, React, Fine Uploader, video.js, FFMPEG, Bento4
 
 
@@ -114,7 +117,7 @@ This software uses the following list of awesome technologies: Python, Django, D
 
 - **Cinemata** non-profit media, technology and culture organization - https://cinemata.org
 - **Critical Commons** public media archive and fair use advocacy network - https://criticalcommons.org
-- **Heritales** International Heritage Film Festival - https://stage.heritales.org
+- **American Association of Gynecologic Laparoscopists** - https://surgeryu.org/
 
 
 ## How to contribute
@@ -124,10 +127,12 @@ If you like the project, here's a few things you can do
 - Suggest us to others that are interested to hire us
 - Write a blog post/article about MediaCMS
 - Share on social media about the project
-- Open issues, participate on discussions, report bugs, suggest ideas
+- Open issues, participate on [discussions](https://github.com/mediacms-io/mediacms/discussions), report bugs, suggest ideas
+- [Show and tell](https://github.com/mediacms-io/mediacms/discussions/categories/show-and-tell) how you are using the project
 - Star the project
-- Add functionality, work on a PR, fix an issue! 
+- Add functionality, work on a PR, fix an issue!
 
 
 ## Contact
+
 info@mediacms.io

actions/migrations/0001_initial.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

actions/migrations/0002_mediaaction_media.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

actions/migrations/0003_auto_20201201_0712.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

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

cli-tool/cli.py

@@ -59,7 +59,7 @@ def login():
             file.writelines(f'USERNAME={json.loads(response.text)["username"]}\n')
         print(f"Welcome to MediaCMS [bold blue]{username}[/bold blue]. Your auth creds have been suceesfully stored in the .env file", ":v:")
     else:
-        print(f'Error: {"non_field_errors":["User not found."]}')
+        print(f'Error: {"non_field_errors": ["User not found."]}')
 
 
 @apis.command()
@@ -73,11 +73,11 @@ def upload_media():
     if os.path.isdir(path):
         for filename in os.listdir(path):
             files = {}
-            abs = os.path.abspath("{path}/{filename}")
+            abs = os.path.abspath(f"{path}/{filename}")
             files['media_file'] = open(f'{abs}', 'rb')
             response = requests.post(url=f'{BASE_URL}/media', headers=headers, files=files)
             if response.status_code == 201:
-                print("[bold blue]{filename}[/bold blue] successfully uploaded!")
+                print(f"[bold blue]{filename}[/bold blue] successfully uploaded!")
             else:
                 print(f'Error: {response.text}')
 
@@ -86,7 +86,7 @@ def upload_media():
         files['media_file'] = open(f'{os.path.abspath(path)}', 'rb')
         response = requests.post(url=f'{BASE_URL}/media', headers=headers, files=files)
         if response.status_code == 201:
-            print("[bold blue]{filename}[/bold blue] successfully uploaded!")
+            print(f"[bold blue]{filename}[/bold blue] successfully uploaded!")
         else:
             print(f'Error: {response.text}')
 

cms/custom_pagination.py

@@ -18,7 +18,6 @@ class FastPaginationWithoutCount(PageNumberPagination):
     django_paginator_class = FasterDjangoPaginator
 
     def get_paginated_response(self, data):
-
         return Response(
             OrderedDict(
                 [

cms/dev_settings.py

@@ -0,0 +1,56 @@
+# Development settings, used in docker-compose-dev.yaml
+import os
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+INSTALLED_APPS = [
+    "admin_customizations",
+    "django.contrib.auth",
+    "allauth",
+    "allauth.account",
+    "allauth.socialaccount",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "jazzmin",
+    "django.contrib.admin",
+    "django.contrib.sites",
+    "rest_framework",
+    "rest_framework.authtoken",
+    "imagekit",
+    "files.apps.FilesConfig",
+    "users.apps.UsersConfig",
+    "actions.apps.ActionsConfig",
+    "rbac.apps.RbacConfig",
+    "identity_providers.apps.IdentityProvidersConfig",
+    "debug_toolbar",
+    "mptt",
+    "crispy_forms",
+    "crispy_bootstrap5",
+    "uploader.apps.UploaderConfig",
+    "djcelery_email",
+    "drf_yasg",
+    "allauth.socialaccount.providers.saml",
+    "saml_auth.apps.SamlAuthConfig",
+    "corsheaders",
+]
+
+MIDDLEWARE = [
+    'corsheaders.middleware.CorsMiddleware',
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    "django.middleware.locale.LocaleMiddleware",
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    "allauth.account.middleware.AccountMiddleware",
+]
+
+DEBUG = True
+CORS_ORIGIN_ALLOW_ALL = True
+STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)
+STATIC_ROOT = os.path.join(BASE_DIR, 'static_collected')

cms/permissions.py

@@ -11,6 +11,13 @@ class IsAuthorizedToAdd(permissions.BasePermission):
         return user_allowed_to_upload(request)
 
 
+class IsAuthorizedToAddComment(permissions.BasePermission):
+    def has_permission(self, request, view):
+        if request.method in permissions.SAFE_METHODS:
+            return True
+        return user_allowed_to_comment(request)
+
+
 class IsUserOrManager(permissions.BasePermission):
     """To be used in cases where request.user is either the
     object owner, or anyone amongst MediaCMS managers
@@ -66,3 +73,24 @@ def user_allowed_to_upload(request):
         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
+    """
+    if request.user.is_anonymous:
+        return False
+    if request.user.is_superuser:
+        return True
+
+    # Default is "all"
+    if not hasattr(settings, "CAN_COMMENT") or settings.CAN_COMMENT == "all":
+        return True
+    elif settings.CAN_COMMENT == "email_verified":
+        if request.user.email_is_verified:
+            return True
+    elif settings.CAN_COMMENT == "advancedUser":
+        if request.user.advancedUser:
+            return True
+    return False

cms/settings.py

@@ -1,19 +1,24 @@
 import os
 
 from celery.schedules import crontab
+from django.utils.translation import gettext_lazy as _
 
 DEBUG = False
 
 # PORTAL NAME, this is the portal title and
 # is also shown on several places as emails
 PORTAL_NAME = "MediaCMS"
-LANGUAGE_CODE = "en-us"
+PORTAL_DESCRIPTION = ""
 TIME_ZONE = "Europe/London"
 
 # who can add media
 # valid options include 'all', 'email_verified', 'advancedUser'
 CAN_ADD_MEDIA = "all"
 
+# who can comment
+# valid options include 'all', 'email_verified', 'advancedUser'
+CAN_COMMENT = "all"
+
 # valid choices here are 'public', 'private', 'unlisted
 PORTAL_WORKFLOW = "public"
 
@@ -86,10 +91,15 @@ MAX_MEDIA_PER_PLAYLIST = 70
 UPLOAD_MAX_SIZE = 800 * 1024 * 1000 * 5
 
 MAX_CHARS_FOR_COMMENT = 10000  # so that it doesn't end up huge
+TIMESTAMP_IN_TIMEBAR = False  # shows timestamped comments in the timebar for videos
+ALLOW_MENTION_IN_COMMENTS = False  # allowing to mention other users with @ in the comments
 
 # valid options: content, author
 RELATED_MEDIA_STRATEGY = "content"
 
+# Whether or not to generate a sitemap.xml listing the pages on the site (default: False)
+GENERATE_SITEMAP = False
+
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True
@@ -101,11 +111,11 @@ TIME_TO_ACTION_ANONYMOUS = 10 * 60
 
 # django-allauth settings
 ACCOUNT_SESSION_REMEMBER = True
-ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+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"
@@ -113,13 +123,15 @@ ACCOUNT_SIGNUP_PASSWORD_ENTER_TWICE = False
 ACCOUNT_USERNAME_REQUIRED = True
 ACCOUNT_LOGIN_ON_PASSWORD_RESET = True
 ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 1
-ACCOUNT_LOGIN_ATTEMPTS_LIMIT = 20
-ACCOUNT_LOGIN_ATTEMPTS_TIMEOUT = 5
 # registration won't be open, might also consider to remove links for register
 USERS_CAN_SELF_REGISTER = True
 
 RESTRICTED_DOMAINS_FOR_USER_REGISTRATION = ["xxx.com", "emaildomainwhatever.com"]
 
+# Comma separated list of domains:  ["organization.com", "private.organization.com", "org2.com"]
+# Empty list disables.
+ALLOWED_DOMAINS_FOR_USER_REGISTRATION = []
+
 # django rest settings
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": (
@@ -216,11 +228,11 @@ POST_UPLOAD_AUTHOR_MESSAGE_UNLISTED_NO_COMMENTARY = ""
 
 CANNOT_ADD_MEDIA_MESSAGE = ""
 
-# mp4hls command, part of Bendo4
+# mp4hls command, part of Bento4
 MP4HLS_COMMAND = "/home/mediacms.io/mediacms/Bento4-SDK-1-6-0-637.x86_64-unknown-linux/bin/mp4hls"
 
 # highly experimental, related with remote workers
-ADMIN_TOKEN = "c2b8e1838b6128asd333ddc5e24"
+ADMIN_TOKEN = ""
 # this is used by remote workers to push
 # encodings once they are done
 # USE_BASIC_HTTP = True
@@ -235,35 +247,6 @@ ADMIN_TOKEN = "c2b8e1838b6128asd333ddc5e24"
 # uncomment the two lines related to htpasswd
 
 
-CKEDITOR_CONFIGS = {
-    "default": {
-        "toolbar": "Custom",
-        "width": "100%",
-        "toolbar_Custom": [
-            ["Styles"],
-            ["Format"],
-            ["Bold", "Italic", "Underline"],
-            ["HorizontalRule"],
-            [
-                "NumberedList",
-                "BulletedList",
-                "-",
-                "Outdent",
-                "Indent",
-                "-",
-                "JustifyLeft",
-                "JustifyCenter",
-                "JustifyRight",
-                "JustifyBlock",
-            ],
-            ["Link", "Unlink"],
-            ["Image"],
-            ["RemoveFormat", "Source"],
-        ],
-    }
-}
-
-
 AUTH_USER_MODEL = "users.User"
 LOGIN_REDIRECT_URL = "/"
 
@@ -273,7 +256,7 @@ AUTHENTICATION_BACKENDS = (
 )
 
 INSTALLED_APPS = [
-    "django.contrib.admin",
+    "admin_customizations",
     "django.contrib.auth",
     "allauth",
     "allauth.account",
@@ -282,6 +265,8 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "jazzmin",
+    "django.contrib.admin",
     "django.contrib.sites",
     "rest_framework",
     "rest_framework.authtoken",
@@ -289,24 +274,30 @@ INSTALLED_APPS = [
     "files.apps.FilesConfig",
     "users.apps.UsersConfig",
     "actions.apps.ActionsConfig",
+    "rbac.apps.RbacConfig",
+    "identity_providers.apps.IdentityProvidersConfig",
     "debug_toolbar",
     "mptt",
     "crispy_forms",
+    "crispy_bootstrap5",
     "uploader.apps.UploaderConfig",
     "djcelery_email",
-    "ckeditor",
     "drf_yasg",
+    "allauth.socialaccount.providers.saml",
+    "saml_auth.apps.SamlAuthConfig",
 ]
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 ]
 
 ROOT_URLCONF = "cms.urls"
@@ -334,11 +325,15 @@ WSGI_APPLICATION = "cms.wsgi.application"
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+        "OPTIONS": {
+            "user_attributes": ("username", "email", "first_name", "last_name"),
+            "max_similarity": 0.7,
+        },
     },
     {
         "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
         "OPTIONS": {
-            "min_length": 5,
+            "min_length": 7,
         },
     },
     {
@@ -450,6 +445,57 @@ CELERY_TASK_ALWAYS_EAGER = False
 if os.environ.get("TESTING"):
     CELERY_TASK_ALWAYS_EAGER = True
 
+# if True, only show original, don't perform any action on videos
+DO_NOT_TRANSCODE_VIDEO = False
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+LANGUAGES = [
+    ('ar', _('Arabic')),
+    ('bn', _('Bengali')),
+    ('nl', _('Dutch')),
+    ('en', _('English')),
+    ('fr', _('French')),
+    ('de', _('German')),
+    ('hi', _('Hindi')),
+    ('id', _('Indonesian')),
+    ('ja', _('Japanese')),
+    ('ko', _('Korean')),
+    ('pt', _('Portuguese')),
+    ('ru', _('Russian')),
+    ('zh-hans', _('Simplified Chinese')),
+    ('es', _('Spanish')),
+    ('tr', _('Turkish')),
+    ('el', _('Greek')),
+    ('ur', _('Urdu')),
+]
+
+LANGUAGE_CODE = 'en'  # default language
+
+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
+# 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
+SLIDESHOW_ITEMS = 30
+# this calculation is redundant most probably, setting as an option
+CALCULATE_MD5SUM = False
+
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
+CRISPY_TEMPLATE_PACK = "bootstrap5"
+
+# allow option to override the default admin url
+# 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"}
+
 
 try:
     # keep a local_settings.py file for local overrides
@@ -461,21 +507,40 @@ 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}"
+    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:
     # this should go after the AuthenticationMiddleware middleware
-    MIDDLEWARE.insert(5, "login_required.middleware.LoginRequiredMiddleware")
+    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]+/',
     ]

cms/urls.py

@@ -1,7 +1,8 @@
 import debug_toolbar
-from django.conf.urls import include, re_path
+from django.conf import settings
+from django.conf.urls import include
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, re_path
 from django.views.generic.base import TemplateView
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
@@ -13,6 +14,7 @@ schema_view = get_schema_view(
     permission_classes=(AllowAny,),
 )
 
+# refactor seriously
 
 urlpatterns = [
     re_path(r"^__debug__/", include(debug_toolbar.urls)),
@@ -24,8 +26,12 @@ urlpatterns = [
     re_path(r"^", include("users.urls")),
     re_path(r"^accounts/", include("allauth.urls")),
     re_path(r"^api-auth/", include("rest_framework.urls")),
-    path("admin/", admin.site.urls),
+    path(settings.DJANGO_ADMIN_URL, admin.site.urls),
     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'),
 ]
+
+admin.site.site_header = "MediaCMS Admin"
+admin.site.site_title = "MediaCMS"
+admin.site.index_title = "Admin"

cms/version.py

@@ -0,0 +1 @@
+VERSION = "5.0.1"

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

@@ -7,6 +7,7 @@ ln -sf /dev/stdout /var/log/nginx/mediacms.io.access.log && ln -sf /dev/stderr /
 
 cp /home/mediacms.io/mediacms/deploy/docker/local_settings.py /home/mediacms.io/mediacms/cms/local_settings.py
 
+
 mkdir -p /home/mediacms.io/mediacms/{logs,media_files/hls}
 touch /home/mediacms.io/mediacms/logs/debug.log
 
@@ -28,7 +29,8 @@ else
 fi
 
 # We should do this only for folders that have a different owner, since it is an expensive operation
-find /home/mediacms.io/ ! \( -user www-data -group $TARGET_GID \) -exec chown www-data:$TARGET_GID {} +
+# 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 {} +
 
 chmod +x /home/mediacms.io/mediacms/deploy/docker/start.sh /home/mediacms.io/mediacms/deploy/docker/prestart.sh
 

deploy/docker/local_settings.py

@@ -1,17 +1,18 @@
-FRONTEND_HOST = 'http://localhost'
-PORTAL_NAME = 'MediaCMS'
-SECRET_KEY = 'ma!s3^b-cw!f#7s6s0m3*jx77a@riw(7701**(r=ww%w!2+yk2'
-POSTGRES_HOST = 'db'
-REDIS_LOCATION = "redis://redis:6379/1"
+import os
+
+FRONTEND_HOST = os.getenv('FRONTEND_HOST', 'http://localhost')
+PORTAL_NAME = os.getenv('PORTAL_NAME', 'MediaCMS')
+SECRET_KEY = os.getenv('SECRET_KEY', 'ma!s3^b-cw!f#7s6s0m3*jx77a@riw(7701**(r=ww%w!2+yk2')
+REDIS_LOCATION = os.getenv('REDIS_LOCATION', 'redis://redis:6379/1')
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": "mediacms",
-        "HOST": POSTGRES_HOST,
-        "PORT": "5432",
-        "USER": "mediacms",
-        "PASSWORD": "mediacms",
+        "NAME": os.getenv('POSTGRES_NAME', 'mediacms'),
+        "HOST": os.getenv('POSTGRES_HOST', 'db'),
+        "PORT": os.getenv('POSTGRES_PORT', '5432'),
+        "USER": os.getenv('POSTGRES_USER', 'mediacms'),
+        "PASSWORD": os.getenv('POSTGRES_PASSWORD', 'mediacms'),
     }
 }
 
@@ -31,4 +32,4 @@ CELERY_RESULT_BACKEND = BROKER_URL
 
 MP4HLS_COMMAND = "/home/mediacms.io/bento4/bin/mp4hls"
 
-DEBUG = False
+DEBUG = os.getenv('DEBUG', 'False') == 'True'

deploy/docker/nginx_http_only.conf

@@ -16,6 +16,10 @@ server {
 
     location /media {
         alias /home/mediacms.io/mediacms/media_files ;
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
     }
 
     location / {

deploy/docker/policy.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policymap [
+  <!ELEMENT policymap (policy)*>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+]>
+<!--
+  Configure ImageMagick policies.
+
+  Domains include system, delegate, coder, filter, path, or resource.
+
+  Rights include none, read, write, execute and all.  Use | to combine them,
+  for example: "read | write" to permit read from, or write to, a path.
+
+  Use a glob expression as a pattern.
+
+  Suppose we do not want users to process MPEG video images:
+
+    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
+
+  Here we do not want users reading images from HTTP:
+
+    <policy domain="coder" rights="none" pattern="HTTP" />
+
+  The /repository file system is restricted to read only.  We use a glob
+  expression to match all paths that start with /repository:
+
+    <policy domain="path" rights="read" pattern="/repository/*" />
+
+  Lets prevent users from executing any image filters:
+
+    <policy domain="filter" rights="none" pattern="*" />
+
+  Any large image is cached to disk rather than memory:
+
+    <policy domain="resource" name="area" value="1GP"/>
+
+  Use the default system font unless overwridden by the application:
+
+    <policy domain="system" name="font" value="/usr/share/fonts/favorite.ttf"/>
+
+  Define arguments for the memory, map, area, width, height and disk resources
+  with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
+  for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
+  exceeds policy maximum so memory limit is 1GB).
+
+  Rules are processed in order.  Here we want to restrict ImageMagick to only
+  read or write a small subset of proven web-safe image types:
+
+    <policy domain="delegate" rights="none" pattern="*" />
+    <policy domain="filter" rights="none" pattern="*" />
+    <policy domain="coder" rights="none" pattern="*" />
+    <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
+-->
+<policymap>
+  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
+  <policy domain="resource" name="memory" value="1GiB"/>
+  <policy domain="resource" name="map" value="30GiB"/>
+  <policy domain="resource" name="width" value="16MP"/>
+  <policy domain="resource" name="height" value="16MP"/>
+  <!-- <policy domain="resource" name="list-length" value="128"/> -->
+  <policy domain="resource" name="area" value="40GP"/>
+  <policy domain="resource" name="disk" value="100GiB"/>
+  <!-- <policy domain="resource" name="file" value="768"/> -->
+  <!-- <policy domain="resource" name="thread" value="4"/> -->
+  <!-- <policy domain="resource" name="throttle" value="0"/> -->
+  <!-- <policy domain="resource" name="time" value="3600"/> -->
+  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+  <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+  <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
+  <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- <policy domain="system" name="font" value="/path/to/font.ttf"/> -->
+  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- not needed due to the need to use explicitly by mvg: -->
+  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
+  <!-- use curl -->
+  <policy domain="delegate" rights="none" pattern="URL" />
+  <policy domain="delegate" rights="none" pattern="HTTPS" />
+  <policy domain="delegate" rights="none" pattern="HTTP" />
+  <!-- in order to avoid to get image with password text -->
+  <policy domain="path" rights="none" pattern="@*"/>
+  <!-- disable ghostscript format types -->
+  <policy domain="coder" rights="none" pattern="PS" />
+  <policy domain="coder" rights="none" pattern="PS2" />
+  <policy domain="coder" rights="none" pattern="PS3" />
+  <policy domain="coder" rights="none" pattern="EPS" />
+  <policy domain="coder" rights="none" pattern="PDF" />
+  <policy domain="coder" rights="none" pattern="XPS" />
+</policymap>

deploy/docker/prestart.sh

@@ -7,7 +7,7 @@ if [ X"$ENABLE_MIGRATIONS" = X"yes" ]; then
     echo "Running migrations service"
     python manage.py migrate
     EXISTING_INSTALLATION=`echo "from users.models import User; print(User.objects.exists())" |python manage.py shell`
-    if [ "$EXISTING_INSTALLATION" = "True" ]; then 
+    if [ "$EXISTING_INSTALLATION" = "True" ]; then
         echo "Loaddata has already run"
     else
         echo "Running loaddata and creating admin user"
@@ -67,4 +67,5 @@ fi
 if [ X"$ENABLE_CELERY_LONG" = X"yes" ] ; then
     echo "Enabling celery-long task worker"
     cp deploy/docker/supervisord/supervisord-celery_long.conf /etc/supervisor/conf.d/supervisord-celery_long.conf
+    rm /var/run/mediacms/* -f # remove any stale id, so that on forced restarts of celery workers there are no stale processes that prevent new ones
 fi

deploy/docker/uwsgi.ini

@@ -21,3 +21,4 @@ vacuum = true
 hook-master-start = unix_signal:15 gracefully_kill_them_all
 need-app = true
 die-on-term = true
+buffer-size=32768

deploy/local_install/celery_beat.service

@@ -8,15 +8,13 @@ User=www-data
 Group=www-data
 Restart=always
 RestartSec=10
-Environment=APP_DIR="/home/mediacms.io/mediacms"
+WorkingDirectory=/home/mediacms.io/mediacms
 Environment=CELERY_BIN="/home/mediacms.io/bin/celery"
-Environment=CELERY_APP="cms"
 Environment=CELERYD_PID_FILE="/home/mediacms.io/mediacms/pids/beat%n.pid"
 Environment=CELERYD_LOG_FILE="/home/mediacms.io/mediacms/logs/beat%N.log"
 Environment=CELERYD_LOG_LEVEL="INFO"
-Environment=APP_DIR="/home/mediacms.io/mediacms"
 
-ExecStart=/bin/sh -c '${CELERY_BIN} beat -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} --workdir=${APP_DIR}'
+ExecStart=/bin/sh -c '${CELERY_BIN} -A cms beat --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL}'
 ExecStop=/bin/kill -s TERM $MAINPID
 
 [Install]

deploy/local_install/celery_long.service

@@ -8,23 +8,21 @@ User=www-data
 Group=www-data
 Restart=always
 RestartSec=10
-Environment=APP_DIR="/home/mediacms.io/mediacms"
+WorkingDirectory=/home/mediacms.io/mediacms
 Environment=CELERYD_NODES="long1"
 Environment=CELERY_QUEUE="long_tasks"
 Environment=CELERY_BIN="/home/mediacms.io/bin/celery"
-Environment=CELERY_APP="cms"
 Environment=CELERYD_MULTI="multi"
 Environment=CELERYD_OPTS="-Ofair --prefetch-multiplier=1"
 Environment=CELERYD_PID_FILE="/home/mediacms.io/mediacms/pids/%n.pid"
 Environment=CELERYD_LOG_FILE="/home/mediacms.io/mediacms/logs/%N.log"
 Environment=CELERYD_LOG_LEVEL="INFO"
-Environment=APP_DIR="/home/mediacms.io/mediacms"
 
-ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} --workdir=${APP_DIR} -Q ${CELERY_QUEUE}'
+ExecStart=/bin/sh -c '${CELERY_BIN} -A cms multi start ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} -Q ${CELERY_QUEUE}'
 
-ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE}'
+ExecStop=/bin/sh -c '${CELERY_BIN} -A cms multi stopwait ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE}'
 
-ExecReload=/bin/sh -c '${CELERY_BIN} multi restart ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} --workdir=${APP_DIR} -Q ${CELERY_QUEUE}'
+ExecReload=/bin/sh -c '${CELERY_BIN} -A cms multi restart ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} -Q ${CELERY_QUEUE}'
 
 [Install]
 WantedBy=multi-user.target

deploy/local_install/celery_short.service

@@ -8,14 +8,13 @@ User=www-data
 Group=www-data
 Restart=always
 RestartSec=10
-Environment=APP_DIR="/home/mediacms.io/mediacms"
+WorkingDirectory=/home/mediacms.io/mediacms
 Environment=CELERYD_NODES="short1 short2"
 Environment=CELERY_QUEUE="short_tasks"
 # Absolute or relative path to the 'celery' command:
 Environment=CELERY_BIN="/home/mediacms.io/bin/celery"
 # App instance to use
 # comment out this line if you don't use an app
-Environment=CELERY_APP="cms"
 # or fully qualified:
 #CELERY_APP="proj.tasks:app"
 # How to call manage.py
@@ -28,13 +27,12 @@ Environment=CELERYD_OPTS="--soft-time-limit=300 -c10"
 Environment=CELERYD_PID_FILE="/home/mediacms.io/mediacms/pids/%n.pid"
 Environment=CELERYD_LOG_FILE="/home/mediacms.io/mediacms/logs/%N.log"
 Environment=CELERYD_LOG_LEVEL="INFO"
-Environment=APP_DIR="/home/mediacms.io/mediacms"
 
-ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} --workdir=${APP_DIR} -Q ${CELERY_QUEUE}'
+ExecStart=/bin/sh -c '${CELERY_BIN} -A cms multi start ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} -Q ${CELERY_QUEUE}'
 
-ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE}'
+ExecStop=/bin/sh -c '${CELERY_BIN} -A cms multi stopwait ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE}'
 
-ExecReload=/bin/sh -c '${CELERY_BIN} multi restart ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} --workdir=${APP_DIR} -Q ${CELERY_QUEUE}'
+ExecReload=/bin/sh -c '${CELERY_BIN} -A cms multi restart ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS} -Q ${CELERY_QUEUE}'
 
 [Install]
 WantedBy=multi-user.target

deploy/local_install/mediacms.io

@@ -49,7 +49,7 @@ server {
     ssl_dhparam /etc/nginx/dhparams/dhparams.pem;
 
     ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
-    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;    
+    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
     ssl_ecdh_curve secp521r1:secp384r1;
     ssl_prefer_server_ciphers on;
 

deploy/local_install/selinux-mediacms.te

@@ -0,0 +1,34 @@
+module selinux-mediacms 1.0;
+
+require {
+	type init_t;
+	type var_t;
+	type redis_port_t;
+	type postgresql_port_t;
+	type httpd_t;
+	type httpd_sys_content_t;
+	type httpd_sys_rw_content_t;
+	class file { append create execute execute_no_trans getattr ioctl lock open read rename setattr unlink write };
+	class dir { add_name remove_name rmdir };
+	class tcp_socket name_connect;
+	class lnk_file read;
+}
+
+#============= httpd_t ==============
+
+allow httpd_t var_t:file { getattr open read };
+
+#============= init_t ==============
+allow init_t postgresql_port_t:tcp_socket name_connect;
+
+allow init_t redis_port_t:tcp_socket name_connect;
+
+allow init_t httpd_sys_content_t:dir rmdir;
+
+allow init_t httpd_sys_content_t:file { append create execute execute_no_trans ioctl lock open read rename setattr unlink write };
+
+allow init_t httpd_sys_content_t:lnk_file read;
+
+allow init_t httpd_sys_rw_content_t:dir { add_name remove_name rmdir };
+
+allow init_t httpd_sys_rw_content_t:file { create ioctl lock open read setattr unlink write };

deploy/local_install/uwsgi.ini

@@ -24,4 +24,4 @@ vacuum = true
 logto = /home/mediacms.io/mediacms/logs/errorlog.txt
 
 disable-logging = true
-
+buffer-size=32768

docker-compose-dev.yaml

@@ -1,8 +1,34 @@
 version: "3"
 
 services:
+  migrations:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+      args:
+        - DEVELOPMENT_MODE=True
+    image: mediacms/mediacms-dev: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:14
+    image: node:20
     volumes:
       - ${PWD}/frontend:/home/mediacms.io/mediacms/frontend/
     working_dir: /home/mediacms.io/mediacms/frontend/
@@ -14,21 +40,18 @@ services:
     depends_on:
       - web
   web:
-    build:
-      context: .
-      dockerfile: ./Dockerfile-dev
     image: mediacms/mediacms-dev: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:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
+      - migrations
   db:
-    image: postgres:13
+    image: postgres:17.2-alpine
     volumes:
       - ../postgres_data:/var/lib/postgresql/data/
     restart: always
@@ -36,8 +59,9 @@ services:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
+      TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U mediacms"]
+      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
@@ -49,3 +73,17 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
+  celery_worker:
+    image: mediacms/mediacms-dev: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

docker-compose.yaml

@@ -13,7 +13,7 @@ services:
       ENABLE_CELERY_BEAT: 'no'
       ADMIN_USER: 'admin'
       ADMIN_EMAIL: 'admin@localhost'
-      #ADMIN_PASSWORD: 'uncomment_and_set_password_here'
+      # ADMIN_PASSWORD: 'uncomment_and_set_password_here'
     command: "./deploy/docker/prestart.sh"
     restart: on-failure
     depends_on:
@@ -62,7 +62,7 @@ services:
     depends_on:
       - migrations
   db:
-    image: postgres:13
+    image: postgres:17.2-alpine
     volumes:
       - ../postgres_data:/var/lib/postgresql/data/
     restart: always
@@ -70,8 +70,9 @@ services:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
+      TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U mediacms"]
+      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

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

@@ -0,0 +1,144 @@
+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/docker-compose-http-proxy.yaml

@@ -68,7 +68,7 @@ services:
     depends_on:
       - migrations
   db:
-    image: postgres:13
+    image: postgres:17.2-alpine
     volumes:
       - ../postgres_data/:/var/lib/postgresql/data/
     restart: always
@@ -76,8 +76,9 @@ services:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
+      TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U mediacms"]
+      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

docker-compose/docker-compose-https-proxy.yaml

@@ -70,7 +70,7 @@ services:
     depends_on:
       - migrations
   db:
-    image: postgres:13
+    image: postgres:17.2-alpine
     volumes:
       - ../postgres_data/:/var/lib/postgresql/data/
     restart: always
@@ -78,8 +78,9 @@ services:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
+      TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U mediacms"]
+      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

docker-compose/docker-compose-letsencrypt.yaml

@@ -90,7 +90,7 @@ services:
     depends_on:
       - migrations
   db:
-    image: postgres:13
+    image: postgres:17.2-alpine
     volumes:
       - ../postgres_data:/var/lib/postgresql/data/
     restart: always
@@ -98,8 +98,9 @@ services:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
+      TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U mediacms"]
+      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

docker-compose/docker-compose-named-volumes.yaml

@@ -66,7 +66,7 @@ services:
     depends_on:
       - migrations
   db:
-    image: postgres:13
+    image: postgres:17.2-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     restart: always
@@ -74,8 +74,9 @@ services:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
+      TZ: Europe/London
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U mediacms"]
+      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

docs/admins_docs.md

@@ -4,7 +4,7 @@
 - [1. Welcome](#1-welcome)
 - [2. Server Installaton](#2-server-installation)
 - [3. Docker Installation](#3-docker-installation)
-- [4. Docker Deployement options](#4-docker-deployment-options)
+- [4. Docker Deployment options](#4-docker-deployment-options)
 - [5. Configuration](#5-configuration)
 - [6. Manage pages](#6-manage-pages)
 - [7. Django admin dashboard](#7-django-admin-dashboard)
@@ -16,19 +16,29 @@
 - [13. How To Add A Static Page To The Sidebar](#13-how-to-add-a-static-page-to-the-sidebar)
 - [14. Add Google Analytics](#14-add-google-analytics)
 - [15. Debugging email issues](#15-debugging-email-issues)
+- [16. Frequently Asked Questions](#16-frequently-asked-questions)
+- [17. Cookie consent code](#17-cookie-consent-code)
+- [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-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)
+
 
 
 ## 1. Welcome
-This page is created for MediaCMS administrators that are responsible for setting up the software, maintaining it and making modifications. 
+This page is created for MediaCMS administrators that are responsible for setting up the software, maintaining it and making modifications.
 
 ## 2. 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 18 or 20 versions.
+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).
 
-Installation on a Ubuntu 18 or 20 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. 
+Installation on an Ubuntu 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 18, Ubuntu 20, and Debian Buster
+Automated script - tested on Ubuntu 20, Ubuntu 22 and Debian Buster
 
 ```bash
 mkdir /home/mediacms.io && cd /home/mediacms.io/
@@ -36,7 +46,7 @@ git clone https://github.com/mediacms-io/mediacms
 cd /home/mediacms.io/mediacms/ && bash ./install.sh
 ```
 
-The script will ask if you have a URL where you want to deploy MediaCMS, otherwise it will use localhost. If you provide a URL, it will use Let's Encrypt service to install a valid ssl certificate. 
+The script will ask if you have a URL where you want to deploy MediaCMS, otherwise it will use localhost. If you provide a URL, it will use Let's Encrypt service to install a valid ssl certificate.
 
 
 ### Update
@@ -47,10 +57,25 @@ If you've used the above way to install MediaCMS, update with the following:
 cd /home/mediacms.io/mediacms # enter mediacms directory
 source  /home/mediacms.io/bin/activate # use virtualenv
 git pull # update code
+pip install -r requirements.txt -U # run pip install to update
 python manage.py migrate # run Django migrations
 sudo systemctl restart mediacms celery_long celery_short # restart services
 ```
 
+### Update from version 2 to version 3
+Version 3 is using Django 4 and Celery 5, and needs a recent Python 3.x version. If you are updating from an older version, make sure Python is updated first. Version 2 could run on Python 3.6, but version 3 needs Python3.8 and higher.
+The syntax for starting Celery has also changed, so you have to copy the celery related systemctl files and restart
+
+```
+# cp deploy/local_install/celery_long.service /etc/systemd/system/celery_long.service
+# cp deploy/local_install/celery_short.service /etc/systemd/system/celery_short.service
+# cp deploy/local_install/celery_beat.service /etc/systemd/system/celery_beat.service
+# systemctl daemon-reload
+# systemctl start celery_long celery_short celery_beat
+```
+
+
+
 ### Configuration
 Checkout the configuration section here.
 
@@ -64,7 +89,7 @@ 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 18/20 systems this is:
+For Ubuntu 20/22 systems this is:
 
 ```bash
 curl -fsSL https://get.docker.com -o get-docker.sh
@@ -110,6 +135,18 @@ docker-compose down
 docker-compose up
 ```
 
+### Update from version 2 to version 3
+Version 3 is using Python 3.11 and PostgreSQL 15. If you are updating from an older version, that was using PostgreSQL 13, the automatic update will not work, as you will receive the following message when the PostgreSQL container starts:
+
+```
+db_1              | 2023-06-27 11:07:42.959 UTC [1] FATAL:  database files are incompatible with server
+db_1              | 2023-06-27 11:07:42.959 UTC [1] DETAIL:  The data directory was initialized by PostgreSQL version 13, which is not compatible with this version 15.2.
+```
+
+At this point there are two options: either edit the Docker Compose file and make use of the existing postgres:13 image, or otherwise you have to perform the migration from postgresql 13 to version 15. More notes on https://github.com/mediacms-io/mediacms/pull/749
+
+
+
 ## Configuration
 Checkout the configuration docs here.
 
@@ -144,9 +181,9 @@ The main container runs migrations, mediacms_web, celery_beat, celery_workers (c
  The FRONTEND_HOST in `deploy/docker/local_settings.py` is configured as http://localhost, on the docker host machine.
 
 ### Server with ssl certificate through letsencrypt service, accessed as https://my_domain.com
-Before trying this out make sure the ip points to my_domain.com. 
+Before trying this out make sure the ip points to my_domain.com.
 
-With this method [this deployment](../docker-compose-letsencrypt.yaml) is used. 
+With this method [this deployment](../docker-compose-letsencrypt.yaml) is used.
 
 Edit this file and set `VIRTUAL_HOST` as my_domain.com, `LETSENCRYPT_HOST` as my_domain.com, and your email on `LETSENCRYPT_EMAIL`
 
@@ -176,15 +213,15 @@ The architecture below generalises all the deployment scenarios above, and provi
 ## 5. Configuration
 Several options are available on `cms/settings.py`, most of the things that are allowed or should be disallowed are described there.
 
-It is advisable to override any of them by adding it to `local_settings.py` . 
+It is advisable to override any of them by adding it to `local_settings.py` .
 
 In case of a the single server installation, add to `cms/local_settings.py` .
 
 In case of a docker compose installation, add to `deploy/docker/local_settings.py` . This will automatically overwrite `cms/local_settings.py` .
 
-Any change needs restart of MediaCMS in order to take effect. 
+Any change needs restart of MediaCMS in order to take effect.
 
-Single server installation: edit `cms/local_settings.py`, make a change and restart MediaCMS 
+Single server installation: edit `cms/local_settings.py`, make a change and restart MediaCMS
 
 ```bash
 #systemctl restart mediacms
@@ -212,7 +249,7 @@ PORTAL_NAME = 'my awesome portal'
 
 By default `CAN_ADD_MEDIA = "all"` means that all registered users can add media. Other valid options are:
 
-- **email_verified**, a user not only has to register an account but also verify the email (by clicking the link sent upon registration). Apparently email configuration need to work, otherise users won't receive emails. 
+- **email_verified**, a user not only has to register an account but also verify the email (by clicking the link sent upon registration). Apparently email configuration need to work, otherise users won't receive emails.
 
 - **advancedUser**, only users that are marked as advanced users can add media. Admins or MediaCMS managers can make users advanced users by editing their profile and selecting advancedUser.
 
@@ -281,7 +318,7 @@ Make changes (True/False) to any of the following:
 
 ### 5.9 Show or hide the download option on a media
 
-Edit `templates/config/installation/features.html` and set 
+Edit `templates/config/installation/features.html` and set
 
 ```
 download: false
@@ -290,7 +327,7 @@ download: false
 ### 5.10 Automatically hide media upon being reported
 
 set a low number for variable `REPORTED_TIMES_THRESHOLD`
-eg 
+eg
 
 ```
 REPORTED_TIMES_THRESHOLD = 2
@@ -323,13 +360,22 @@ ADMIN_EMAIL_LIST = ['info@mediacms.io']
 
 ### 5.13 Disallow user registrations from specific domains
 
-set domains that are not valid for registration via this variable:
+Set domains that are not valid for registration via this variable:
 
 ```
 RESTRICTED_DOMAINS_FOR_USER_REGISTRATION = [
     'xxx.com', 'emaildomainwhatever.com']
 ```
 
+Alternatively, allow only permitted domains to register.  This can be useful if you're using mediacms as a private service within an organization, and want to give free registration for those in the org, but deny registration from all other domains.  Setting this option bans all domains NOT in the list from registering.   Default is a blank list, which is ignored.   To disable, set to a blank list.
+```
+ALLOWED_DOMAINS_FOR_USER_REGISTRATION = [
+	"private.com",
+	"vod.private.com",
+	"my.favorite.domain",
+	"test.private.com"]
+```
+
 ### 5.14 Require a review by MediaCMS editors/managers/admins
 
 set value
@@ -338,7 +384,7 @@ set value
 MEDIA_IS_REVIEWED = False
 ```
 
-any uploaded media now needs to be reviewed before it can appear to the listings. 
+any uploaded media now needs to be reviewed before it can appear to the listings.
 MediaCMS editors/managers/admins can visit the media page and edit it, where they can see the option to mark media as reviewed. By default this is set to True, so all media don't require to be reviewed
 
 ### 5.15 Specify maximum number of media for a playlist
@@ -353,7 +399,7 @@ MAX_MEDIA_PER_PLAYLIST = 14
 
 ### 5.16 Specify maximum size of a media that can be uploaded
 
-change `UPLOAD_MAX_SIZE`. 
+change `UPLOAD_MAX_SIZE`.
 
 default is 4GB
 
@@ -416,7 +462,7 @@ Global notifications that are implemented are controlled by the following option
 
 ```
 USERS_NOTIFICATIONS = {
-    'MEDIA_ADDED': True,    
+    'MEDIA_ADDED': True,
 }
 ```
 
@@ -441,6 +487,24 @@ ADMINS_NOTIFICATIONS = {
 - Make the portal workflow public, but at the same time set `GLOBAL_LOGIN_REQUIRED = True` so that only logged in users can see content.
 - You can either set `REGISTER_ALLOWED = False` if you want to add members yourself or checkout options on "django-allauth settings" that affects registration in `cms/settings.py`. Eg set the portal invite only, or set email confirmation as mandatory, so that you control who registers.
 
+### 5.24 Enable the sitemap
+
+Whether or not to enable generation of a sitemap file at http://your_installation/sitemap.xml (default: False)
+
+```
+GENERATE_SITEMAP = False
+```
+
+
+### 5.25 Control who can add comments
+
+By default `CAN_COMMENT = "all"` means that all registered users can add comment. Other valid options are:
+
+- **email_verified**, a user not only has to register an account but also verify the email (by clicking the link sent upon registration). Apparently email configuration need to work, otherise users won't receive emails.
+
+- **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.
+
+
 ## 6. Manage pages
 to be written
 
@@ -459,17 +523,19 @@ to be written
 Through the admin section - http://your_installation/admin/
 
 ## 12. Video transcoding
-Add / remove resolutions and profiles through http://your_installation/admin/encodeprofile
+Add / remove resolutions and profiles by modifying the database table of `Encode profiles` through https://your_installation/admin/files/encodeprofile/
+
+For example, the `Active` state of any profile can be toggled to enable or disable it.
 
 ## 13. How To Add A Static Page To The Sidebar
 
-### 1. Create your html page in templates/cms/ 
+### 1. Create your html page in templates/cms/
 e.g. duplicate and rename about.html
 ```
 sudo cp templates/cms/about.html templates/cms/volunteer.html
 ```
 
-### 2. Create your css file in static/css/ 
+### 2. Create your css file in static/css/
 ```
 touch static/css/volunteer.css
 ```
@@ -533,24 +599,24 @@ urlpatterns = [
 
 ### 8. Add your page to the left sidebar
 To add a link to your page as a menu item in the left sidebar,
-add the following code after the last line in _commons.js   
+add the following code after the last line in _commons.js
 ```
 /* Checks that a given selector has loaded. */
 const checkElement = async selector => {
     while ( document.querySelector(selector) === null) {
       await new Promise( resolve =>  requestAnimationFrame(resolve) )
     }
-    return document.querySelector(selector); 
+    return document.querySelector(selector);
   };
 
 /* Checks that sidebar nav menu has loaded, then adds menu item. */
 checkElement('.nav-menu')
 .then((element) => {
-     (function(){    
-        var a = document.createElement('a');        
+     (function(){
+        var a = document.createElement('a');
         a.href = "/volunteer";
         a.title = "Volunteer";
-       
+
         var s = document.createElement('span');
         s.className = "menu-item-icon";
 
@@ -560,7 +626,7 @@ checkElement('.nav-menu')
 
         s.appendChild(icon);
         a.appendChild(s);
-    
+
         var linkText = document.createTextNode("Volunteer");
         var t = document.createElement('span');
 
@@ -572,14 +638,14 @@ checkElement('.nav-menu')
         listItem.appendChild(a);
 
         //if signed out use 3rd nav-menu
-        var elem = document.querySelector(".nav-menu:nth-child(3) nav ul"); 
+        var elem = document.querySelector(".nav-menu:nth-child(3) nav ul");
         var loc = elem.innerText;
         if (loc.includes("About")){
           elem.insertBefore(listItem, elem.children[2]);
         } else { //if signed in use 4th nav-menu
           elem = document.querySelector(".nav-menu:nth-child(4) nav ul");
           elem.insertBefore(listItem, elem.children[2]);
-        }       
+        }
     })();
 });
 ```
@@ -605,7 +671,7 @@ Instructions contributed by @alberto98fx
 
 2. Add the Gtag/Analytics script
 
-3. Inside ``` $DIR/mediacms/templates/root.html``` you'll see a file like this one: 
+3. Inside ``` $DIR/mediacms/templates/root.html``` you'll see a file like this one:
 
 ```
 <head>
@@ -616,7 +682,7 @@ Instructions contributed by @alberto98fx
         {% include "common/head-meta.html" %}
 
         {% block headermeta %}
-        
+
         <meta property="og:title" content="{{PORTAL_NAME}}">
         <meta property="og:type" content="website">
 
@@ -629,17 +695,17 @@ Instructions contributed by @alberto98fx
         {% block topimports %}{%endblock topimports %}
 
         {% include "config/index.html" %}
-      
+
     {% endblock head %}
 
 </head>
 ```
 
 4. Add  ``` {% include "tracking.html" %} ``` at the end inside the section ```<head>```
-  
-5. If you are using Docker and didn't  mount the entire dir you need to bind a new volume: 
+
+5. If you are using Docker and didn't  mount the entire dir you need to bind a new volume:
 ```
-  
+
     web:
     image: mediacms/mediacms:latest
     restart: unless-stopped
@@ -650,7 +716,7 @@ Instructions contributed by @alberto98fx
     volumes:
       - ./templates/root.html:/home/mediacms.io/mediacms/templates/root.html
       - ./templates/tracking.html://home/mediacms.io/mediacms/templates/tracking.html
-  
+
  ```
 
 ## 15. Debugging email issues
@@ -681,9 +747,229 @@ email = EmailMessage(
 email.send(fail_silently=False)
 ```
 
-You have the chance to either receive the email (in this case it will be sent to recipient@email.com) otherwise you will see the error. 
+You have the chance to either receive the email (in this case it will be sent to recipient@email.com) otherwise you will see the error.
 For example, while specifying wrong password for my Gmail account I get
 
 ```
 SMTPAuthenticationError: (535, b'5.7.8 Username and Password not accepted. Learn more at\n5.7.8  https://support.google.com/mail/?p=BadCredentials d4sm12687785wrc.34 - gsmtp')
 ```
+
+## 16. Frequently Asked Questions
+Video is playing but preview thumbnails are not showing for large video files
+
+Chances are that the sprites file was not created correctly.
+The output of files.tasks.produce_sprite_from_video() function in this case is something like this
+
+```
+convert-im6.q16: width or height exceeds limit `/tmp/img001.jpg' @ error/cache.c/OpenPixelCache/3912.
+```
+
+Solution: edit file `/etc/ImageMagick-6/policy.xml` and set bigger values for the lines that contain width and height. For example
+
+```
+  <policy domain="resource" name="height" value="16000KP"/>
+  <policy domain="resource" name="width" value="16000KP"/>
+```
+
+Newly added video files now will be able to produce the sprites file needed for thumbnail previews. To re-run that task on existing videos, enter the Django shell
+
+
+```
+root@8433f923ccf5:/home/mediacms.io/mediacms# source  /home/mediacms.io/bin/activate
+root@8433f923ccf5:/home/mediacms.io/mediacms# python manage.py shell
+Python 3.8.14 (default, Sep 13 2022, 02:23:58)
+```
+
+and run
+
+```
+In [1]: from files.models import Media
+In [2]: from files.tasks import produce_sprite_from_video
+
+In [3]: for media in Media.objects.filter(media_type='video', sprites=''):
+   ...:     produce_sprite_from_video(media.friendly_token)
+```
+
+this will re-create the sprites for videos that the task failed.
+
+
+## 17. Cookie consent code
+On file `templates/components/header.html` you can find a simple cookie consent code. It is commented, so you have to remove the `{% comment %}` and `{% endcomment %}` lines in order to enable it. Or you can replace that part with your own code that handles cookie consent banners.
+
+![Simple Cookie Consent](images/cookie_consent.png)
+
+## 18. Disable encoding and show only original file
+When videos are uploaded, they are getting encoded to multiple resolutions, a procedure called transcoding. Sometimes this is not needed and you only need to show the original file, eg when MediaCMS is running on a low capabilities server. To achieve this, edit settings.py and set
+
+```
+DO_NOT_TRANSCODE_VIDEO = True
+```
+
+This will disable the transcoding process and only the original file will be shown. Note that this will also disable the sprites file creation, so you will not have the preview thumbnails on the video player.
+
+## 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:
+
+```
+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
+
+### 20.1 Set a default language
+
+By default MediaCMS is available in a number of languages. To set the default language, edit `settings.py` and set LANGUAGE_CODE to the code of one of the languages.
+
+### 20.2 Remove existing languages
+To limit the number of languages that are shown as available, remove them from the LANGUAGES list in `settings.py` or comment them. Only what is there is shown.
+
+### 20.3 Improve existing translation
+To make improvements in existing translated content, in a language that is already translated, check the language by the code name in `files/frontend-translations/` and edit the corresponding file.
+
+### 20.4 Add more content to existing translation
+Not all text is translated, so at any time you may find strings missing that need to be added to the translation. The idea here is that
+
+a) you made the text as translatable, in the code
+b) you add the translated string
+
+For a), you have to see if the string to be translated lives in the frontend directory (React app) or on the Django templates. There are examples for both.
+1. the Django templates, which is found in templates/ dir. Have a look on `templates/cms/about.html` to see an example of how it is done
+2. the frontend code (React), have a look how `translateString` is used in `frontend`
+
+
+After the string is marked as translatable, add the string to `files/frontend-translations/en.py` first, and then run
+
+```
+python manage.py process_translations
+```
+
+In order to populate the string in all the languages. NO PR will be accepted if this procedure is not followed. You don't have to translate the string to all supported languages, but the command has to run and populate the existing dictionaries with the new strings for all languages. This ensures that there is no missing string to be translated in any language.
+
+After this command is run, translate the string to the language you want. If the string to be translated lives in Django templates, you don't have to re-build the frontend. If the change lives in the frontend, you will have to re-build in order to see the changes. The Makefile command `make build-frontend` can help with this.
+
+
+### 20.5 Add a new language and translate
+To add a new language: add the language in settings.py, then add the file in `files/frontend-translations/`. Make sure you copy the initial strings by copying `files/frontend-translations/en.py` to it.
+
+## 21. How to change the video frames on videos
+
+By default while watching a video you can hover and see the small images named sprites that are extracted every 10 seconds of a video. You can change this number to something smaller by performing the following:
+
+* edit ./frontend/src/static/js/components/media-viewer/VideoViewer/index.js and change `seconds: 10 ` to the value you prefer, eg 2.
+* edit settings.py and set the same number for value SPRITE_NUM_SECS
+* now you have to re-build the frontend: the easiest way is to run `make build-frontend`, which requires Docker
+
+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
+
+## 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. 
+

docs/dev_exp.md

@@ -0,0 +1,89 @@
+# Developer Experience
+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`
+
+```
+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
+
+### What does docker-compose-dev.yaml do?
+It build the two images used for backend and frontend.
+
+* Backend: `mediacms/mediacms-dev:latest`
+* Frontend: `frontend`
+
+and will start all services required for MediaCMS, as Celery/Redis for asynchronous tasks, PostgreSQL database, Django and React
+
+For Django, the changes from the image produced by docker-compose.yaml are these:
+
+* Django runs in debug mode, with `python manage.py runserver`
+* uwsgi and nginx are not run
+* Django runs in Debug mode, with Debug Toolbar
+* Static files (js/css) are loaded from static/ folder
+* corsheaders is installed and configured to allow all origins
+
+For React, it will run `npm start` in the frontend folder, which will start the development server.
+Check it on http://localhost:8088/
+
+### How to develop in Django
+Django starts at http://localhost and is reloading automatically. Making any change to the python code should refresh Django.
+
+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
+```
+
+
+
+### How to develop in React
+React is started on http://localhost:8088/ , code is located in frontend/ , so making changes there should have instant effect on the page. Keep in mind that React is loading data from Django, and that it has to be built so that Django can serve it.
+
+### Making changes to the frontend
+
+The way React is added is more complicated than the usual SPA project and this is because React is used as a library loaded by Django Templates, so it is not a standalone project and is not handling routes etc.
+
+The two directories to consider are:
+* frontend/src , for the React files
+* templates/, for the Django templates.
+
+Django is using a highly intuitive hierarchical templating system (https://docs.djangoproject.com/en/4.2/ref/templates/), where the base template is templates/root.html and all other templates are extending it.
+
+React is called through the Django templates, eg templates/cms/media.html is loading js/media.js
+
+In order to make changes to React code, edit code on frontend/src and check it's effect on http://localhost:8088/ . Once ready, build it and copy it to the Django static folder, so that it is served by Django.
+
+### 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`
+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
+6. Commit the changes
+
+### Helper commands
+There is ongoing effort to provide helper commands, check the Makefile for what it supports. Eg
+
+Bash into the web container:
+
+```
+user@user:~/mediacms$ make admin-shell
+root@ca8c1096726b:/home/mediacms.io/mediacms# ./manage.py shell
+```
+
+Build the frontend:
+
+```
+user@user:~/mediacms$ make build-frontend
+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

@@ -54,6 +54,13 @@ docker-compose -f docker-compose-dev.yaml build
 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`:
+```
+ADMIN_USER: 'admin'
+ADMIN_PASSWORD: 'admin'
+ADMIN_EMAIL: 'admin@localhost'
+```
+
 ### Frontend application changes
 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
 

docs/user_docs.md

@@ -6,6 +6,8 @@
 - [Adding captions/subtitles](#adding-captionssubtitles)
 - [Search media](#search-media)
 - [Using Timestamps for sharing](#using-timestamps-for-sharing)
+- [Mentionning users in comments](#Mentionning-users-in-comments)
+- [Show comments in the Timebar](#Show-comments-in-the-Timebar)
 - [Share media](#share-media)
 - [Embed media](#embed-media)
 - [Customize my profile options](#customize-my-profile-options)
@@ -220,6 +222,30 @@ Comments can also include timestamps. They are automatically detected upon posti
     <img src="./images/Demo3.png"/>
 </p>
 
+## Mentionning users in comments
+
+Comments can also mention other users by tagging with '@'. This will open suggestion box showing usernames, and the selection will refine as the user continues typing.
+
+Comments send with mentions will contain a link to the user page, and can be setup to send a mail to the mentionned user.
+
+<p align="left">
+    <img src="./images/Mention1.png"/>
+    <img src="./images/Mention2.png"/>
+    <img src="./images/Mention3.png"/>
+    <img src="./images/Mention4.png"/>
+</p>
+
+## Show comments in the Timebar
+
+When enabled, comments including a timestamp will also be displayed in the current video Timebar as a little colorful dot. The comment can be previewed by hovering the dot (left image) and it will be displayed on top of the video when reaching the correct time (right image).
+
+Only comments with correct timestamps formats (HH:MM:SS or MM:SS) will be picked up and appear in the Timebar.
+    
+<p align="left">
+    <img src="./images/TimebarComments_Hover.png" height="180" alt="Comment preview on hover"/>
+    <img src="./images/TimebarComments_Hit.png" height="180" alt="Comment shown when the timestamp is reached "/>
+</p>
+
 ## Search media
 How search can be used
 

files/admin.py

@@ -1,4 +1,10 @@
+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 rbac.models import RBACGroup
 
 from .models import (
     Category,
@@ -40,15 +46,135 @@ class MediaAdmin(admin.ModelAdmin):
     def get_comments_count(self, obj):
         return obj.comments.count()
 
+    @admin.action(description="Generate missing encoding(s)", permissions=["change"])
+    def generate_missing_encodings(modeladmin, request, queryset):
+        for m in queryset:
+            m.encode(force=False)
+
+    actions = [generate_missing_encodings]
     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"]
-    list_display = ["title", "user", "add_date", "is_global", "media_count"]
-    list_filter = ["is_global"]
+    form = CategoryAdminForm
+
+    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):
@@ -74,7 +200,18 @@ class SubtitleAdmin(admin.ModelAdmin):
 
 
 class EncodingAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["get_title", "chunk", "profile", "progress", "status", "has_file"]
+    list_filter = ["chunk", "profile", "status"]
+
+    def get_title(self, obj):
+        return str(obj)
+
+    get_title.short_description = "Encoding"
+
+    def has_file(self, obj):
+        return obj.media_encoding_url is not None
+
+    has_file.short_description = "Has file"
 
 
 admin.site.register(EncodeProfile, EncodeProfileAdmin)
@@ -85,3 +222,5 @@ admin.site.register(Category, CategoryAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(Subtitle, SubtitleAdmin)
 admin.site.register(Language, LanguageAdmin)
+
+Media._meta.app_config.verbose_name = "Media"

files/backends.py

@@ -15,7 +15,7 @@ class VideoEncodingError(Exception):
 
 
 RE_TIMECODE = re.compile(r"time=(\d+:\d+:\d+.\d+)")
-console_encoding = locale.getdefaultlocale()[1] or "UTF-8"
+console_encoding = locale.getlocale()[1] or "UTF-8"
 
 
 class FFmpegBackend(object):

files/context_processors.py

@@ -1,18 +1,22 @@
 from django.conf import settings
 
+from .frontend_translations import get_translation, get_translation_strings
 from .methods import is_mediacms_editor, is_mediacms_manager
 
 
 def stuff(request):
     """Pass settings to the frontend"""
     ret = {}
-    ret["FRONTEND_HOST"] = request.build_absolute_uri('/')
+    ret["FRONTEND_HOST"] = request.build_absolute_uri('/').rstrip('/')
     ret["DEFAULT_THEME"] = settings.DEFAULT_THEME
     ret["PORTAL_NAME"] = settings.PORTAL_NAME
+    ret["PORTAL_DESCRIPTION"] = settings.PORTAL_DESCRIPTION
     ret["LOAD_FROM_CDN"] = settings.LOAD_FROM_CDN
     ret["CAN_LOGIN"] = settings.LOGIN_ALLOWED
     ret["CAN_REGISTER"] = settings.REGISTER_ALLOWED
     ret["CAN_UPLOAD_MEDIA"] = settings.UPLOAD_MEDIA_ALLOWED
+    ret["TIMESTAMP_IN_TIMEBAR"] = settings.TIMESTAMP_IN_TIMEBAR
+    ret["CAN_MENTION_IN_COMMENTS"] = settings.ALLOW_MENTION_IN_COMMENTS
     ret["CAN_LIKE_MEDIA"] = settings.CAN_LIKE_MEDIA
     ret["CAN_DISLIKE_MEDIA"] = settings.CAN_DISLIKE_MEDIA
     ret["CAN_REPORT_MEDIA"] = settings.CAN_REPORT_MEDIA
@@ -28,4 +32,10 @@ def stuff(request):
     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
+    if request.user.is_superuser:
+        ret["DJANGO_ADMIN_URL"] = settings.DJANGO_ADMIN_URL
+
     return ret

files/feeds.py

@@ -102,7 +102,7 @@ class SearchRSSFeed(Feed):
     description = "Latest Media RSS feed"
 
     def link(self, obj):
-        return f"/rss/search"
+        return "/rss/search"
 
     def get_object(self, request):
         category = request.GET.get("c", "")

files/forms.py

@@ -1,7 +1,8 @@
 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 Category, Media, Subtitle
 
 
 class MultipleSelect(forms.CheckboxSelectMultiple):
@@ -41,6 +42,25 @@ class MediaForm(forms.ModelForm):
             self.fields.pop("featured")
             self.fields.pop("reported_times")
             self.fields.pop("is_reviewed")
+        #           if settings.PORTAL_WORKFLOW == 'private':
+        #                self.fields.pop("state")
+
+        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.fields["new_tags"].initial = ", ".join([tag.title for tag in self.instance.tags.all()])
 
     def clean_uploaded_poster(self):
@@ -68,6 +88,8 @@ class SubtitleForm(forms.ModelForm):
     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"
 
     def save(self, *args, **kwargs):
         self.instance.user = self.instance.media.user
@@ -75,6 +97,14 @@ class SubtitleForm(forms.ModelForm):
         return media
 
 
+class EditSubtitleForm(forms.Form):
+    subtitle = forms.CharField(widget=forms.Textarea, required=True)
+
+    def __init__(self, subtitle, *args, **kwargs):
+        super(EditSubtitleForm, self).__init__(*args, **kwargs)
+        self.fields["subtitle"].initial = subtitle.subtitle_file.read().decode("utf-8")
+
+
 class ContactForm(forms.Form):
     from_email = forms.EmailField(required=True)
     name = forms.CharField(required=False)

files/frontend_translations/__init__.py

@@ -0,0 +1,60 @@
+import importlib
+import os
+
+from django.conf import settings
+
+current_dir = os.path.dirname(os.path.abspath(__file__))
+files = os.listdir(current_dir)
+translation_strings = {}
+replacement_strings = {}
+
+
+def check_language_code(language_code):
+    # helper function
+    if language_code not in [pair[0] for pair in settings.LANGUAGES]:
+        return False
+    if language_code in ['en', 'en-us', 'en-gb']:
+        return False
+    return True
+
+
+for translation_file in files:
+    # the language code is zh-hans but the file is zh_hans.py
+
+    language_code_file = translation_file.split('.')[0]
+    language_code = language_code_file.replace('_', '-')
+    if not check_language_code(language_code):
+        continue
+
+    module_name = f"files.frontend_translations.{language_code_file}"
+    tr_module = importlib.import_module(module_name)
+    translation_strings[language_code] = tr_module.translation_strings
+    replacement_strings[language_code] = tr_module.replacement_strings
+
+
+def get_translation(language_code):
+    # get list of translations per language
+    if not check_language_code(language_code):
+        return {}
+
+    translation = translation_strings[language_code]
+
+    return translation
+
+
+def get_translation_strings(language_code):
+    # get list of replacement strings per language
+    if not check_language_code(language_code):
+        return {}
+
+    translation = replacement_strings[language_code]
+
+    return translation
+
+
+def translate_string(language_code, string):
+    # translate a string to the given language
+    if not check_language_code(language_code):
+        return string
+
+    return translation_strings[language_code].get(string, string)

files/frontend_translations/ar.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "حول",
+    "AUTOPLAY": "تشغيل تلقائي",
+    "About": "حول",
+    "Add a ": "أضف ",
+    "COMMENT": "تعليق",
+    "Categories": "الفئات",
+    "Category": "الفئة",
+    "Change Language": "تغيير اللغة",
+    "Change password": "تغيير كلمة المرور",
+    "Comment": "تعليق",
+    "Comments": "تعليقات",
+    "Comments are disabled": "التعليقات معطلة",
+    "Contact": "اتصل",
+    "DELETE MEDIA": "حذف الوسائط",
+    "DOWNLOAD": "تحميل",
+    "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": "مدعوم من",
+    "Published on": "نشر في",
+    "Recommended": "موصى به",
+    "Register": "تسجيل",
+    "SAVE": "حفظ",
+    "SEARCH": "بحث",
+    "SHARE": "مشاركة",
+    "SHOW MORE": "عرض المزيد",
+    "SUBMIT": "إرسال",
+    "Search": "بحث",
+    "Select": "اختر",
+    "Sign in": "تسجيل الدخول",
+    "Sign out": "تسجيل الخروج",
+    "Subtitle was added": "تمت إضافة الترجمة",
+    "Tags": "العلامات",
+    "Terms": "الشروط",
+    "UPLOAD": "رفع",
+    "Up next": "التالي",
+    "Upload": "رفع",
+    "Upload media": "رفع الوسائط",
+    "Uploads": "التحميلات",
+    "VIEW ALL": "عرض الكل",
+    "View all": "عرض الكل",
+    "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": "وسائط في العلامة",
+    "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/bn.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "সম্পর্কে",
+    "AUTOPLAY": "স্বয়ংক্রিয় প্লে",
+    "About": "সম্পর্কে",
+    "Add a ": "যোগ করুন",
+    "COMMENT": "মন্তব্য",
+    "Categories": "বিভাগসমূহ",
+    "Category": "বিভাগ",
+    "Change Language": "ভাষা পরিবর্তন করুন",
+    "Change password": "পাসওয়ার্ড পরিবর্তন করুন",
+    "Comment": "মন্তব্য",
+    "Comments": "মন্তব্যসমূহ",
+    "Comments are disabled": "মন্তব্য নিষ্ক্রিয় করা হয়েছে",
+    "Contact": "যোগাযোগ",
+    "DELETE MEDIA": "মিডিয়া মুছুন",
+    "DOWNLOAD": "ডাউনলোড",
+    "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": "দ্বারা চালিত",
+    "Published on": "প্রকাশিত",
+    "Recommended": "প্রস্তাবিত",
+    "Register": "নিবন্ধন করুন",
+    "SAVE": "সংরক্ষণ করুন",
+    "SEARCH": "অনুসন্ধান",
+    "SHARE": "শেয়ার করুন",
+    "SHOW MORE": "আরও দেখুন",
+    "SUBMIT": "জমা দিন",
+    "Search": "অনুসন্ধান",
+    "Select": "নির্বাচন করুন",
+    "Sign in": "সাইন ইন করুন",
+    "Sign out": "সাইন আউট করুন",
+    "Subtitle was added": "সাবটাইটেল যোগ করা হয়েছে",
+    "Tags": "ট্যাগ",
+    "Terms": "শর্তাবলী",
+    "UPLOAD": "আপলোড করুন",
+    "Up next": "পরবর্তী",
+    "Upload": "আপলোড করুন",
+    "Upload media": "মিডিয়া আপলোড করুন",
+    "Uploads": "আপলোডসমূহ",
+    "VIEW ALL": "সব দেখুন",
+    "View all": "সব দেখুন",
+    "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": "ট্যাগে মিডিয়া",
+    "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/de.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "Über",
+    "AUTOPLAY": "Automatische Wiedergabe",
+    "About": "Über",
+    "Add a ": "Hinzufügen eines ",
+    "COMMENT": "KOMMENTAR",
+    "Categories": "Kategorien",
+    "Category": "Kategorie",
+    "Change Language": "Sprache ändern",
+    "Change password": "Passwort ändern",
+    "Comment": "Kommentar",
+    "Comments": "Kommentare",
+    "Comments are disabled": "Kommentare sind deaktiviert",
+    "Contact": "Kontakt",
+    "DELETE MEDIA": "MEDIEN LÖSCHEN",
+    "DOWNLOAD": "HERUNTERLADEN",
+    "EDIT MEDIA": "MEDIEN BEARBEITEN",
+    "EDIT PROFILE": "PROFIL BEARBEITEN",
+    "EDIT SUBTITLE": "UNTERTITEL BEARBEITEN",
+    "Edit media": "Medien bearbeiten",
+    "Edit profile": "Profil bearbeiten",
+    "Edit subtitle": "Untertitel bearbeiten",
+    "Featured": "Empfohlen",
+    "Go": "Los",
+    "History": "Verlauf",
+    "Home": "Startseite",
+    "Language": "Sprache",
+    "Latest": "Neueste",
+    "Liked media": "Beliebte Medien",
+    "Manage comments": "Kommentare verwalten",
+    "Manage media": "Medien verwalten",
+    "Manage users": "Benutzer verwalten",
+    "Media": "Medien",
+    "Media was edited": "Medien wurden bearbeitet",
+    "Members": "Mitglieder",
+    "My media": "Meine Medien",
+    "My playlists": "Meine Playlists",
+    "No": "Nein",
+    "No comment yet": "Noch kein Kommentar",
+    "No comments yet": "Noch keine Kommentare",
+    "No results for": "Keine Ergebnisse für",
+    "PLAYLISTS": "PLAYLISTS",
+    "Playlists": "Playlists",
+    "Powered by": "Bereitgestellt von",
+    "Published on": "Veröffentlicht am",
+    "Recommended": "Empfohlen",
+    "Register": "Registrieren",
+    "SAVE": "SPEICHERN",
+    "SEARCH": "SUCHE",
+    "SHARE": "TEILEN",
+    "SHOW MORE": "MEHR ANZEIGEN",
+    "SUBMIT": "ABSENDEN",
+    "Search": "Suche",
+    "Select": "Auswählen",
+    "Sign in": "Anmelden",
+    "Sign out": "Abmelden",
+    "Subtitle was added": "Untertitel wurde hinzugefügt",
+    "Tags": "Tags",
+    "Terms": "Bedingungen",
+    "UPLOAD": "HOCHLADEN",
+    "Up next": "Als nächstes",
+    "Upload": "Hochladen",
+    "Upload media": "Medien hochladen",
+    "Uploads": "Uploads",
+    "VIEW ALL": "ALLE ANZEIGEN",
+    "View all": "Alle 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",
+    "view": "Ansicht",
+    "views": "Ansichten",
+    "yet": "noch",
+}
+
+replacement_strings = {
+    "Apr": "Apr",
+    "Aug": "Aug",
+    "Dec": "Dez",
+    "Feb": "Feb",
+    "Jan": "Jan",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mär",
+    "May": "Mai",
+    "Nov": "Nov",
+    "Oct": "Okt",
+    "Sep": "Sep",
+    "day ago": "vor einem Tag",
+    "days ago": "vor Tagen",
+    "hour ago": "vor einer Stunde",
+    "hours ago": "vor Stunden",
+    "just now": "gerade eben",
+    "minute ago": "vor einer Minute",
+    "minutes ago": "vor Minuten",
+    "month ago": "vor einem Monat",
+    "months ago": "vor Monaten",
+    "second ago": "vor einer Sekunde",
+    "seconds ago": "vor Sekunden",
+    "week ago": "vor einer Woche",
+    "weeks ago": "vor Wochen",
+    "year ago": "vor einem Jahr",
+    "years ago": "vor Jahren",
+}

files/frontend_translations/el.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "ΣΧΕΤΙΚΑ",
+    "AUTOPLAY": "Αυτόματη αναπαραγωγή",
+    "About": "Σχετικά",
+    "Add a ": "Προσθέστε ένα ",
+    "COMMENT": "ΣΧΟΛΙΟ",
+    "Categories": "Κατηγορίες",
+    "Category": "Κατηγορία",
+    "Change Language": "Αλλαγή Γλώσσας",
+    "Change password": "Αλλαγή κωδικού",
+    "Comment": "Σχόλιο",
+    "Comments": "Σχόλια",
+    "Comments are disabled": "Τα σχόλια είναι απενεργοποιημένα",
+    "Contact": "Επικοινωνία",
+    "DELETE MEDIA": "ΔΙΑΓΡΑΦΗ ΑΡΧΕΙΟΥ",
+    "DOWNLOAD": "ΚΑΤΕΒΑΣΜΑ",
+    "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": "Υποστηρίζεται από το",
+    "Published on": "Δημοσιεύτηκε στις",
+    "Recommended": "Προτεινόμενα",
+    "Register": "Εγγραφή",
+    "SAVE": "ΑΠΟΘΗΚΕΥΣΗ",
+    "SEARCH": "ΑΝΑΖΗΤΗΣΗ",
+    "SHARE": "ΚΟΙΝΟΠΟΙΗΣΗ",
+    "SHOW MORE": "ΠΕΡΙΣΣΟΤΕΡΑ",
+    "SUBMIT": "ΥΠΟΒΟΛΗ",
+    "Search": "Αναζήτηση",
+    "Select": "Επιλογή",
+    "Sign in": "Σύνδεση",
+    "Sign out": "Αποσύνδεση",
+    "Subtitle was added": "Οι υπότιτλοι προστέθηκαν",
+    "Tags": "Ετικέτες",
+    "Terms": "Όροι",
+    "UPLOAD": "ΑΝΕΒΑΣΜΑ",
+    "Up next": "Επόμενο",
+    "Upload": "Ανέβασμα αρχείου",
+    "Upload media": "Ανέβασμα αρχείων",
+    "Uploads": "Ανεβάσματα",
+    "VIEW ALL": "ΔΕΣ ΤΑ ΟΛΑ",
+    "View all": "Δές τα όλα",
+    "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": "αρχεία με ετικέτα",
+    "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/en.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "",
+    "AUTOPLAY": "",
+    "Add a ": "",
+    "COMMENT": "",
+    "Categories": "",
+    "Category": "",
+    "Change Language": "",
+    "Change password": "",
+    "About": "",
+    "Comment": "",
+    "Comments": "",
+    "Comments are disabled": "",
+    "Contact": "",
+    "DELETE MEDIA": "",
+    "DOWNLOAD": "",
+    "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": "",
+    "Published on": "",
+    "Recommended": "",
+    "Register": "",
+    "SAVE": "",
+    "SEARCH": "",
+    "SHARE": "",
+    "SHOW MORE": "",
+    "SUBMIT": "",
+    "Search": "",
+    "Select": "",
+    "Sign in": "",
+    "Sign out": "",
+    "Subtitle was added": "",
+    "Tags": "",
+    "Terms": "",
+    "UPLOAD": "",
+    "Up next": "",
+    "Upload": "",
+    "Upload media": "",
+    "Uploads": "",
+    "VIEW ALL": "",
+    "View all": "",
+    "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": "",
+    "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/es.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "Acerca de",
+    "AUTOPLAY": "Reproducción automática",
+    "About": "Acerca de",
+    "Add a ": "Agregar un ",
+    "COMMENT": "COMENTARIO",
+    "Categories": "Categorías",
+    "Category": "Categoría",
+    "Change Language": "Cambiar idioma",
+    "Change password": "Cambiar contraseña",
+    "Comment": "Comentario",
+    "Comments": "Comentarios",
+    "Comments are disabled": "Los comentarios están deshabilitados",
+    "Contact": "Contacto",
+    "DELETE MEDIA": "ELIMINAR MEDIOS",
+    "DOWNLOAD": "DESCARGAR",
+    "EDIT MEDIA": "EDITAR MEDIOS",
+    "EDIT PROFILE": "EDITAR PERFIL",
+    "EDIT SUBTITLE": "EDITAR SUBTÍTULO",
+    "Edit media": "Editar medios",
+    "Edit profile": "Editar perfil",
+    "Edit subtitle": "Editar subtítulo",
+    "Featured": "Destacado",
+    "Go": "Ir",
+    "History": "Historial",
+    "Home": "Inicio",
+    "Language": "Idioma",
+    "Latest": "Último",
+    "Liked media": "Medios que me gustan",
+    "Manage comments": "Gestionar comentarios",
+    "Manage media": "Gestionar medios",
+    "Manage users": "Gestionar usuarios",
+    "Media": "Medios",
+    "Media was edited": "El medio fue editado",
+    "Members": "Miembros",
+    "My media": "Mis medios",
+    "My playlists": "Mis listas de reproducción",
+    "No": "No",
+    "No comment yet": "Aún no hay comentarios",
+    "No comments yet": "Aún no hay comentarios",
+    "No results for": "No hay resultados para",
+    "PLAYLISTS": "LISTAS DE REPRODUCCIÓN",
+    "Playlists": "Listas de reproducción",
+    "Powered by": "Desarrollado por",
+    "Published on": "Publicado en",
+    "Recommended": "Recomendado",
+    "Register": "Registrarse",
+    "SAVE": "GUARDAR",
+    "SEARCH": "BUSCAR",
+    "SHARE": "COMPARTIR",
+    "SHOW MORE": "MOSTRAR MÁS",
+    "SUBMIT": "ENVIAR",
+    "Search": "Buscar",
+    "Select": "Seleccionar",
+    "Sign in": "Iniciar sesión",
+    "Sign out": "Cerrar sesión",
+    "Subtitle was added": "El subtítulo fue agregado",
+    "Tags": "Etiquetas",
+    "Terms": "Términos",
+    "UPLOAD": "SUBIR",
+    "Up next": "A continuación",
+    "Upload": "Subir",
+    "Upload media": "Subir medios",
+    "Uploads": "Subidas",
+    "VIEW ALL": "VER TODO",
+    "View all": "Ver todo",
+    "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",
+    "view": "vista",
+    "views": "vistas",
+    "yet": "aún",
+}
+
+replacement_strings = {
+    "Apr": "Abr",
+    "Aug": "Ago",
+    "Dec": "Dic",
+    "Feb": "Feb",
+    "Jan": "Ene",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mar",
+    "May": "May",
+    "Nov": "Nov",
+    "Oct": "Oct",
+    "Sep": "Sep",
+    "day ago": "hace un día",
+    "days ago": "hace días",
+    "hour ago": "hace una hora",
+    "hours ago": "hace horas",
+    "just now": "justo ahora",
+    "minute ago": "hace un minuto",
+    "minutes ago": "hace minutos",
+    "month ago": "hace un mes",
+    "months ago": "hace meses",
+    "second ago": "hace un segundo",
+    "seconds ago": "hace segundos",
+    "week ago": "hace una semana",
+    "weeks ago": "hace semanas",
+    "year ago": "hace un año",
+    "years ago": "hace años",
+}

files/frontend_translations/fr.py

@@ -0,0 +1,105 @@
+translation_strings = {
+    "ABOUT": "À PROPOS",
+    "AUTOPLAY": "Lecture automatique",
+    "About": "À propos",
+    "Add a": "Ajouter un",
+    "Add a ": "",
+    "COMMENT": "COMMENTAIRE",
+    "Categories": "Catégories",
+    "Category": "Catégorie",
+    "Change Language": "Changer de langue",
+    "Change password": "Changer le mot de passe",
+    "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",
+    "EDIT MEDIA": "MODIFIER LE MÉDIA",
+    "EDIT PROFILE": "MODIFIER LE PROFIL",
+    "EDIT SUBTITLE": "MODIFIER LE SOUS-TITRE",
+    "Edit media": "Modifier le média",
+    "Edit profile": "Modifier le profil",
+    "Edit subtitle": "Modifier le sous-titre",
+    "Featured": "En vedette",
+    "Go": "Aller",
+    "History": "Historique",
+    "Home": "Accueil",
+    "Language": "Langue",
+    "Latest": "Dernier",
+    "Liked media": "Médias aimés",
+    "Manage comments": "Gérer les commentaires",
+    "Manage media": "Gérer les médias",
+    "Manage users": "Gérer les utilisateurs",
+    "Media": "Média",
+    "Media was edited": "Le média a été modifié",
+    "Members": "Membres",
+    "My media": "Mes médias",
+    "My playlists": "Mes playlists",
+    "No": "Non",
+    "No comment yet": "Pas encore de commentaire",
+    "No comments yet": "Pas encore de commentaires",
+    "No results for": "Aucun résultat pour",
+    "PLAYLISTS": "PLAYLISTS",
+    "Playlists": "Playlists",
+    "Powered by": "Propulsé par",
+    "Published on": "Publié le",
+    "Recommended": "Recommandé",
+    "Register": "S'inscrire",
+    "SAVE": "ENREGISTRER",
+    "SEARCH": "RECHERCHER",
+    "SHARE": "PARTAGER",
+    "SHOW MORE": "MONTRER PLUS",
+    "SUBMIT": "SOUMETTRE",
+    "Search": "Rechercher",
+    "Select": "Sélectionner",
+    "Sign in": "Se connecter",
+    "Sign out": "Se déconnecter",
+    "Subtitle was added": "Le sous-titre a été ajouté",
+    "Tags": "Tags",
+    "Terms": "Conditions",
+    "UPLOAD": "TÉLÉCHARGER",
+    "Up next": "À suivre",
+    "Upload": "Télécharger",
+    "Upload media": "Télécharger des médias",
+    "Uploads": "Téléchargements",
+    "VIEW ALL": "VOIR TOUT",
+    "View all": "Voir tout",
+    "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",
+    "view": "vue",
+    "views": "vues",
+    "yet": "encore",
+}
+
+replacement_strings = {
+    "Apr": "Avr",
+    "Aug": "Aoû",
+    "Dec": "Déc",
+    "Feb": "Fév",
+    "Jan": "Jan",
+    "Jul": "Juil",
+    "Jun": "Juin",
+    "Mar": "Mar",
+    "May": "Mai",
+    "Nov": "Nov",
+    "Oct": "Oct",
+    "Sep": "Sep",
+    "day ago": "il y a un jour",
+    "days ago": "il y a quelques jours",
+    "hour ago": "il y a une heure",
+    "hours ago": "il y a quelques heures",
+    "just now": "à l'instant",
+    "minute ago": "il y a une minute",
+    "minutes ago": "il y a quelques minutes",
+    "month ago": "il y a un mois",
+    "months ago": "il y a quelques mois",
+    "second ago": "il y a une seconde",
+    "seconds ago": "il y a quelques secondes",
+    "week ago": "il y a une semaine",
+    "weeks ago": "il y a quelques semaines",
+    "year ago": "il y a un an",
+    "years ago": "il y a quelques années",
+}

files/frontend_translations/hi.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "के बारे में",
+    "AUTOPLAY": "स्वतः चलाएं",
+    "About": "के बारे में",
+    "Add a ": "जोड़ें",
+    "COMMENT": "टिप्पणी",
+    "Categories": "श्रेणियाँ",
+    "Category": "श्रेणी",
+    "Change Language": "भाषा बदलें",
+    "Change password": "पासवर्ड बदलें",
+    "Comment": "टिप्पणी",
+    "Comments": "टिप्पणियाँ",
+    "Comments are disabled": "टिप्पणियाँ अक्षम हैं",
+    "Contact": "संपर्क करें",
+    "DELETE MEDIA": "मीडिया हटाएं",
+    "DOWNLOAD": "डाउनलोड करें",
+    "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": "द्वारा संचालित",
+    "Published on": "पर प्रकाशित",
+    "Recommended": "अनुशंसित",
+    "Register": "पंजीकरण करें",
+    "SAVE": "सहेजें",
+    "SEARCH": "खोजें",
+    "SHARE": "साझा करें",
+    "SHOW MORE": "और दिखाएं",
+    "SUBMIT": "प्रस्तुत करें",
+    "Search": "खोजें",
+    "Select": "चुनें",
+    "Sign in": "साइन इन करें",
+    "Sign out": "साइन आउट करें",
+    "Subtitle was added": "उपशीर्षक जोड़ा गया",
+    "Tags": "टैग",
+    "Terms": "शर्तें",
+    "UPLOAD": "अपलोड करें",
+    "Up next": "अगला",
+    "Upload": "अपलोड करें",
+    "Upload media": "मीडिया अपलोड करें",
+    "Uploads": "अपलोड",
+    "VIEW ALL": "सभी देखें",
+    "View all": "सभी देखें",
+    "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": "टैग में मीडिया",
+    "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/id.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "TENTANG",
+    "AUTOPLAY": "PUTAR OTOMATIS",
+    "About": "Tentang",
+    "Add a ": "Tambahkan ",
+    "COMMENT": "KOMENTAR",
+    "Categories": "Kategori",
+    "Category": "Kategori",
+    "Change Language": "Ganti Bahasa",
+    "Change password": "Ganti kata sandi",
+    "Comment": "Komentar",
+    "Comments": "Komentar",
+    "Comments are disabled": "Komentar dinonaktifkan",
+    "Contact": "Kontak",
+    "DELETE MEDIA": "HAPUS MEDIA",
+    "DOWNLOAD": "UNDUH",
+    "EDIT MEDIA": "EDIT MEDIA",
+    "EDIT PROFILE": "EDIT PROFIL",
+    "EDIT SUBTITLE": "EDIT SUBTITLE",
+    "Edit media": "Edit media",
+    "Edit profile": "Edit profil",
+    "Edit subtitle": "Edit subtitle",
+    "Featured": "Unggulan",
+    "Go": "Pergi",
+    "History": "Riwayat",
+    "Home": "Beranda",
+    "Language": "Bahasa",
+    "Latest": "Terbaru",
+    "Liked media": "Media yang disukai",
+    "Manage comments": "Kelola komentar",
+    "Manage media": "Kelola media",
+    "Manage users": "Kelola pengguna",
+    "Media": "Media",
+    "Media was edited": "Media telah diedit",
+    "Members": "Anggota",
+    "My media": "Media saya",
+    "My playlists": "Daftar putar saya",
+    "No": "Tidak",
+    "No comment yet": "Belum ada komentar",
+    "No comments yet": "Belum ada komentar",
+    "No results for": "Tidak ada hasil untuk",
+    "PLAYLISTS": "DAFTAR PUTAR",
+    "Playlists": "Daftar putar",
+    "Powered by": "Didukung oleh",
+    "Published on": "Diterbitkan pada",
+    "Recommended": "Direkomendasikan",
+    "Register": "Daftar",
+    "SAVE": "SIMPAN",
+    "SEARCH": "CARI",
+    "SHARE": "BAGIKAN",
+    "SHOW MORE": "TAMPILKAN LEBIH BANYAK",
+    "SUBMIT": "KIRIM",
+    "Search": "Cari",
+    "Select": "Pilih",
+    "Sign in": "Masuk",
+    "Sign out": "Keluar",
+    "Subtitle was added": "Subtitle telah ditambahkan",
+    "Tags": "Tag",
+    "Terms": "Ketentuan",
+    "UPLOAD": "UNGGAH",
+    "Up next": "Selanjutnya",
+    "Upload": "Unggah",
+    "Upload media": "Unggah media",
+    "Uploads": "Unggahan",
+    "VIEW ALL": "LIHAT SEMUA",
+    "View all": "Lihat semua",
+    "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",
+    "view": "lihat",
+    "views": "tampilan",
+    "yet": "belum",
+}
+
+replacement_strings = {
+    "Apr": "Apr",
+    "Aug": "Agu",
+    "Dec": "Des",
+    "Feb": "Feb",
+    "Jan": "Jan",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mar",
+    "May": "Mei",
+    "Nov": "Nov",
+    "Oct": "Okt",
+    "Sep": "Sep",
+    "day ago": "hari yang lalu",
+    "days ago": "hari yang lalu",
+    "hour ago": "jam yang lalu",
+    "hours ago": "jam yang lalu",
+    "just now": "baru saja",
+    "minute ago": "menit yang lalu",
+    "minutes ago": "menit yang lalu",
+    "month ago": "bulan yang lalu",
+    "months ago": "bulan yang lalu",
+    "second ago": "detik yang lalu",
+    "seconds ago": "detik yang lalu",
+    "week ago": "minggu yang lalu",
+    "weeks ago": "minggu yang lalu",
+    "year ago": "tahun yang lalu",
+    "years ago": "tahun yang lalu",
+}

files/frontend_translations/ja.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "約",
+    "AUTOPLAY": "自動再生",
+    "About": "約",
+    "Add a ": "追加",
+    "COMMENT": "コメント",
+    "Categories": "カテゴリー",
+    "Category": "カテゴリー",
+    "Change Language": "言語を変更",
+    "Change password": "パスワードを変更",
+    "Comment": "コメント",
+    "Comments": "コメント",
+    "Comments are disabled": "コメントは無効です",
+    "Contact": "連絡先",
+    "DELETE MEDIA": "メディアを削除",
+    "DOWNLOAD": "ダウンロード",
+    "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": "提供",
+    "Published on": "公開日",
+    "Recommended": "おすすめ",
+    "Register": "登録",
+    "SAVE": "保存",
+    "SEARCH": "検索",
+    "SHARE": "共有",
+    "SHOW MORE": "もっと見る",
+    "SUBMIT": "送信",
+    "Search": "検索",
+    "Select": "選択",
+    "Sign in": "サインイン",
+    "Sign out": "サインアウト",
+    "Subtitle was added": "字幕が追加されました",
+    "Tags": "タグ",
+    "Terms": "利用規約",
+    "UPLOAD": "アップロード",
+    "Up next": "次に再生",
+    "Upload": "アップロード",
+    "Upload media": "メディアをアップロード",
+    "Uploads": "アップロード",
+    "VIEW ALL": "すべて表示",
+    "View all": "すべて表示",
+    "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": "タグ内のメディア",
+    "view": "ビュー",
+    "views": "ビュー",
+    "yet": "まだ",
+}
+
+replacement_strings = {
+    "Apr": "4月",
+    "Aug": "8月",
+    "Dec": "12月",
+    "Feb": "2月",
+    "Jan": "1月",
+    "Jul": "7月",
+    "Jun": "6月",
+    "Mar": "3月",
+    "May": "5月",
+    "Nov": "11月",
+    "Oct": "10月",
+    "Sep": "9月",
+    "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/ko.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "정보",
+    "AUTOPLAY": "자동 재생",
+    "About": "정보",
+    "Add a ": "추가",
+    "COMMENT": "댓글",
+    "Categories": "카테고리",
+    "Category": "카테고리",
+    "Change Language": "언어 변경",
+    "Change password": "비밀번호 변경",
+    "Comment": "댓글",
+    "Comments": "댓글",
+    "Comments are disabled": "댓글이 비활성화되었습니다",
+    "Contact": "연락처",
+    "DELETE MEDIA": "미디어 삭제",
+    "DOWNLOAD": "다운로드",
+    "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": "제공",
+    "Published on": "게시일",
+    "Recommended": "추천",
+    "Register": "등록",
+    "SAVE": "저장",
+    "SEARCH": "검색",
+    "SHARE": "공유",
+    "SHOW MORE": "더 보기",
+    "SUBMIT": "제출",
+    "Search": "검색",
+    "Select": "선택",
+    "Sign in": "로그인",
+    "Sign out": "로그아웃",
+    "Subtitle was added": "자막이 추가되었습니다",
+    "Tags": "태그",
+    "Terms": "약관",
+    "UPLOAD": "업로드",
+    "Up next": "다음",
+    "Upload": "업로드",
+    "Upload media": "미디어 업로드",
+    "Uploads": "업로드",
+    "VIEW ALL": "모두 보기",
+    "View all": "모두 보기",
+    "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": "태그의 미디어",
+    "view": "보기",
+    "views": "조회수",
+    "yet": "아직",
+}
+
+replacement_strings = {
+    "Apr": "4월",
+    "Aug": "8월",
+    "Dec": "12월",
+    "Feb": "2월",
+    "Jan": "1월",
+    "Jul": "7월",
+    "Jun": "6월",
+    "Mar": "3월",
+    "May": "5월",
+    "Nov": "11월",
+    "Oct": "10월",
+    "Sep": "9월",
+    "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/nl.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "OVER",
+    "AUTOPLAY": "AUTOMATISCH AFSPELEN",
+    "About": "Over",
+    "Add a ": "Voeg een ",
+    "COMMENT": "REACTIE",
+    "Categories": "Categorieën",
+    "Category": "Categorie",
+    "Change Language": "Taal wijzigen",
+    "Change password": "Wachtwoord wijzigen",
+    "Comment": "Reactie",
+    "Comments": "Reacties",
+    "Comments are disabled": "Reacties zijn uitgeschakeld",
+    "Contact": "Contact",
+    "DELETE MEDIA": "MEDIA VERWIJDEREN",
+    "DOWNLOAD": "DOWNLOADEN",
+    "EDIT MEDIA": "MEDIA BEWERKEN",
+    "EDIT PROFILE": "PROFIEL BEWERKEN",
+    "EDIT SUBTITLE": "ONDERTITEL BEWERKEN",
+    "Edit media": "Media bewerken",
+    "Edit profile": "Profiel bewerken",
+    "Edit subtitle": "Ondertitel bewerken",
+    "Featured": "Aanbevolen",
+    "Go": "Ga",
+    "History": "Geschiedenis",
+    "Home": "Home",
+    "Language": "Taal",
+    "Latest": "Laatste",
+    "Liked media": "Leuke media",
+    "Manage comments": "Reacties beheren",
+    "Manage media": "Media beheren",
+    "Manage users": "Gebruikers beheren",
+    "Media": "Media",
+    "Media was edited": "Media is bewerkt",
+    "Members": "Leden",
+    "My media": "Mijn media",
+    "My playlists": "Mijn afspeellijsten",
+    "No": "Nee",
+    "No comment yet": "Nog geen reactie",
+    "No comments yet": "Nog geen reacties",
+    "No results for": "Geen resultaten voor",
+    "PLAYLISTS": "AFSPEELLIJSTEN",
+    "Playlists": "Afspeellijsten",
+    "Powered by": "Aangedreven door",
+    "Published on": "Gepubliceerd op",
+    "Recommended": "Aanbevolen",
+    "Register": "Registreren",
+    "SAVE": "OPSLAAN",
+    "SEARCH": "ZOEKEN",
+    "SHARE": "DELEN",
+    "SHOW MORE": "MEER WEERGEVEN",
+    "SUBMIT": "INDIENEN",
+    "Search": "Zoeken",
+    "Select": "Selecteer",
+    "Sign in": "Inloggen",
+    "Sign out": "Uitloggen",
+    "Subtitle was added": "Ondertitel is toegevoegd",
+    "Tags": "Tags",
+    "Terms": "Voorwaarden",
+    "UPLOAD": "UPLOADEN",
+    "Up next": "Hierna",
+    "Upload": "Uploaden",
+    "Upload media": "Media uploaden",
+    "Uploads": "Uploads",
+    "VIEW ALL": "BEKIJK ALLES",
+    "View all": "Bekijk alles",
+    "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",
+    "view": "bekijk",
+    "views": "weergaven",
+    "yet": "nog",
+}
+
+replacement_strings = {
+    "Apr": "Apr",
+    "Aug": "Aug",
+    "Dec": "Dec",
+    "Feb": "Feb",
+    "Jan": "Jan",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mrt",
+    "May": "Mei",
+    "Nov": "Nov",
+    "Oct": "Okt",
+    "Sep": "Sep",
+    "day ago": "dag geleden",
+    "days ago": "dagen geleden",
+    "hour ago": "uur geleden",
+    "hours ago": "uren geleden",
+    "just now": "zojuist",
+    "minute ago": "minuut geleden",
+    "minutes ago": "minuten geleden",
+    "month ago": "maand geleden",
+    "months ago": "maanden geleden",
+    "second ago": "seconde geleden",
+    "seconds ago": "seconden geleden",
+    "week ago": "week geleden",
+    "weeks ago": "weken geleden",
+    "year ago": "jaar geleden",
+    "years ago": "jaren geleden",
+}

files/frontend_translations/pt.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "SOBRE",
+    "AUTOPLAY": "REPRODUÇÃO AUTOMÁTICA",
+    "About": "Sobre",
+    "Add a ": "Adicionar um ",
+    "COMMENT": "COMENTÁRIO",
+    "Categories": "Categorias",
+    "Category": "Categoria",
+    "Change Language": "Mudar idioma",
+    "Change password": "Mudar senha",
+    "Comment": "Comentário",
+    "Comments": "Comentários",
+    "Comments are disabled": "Comentários estão desativados",
+    "Contact": "Contato",
+    "DELETE MEDIA": "EXCLUIR MÍDIA",
+    "DOWNLOAD": "BAIXAR",
+    "EDIT MEDIA": "EDITAR MÍDIA",
+    "EDIT PROFILE": "EDITAR PERFIL",
+    "EDIT SUBTITLE": "EDITAR LEGENDA",
+    "Edit media": "Editar mídia",
+    "Edit profile": "Editar perfil",
+    "Edit subtitle": "Editar legenda",
+    "Featured": "Destaque",
+    "Go": "Ir",
+    "History": "Histórico",
+    "Home": "Início",
+    "Language": "Idioma",
+    "Latest": "Últimos",
+    "Liked media": "Mídia curtida",
+    "Manage comments": "Gerenciar comentários",
+    "Manage media": "Gerenciar mídia",
+    "Manage users": "Gerenciar usuários",
+    "Media": "Mídia",
+    "Media was edited": "Mídia foi editada",
+    "Members": "Membros",
+    "My media": "Minhas mídias",
+    "My playlists": "Minhas playlists",
+    "No": "Não",
+    "No comment yet": "Nenhum comentário ainda",
+    "No comments yet": "Nenhum comentário ainda",
+    "No results for": "Nenhum resultado para",
+    "PLAYLISTS": "PLAYLISTS",
+    "Playlists": "Playlists",
+    "Powered by": "Desenvolvido por",
+    "Published on": "Publicado em",
+    "Recommended": "Recomendado",
+    "Register": "Registrar",
+    "SAVE": "SALVAR",
+    "SEARCH": "PESQUISAR",
+    "SHARE": "COMPARTILHAR",
+    "SHOW MORE": "MOSTRAR MAIS",
+    "SUBMIT": "ENVIAR",
+    "Search": "Pesquisar",
+    "Select": "Selecionar",
+    "Sign in": "Entrar",
+    "Sign out": "Sair",
+    "Subtitle was added": "Legenda foi adicionada",
+    "Tags": "Tags",
+    "Terms": "Termos",
+    "UPLOAD": "CARREGAR",
+    "Up next": "A seguir",
+    "Upload": "Carregar",
+    "Upload media": "Carregar mídia",
+    "Uploads": "Uploads",
+    "VIEW ALL": "VER TODOS",
+    "View all": "Ver todos",
+    "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",
+    "view": "visualização",
+    "views": "visualizações",
+    "yet": "ainda",
+}
+
+replacement_strings = {
+    "Apr": "Abr",
+    "Aug": "Ago",
+    "Dec": "Dez",
+    "Feb": "Fev",
+    "Jan": "Jan",
+    "Jul": "Jul",
+    "Jun": "Jun",
+    "Mar": "Mar",
+    "May": "Mai",
+    "Nov": "Nov",
+    "Oct": "Out",
+    "Sep": "Set",
+    "day ago": "dia atrás",
+    "days ago": "dias atrás",
+    "hour ago": "hora atrás",
+    "hours ago": "horas atrás",
+    "just now": "agora mesmo",
+    "minute ago": "minuto atrás",
+    "minutes ago": "minutos atrás",
+    "month ago": "mês atrás",
+    "months ago": "meses atrás",
+    "second ago": "segundo atrás",
+    "seconds ago": "segundos atrás",
+    "week ago": "semana atrás",
+    "weeks ago": "semanas atrás",
+    "year ago": "ano atrás",
+    "years ago": "anos atrás",
+}

files/frontend_translations/ru.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "О",
+    "AUTOPLAY": "Автовоспроизведение",
+    "About": "О",
+    "Add a ": "Добавить ",
+    "COMMENT": "КОММЕНТАРИЙ",
+    "Categories": "Категории",
+    "Category": "Категория",
+    "Change Language": "Изменить язык",
+    "Change password": "Изменить пароль",
+    "Comment": "Комментарий",
+    "Comments": "Комментарии",
+    "Comments are disabled": "Комментарии отключены",
+    "Contact": "Контакт",
+    "DELETE MEDIA": "УДАЛИТЬ МЕДИА",
+    "DOWNLOAD": "СКАЧАТЬ",
+    "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": "Работает на",
+    "Published on": "Опубликовано",
+    "Recommended": "Рекомендуемое",
+    "Register": "Регистрация",
+    "SAVE": "СОХРАНИТЬ",
+    "SEARCH": "ПОИСК",
+    "SHARE": "ПОДЕЛИТЬСЯ",
+    "SHOW MORE": "ПОКАЗАТЬ БОЛЬШЕ",
+    "SUBMIT": "ОТПРАВИТЬ",
+    "Search": "Поиск",
+    "Select": "Выбрать",
+    "Sign in": "Войти",
+    "Sign out": "Выйти",
+    "Subtitle was added": "Субтитры были добавлены",
+    "Tags": "Теги",
+    "Terms": "Условия",
+    "UPLOAD": "ЗАГРУЗИТЬ",
+    "Up next": "Далее",
+    "Upload": "Загрузить",
+    "Upload media": "Загрузить медиа",
+    "Uploads": "Загрузки",
+    "VIEW ALL": "ПОКАЗАТЬ ВСЕ",
+    "View all": "Показать все",
+    "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": "медиа в теге",
+    "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/tr.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "HAKKINDA",
+    "AUTOPLAY": "OTOMATİK OYNATMA",
+    "About": "Hakkında",
+    "Add a ": "Ekle ",
+    "COMMENT": "YORUM",
+    "Categories": "Kategoriler",
+    "Category": "Kategori",
+    "Change Language": "Dili Değiştir",
+    "Change password": "Şifreyi Değiştir",
+    "Comment": "Yorum",
+    "Comments": "Yorumlar",
+    "Comments are disabled": "Yorumlar devre dışı",
+    "Contact": "İletişim",
+    "DELETE MEDIA": "MEDYAYI SİL",
+    "DOWNLOAD": "İNDİR",
+    "EDIT MEDIA": "MEDYAYI DÜZENLE",
+    "EDIT PROFILE": "PROFİLİ DÜZENLE",
+    "EDIT SUBTITLE": "ALT YAZIYI DÜZENLE",
+    "Edit media": "Medyayı düzenle",
+    "Edit profile": "Profili düzenle",
+    "Edit subtitle": "Alt yazıyı düzenle",
+    "Featured": "Öne Çıkan",
+    "Go": "Git",
+    "History": "Geçmiş",
+    "Home": "Ana Sayfa",
+    "Language": "Dil",
+    "Latest": "En Son",
+    "Liked media": "Beğenilen medya",
+    "Manage comments": "Yorumları yönet",
+    "Manage media": "Medyayı yönet",
+    "Manage users": "Kullanıcıları yönet",
+    "Media": "Medya",
+    "Media was edited": "Medya düzenlendi",
+    "Members": "Üyeler",
+    "My media": "Medyam",
+    "My playlists": "Çalma listelerim",
+    "No": "Hayır",
+    "No comment yet": "Henüz yorum yok",
+    "No comments yet": "Henüz yorum yok",
+    "No results for": "Sonuç bulunamadı",
+    "PLAYLISTS": "ÇALMA LİSTELERİ",
+    "Playlists": "Çalma listeleri",
+    "Powered by": "Tarafından desteklenmektedir",
+    "Published on": "Yayınlanma tarihi",
+    "Recommended": "Önerilen",
+    "Register": "Kayıt Ol",
+    "SAVE": "KAYDET",
+    "SEARCH": "ARA",
+    "SHARE": "PAYLAŞ",
+    "SHOW MORE": "DAHA FAZLA GÖSTER",
+    "SUBMIT": "GÖNDER",
+    "Search": "Ara",
+    "Select": "Seç",
+    "Sign in": "Giriş Yap",
+    "Sign out": "Çıkış Yap",
+    "Subtitle was added": "Alt yazı eklendi",
+    "Tags": "Etiketler",
+    "Terms": "Şartlar",
+    "UPLOAD": "YÜKLE",
+    "Up next": "Sıradaki",
+    "Upload": "Yükle",
+    "Upload media": "Medya yükle",
+    "Uploads": "Yüklemeler",
+    "VIEW ALL": "HEPSİNİ GÖR",
+    "View all": "Hepsini gör",
+    "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",
+    "view": "görünüm",
+    "views": "görünümler",
+    "yet": "henüz",
+}
+
+replacement_strings = {
+    "Apr": "Nis",
+    "Aug": "Ağu",
+    "Dec": "Ara",
+    "Feb": "Şub",
+    "Jan": "Oca",
+    "Jul": "Tem",
+    "Jun": "Haz",
+    "Mar": "Mar",
+    "May": "May",
+    "Nov": "Kas",
+    "Oct": "Eki",
+    "Sep": "Eyl",
+    "day ago": "gün önce",
+    "days ago": "gün önce",
+    "hour ago": "saat önce",
+    "hours ago": "saat önce",
+    "just now": "şimdi",
+    "minute ago": "dakika önce",
+    "minutes ago": "dakika önce",
+    "month ago": "ay önce",
+    "months ago": "ay önce",
+    "second ago": "saniye önce",
+    "seconds ago": "saniye önce",
+    "week ago": "hafta önce",
+    "weeks ago": "hafta önce",
+    "year ago": "yıl önce",
+    "years ago": "yıl önce",
+}

files/frontend_translations/ur.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "کے بارے میں",
+    "AUTOPLAY": "خودکار پلے",
+    "About": "کے بارے میں",
+    "Add a ": "شامل کریں",
+    "COMMENT": "تبصرہ",
+    "Categories": "اقسام",
+    "Category": "قسم",
+    "Change Language": "زبان تبدیل کریں",
+    "Change password": "پاس ورڈ تبدیل کریں",
+    "Comment": "تبصرہ",
+    "Comments": "تبصرے",
+    "Comments are disabled": "تبصرے غیر فعال ہیں",
+    "Contact": "رابطہ کریں",
+    "DELETE MEDIA": "میڈیا حذف کریں",
+    "DOWNLOAD": "ڈاؤن لوڈ",
+    "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": "کے ذریعہ تقویت یافتہ",
+    "Published on": "پر شائع ہوا",
+    "Recommended": "تجویز کردہ",
+    "Register": "رجسٹر کریں",
+    "SAVE": "محفوظ کریں",
+    "SEARCH": "تلاش کریں",
+    "SHARE": "شیئر کریں",
+    "SHOW MORE": "مزید دکھائیں",
+    "SUBMIT": "جمع کرائیں",
+    "Search": "تلاش کریں",
+    "Select": "منتخب کریں",
+    "Sign in": "سائن ان کریں",
+    "Sign out": "سائن آؤٹ کریں",
+    "Subtitle was added": "سب ٹائٹل شامل کیا گیا",
+    "Tags": "ٹیگز",
+    "Terms": "شرائط",
+    "UPLOAD": "اپ لوڈ کریں",
+    "Up next": "اگلا",
+    "Upload": "اپ لوڈ کریں",
+    "Upload media": "میڈیا اپ لوڈ کریں",
+    "Uploads": "اپ لوڈز",
+    "VIEW ALL": "سب دیکھیں",
+    "View all": "سب دیکھیں",
+    "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": "ٹیگ میں میڈیا",
+    "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/zh_hans.py

@@ -0,0 +1,104 @@
+translation_strings = {
+    "ABOUT": "关于",
+    "AUTOPLAY": "自动播放",
+    "About": "关于",
+    "Add a ": "添加一个",
+    "COMMENT": "评论",
+    "Categories": "分类",
+    "Category": "类别",
+    "Change Language": "更改语言",
+    "Change password": "更改密码",
+    "Comment": "评论",
+    "Comments": "评论",
+    "Comments are disabled": "评论已禁用",
+    "Contact": "联系",
+    "DELETE MEDIA": "删除媒体",
+    "DOWNLOAD": "下载",
+    "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": "由...提供技术支持",
+    "Published on": "发布于",
+    "Recommended": "推荐",
+    "Register": "注册",
+    "SAVE": "保存",
+    "SEARCH": "搜索",
+    "SHARE": "分享",
+    "SHOW MORE": "显示更多",
+    "SUBMIT": "提交",
+    "Search": "搜索",
+    "Select": "选择",
+    "Sign in": "登录",
+    "Sign out": "登出",
+    "Subtitle was added": "字幕已添加",
+    "Tags": "标签",
+    "Terms": "条款",
+    "UPLOAD": "上传",
+    "Up next": "接下来",
+    "Upload": "上传",
+    "Upload media": "上传媒体",
+    "Uploads": "上传",
+    "VIEW ALL": "查看全部",
+    "View all": "查看全部",
+    "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": "标签中的媒体",
+    "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

@@ -367,7 +367,7 @@ def media_file_info(input_file):
             input_file,
         ]
         stdout = run_command(cmd).get("out")
-        stream_size = sum([int(line) for line in stdout.split("\n") if line != ""])
+        stream_size = sum([int(line.replace("|", "")) for line in stdout.split("\n") if line != ""])
         video_bitrate = round((stream_size * 8 / 1024.0) / video_duration, 2)
 
     if "r_frame_rate" in video_info.keys():
@@ -443,7 +443,8 @@ def media_file_info(input_file):
                 input_file,
             ]
             stdout = run_command(cmd).get("out")
-            stream_size = sum([int(line) for line in stdout.split("\n") if line != ""])
+            # ffprobe appends a pipe at the end of the output, thus we have to remove it
+            stream_size = sum([int(line.replace("|", "")) for line in stdout.split("\n") if line != ""])
             audio_bitrate = round((stream_size * 8 / 1024.0) / audio_duration, 2)
 
         ret.update(
@@ -537,8 +538,8 @@ def get_base_ffmpeg_command(
 
     target_width = round(target_height * 16 / 9)
     scale_filter_opts = [
-        f"if(lt(iw\\,ih)\\,{target_height}\\,{target_width})",
-        f"if(lt(iw\\,ih)\\,{target_width}\\,{target_height})",
+        f"if(lt(iw\\,ih)\\,{target_height}\\,{target_width})",  # noqa
+        f"if(lt(iw\\,ih)\\,{target_width}\\,{target_height})",  # noqa
         "force_original_aspect_ratio=decrease",
         "force_divisible_by=2",
         "flags=lanczos",
@@ -784,3 +785,11 @@ def clean_query(query):
         query = query.replace(char, "")
 
     return query.lower()
+
+
+def get_alphanumeric_only(string):
+    """Returns a query that contains only alphanumeric characters
+    This include characters other than the English alphabet too
+    """
+    string = "".join([char for char in string if char.isalnum()])
+    return string.lower()

files/management/commands/process_translations.py

@@ -0,0 +1,58 @@
+import importlib
+import os
+from collections import OrderedDict
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Process translation files to add missing keys and sort them'
+
+    def handle(self, *args, **options):
+        translations_dir = os.path.join(settings.BASE_DIR, 'files', 'frontend_translations')
+        self.process_translation_files(translations_dir)
+        self.stdout.write(self.style.SUCCESS('Successfully processed translation files'))
+
+    def process_translation_files(self, translations_dir):
+        files = os.listdir(translations_dir)
+        files = [f for f in files if f.endswith('.py') and f not in ('__init__.py', 'en.py')]
+        # Import the original English translations
+        from files.frontend_translations.en import (
+            replacement_strings,
+            translation_strings,
+        )
+
+        for file in files:
+            file_path = os.path.join(translations_dir, file)
+            module_name = f"files.frontend_translations.{file[:-3]}"
+
+            module = importlib.import_module(module_name)
+
+            translation_strings_wip = getattr(module, 'translation_strings', {})
+            replacement_strings_wip = getattr(module, 'replacement_strings', {})
+
+            for key in translation_strings:
+                if key not in translation_strings_wip:
+                    translation_strings_wip[key] = translation_strings[key]
+
+            translation_strings_wip = OrderedDict(sorted(translation_strings_wip.items()))
+
+            for key in replacement_strings:
+                if key not in replacement_strings_wip:
+                    replacement_strings_wip[key] = replacement_strings[key]
+
+            replacement_strings_wip = OrderedDict(sorted(replacement_strings_wip.items()))
+
+            with open(file_path, 'w') as f:
+                f.write("translation_strings = {\n")
+                for key, value in translation_strings_wip.items():
+                    f.write(f'    "{key}": "{value}",\n')  # noqa
+                f.write("}\n\n")
+
+                f.write("replacement_strings = {\n")
+                for key, value in replacement_strings_wip.items():
+                    f.write(f'    "{key}": "{value}",\n')  # noqa
+                f.write("}\n")
+
+            self.stdout.write(self.style.SUCCESS(f'Processed {file}'))

files/methods.py

@@ -4,6 +4,7 @@
 import itertools
 import logging
 import random
+import re
 from datetime import datetime
 
 from django.conf import settings
@@ -118,12 +119,16 @@ def get_next_state(user, current_state, next_state):
 
     if next_state not in ["public", "private", "unlisted"]:
         next_state = settings.PORTAL_WORKFLOW  # get default state
+
     if is_mediacms_editor(user):
         # allow any transition
         return next_state
 
     if settings.PORTAL_WORKFLOW == "private":
-        next_state = "private"
+        if next_state in ["private", "unlisted"]:
+            next_state = next_state
+        else:
+            next_state = current_state
 
     if settings.PORTAL_WORKFLOW == "unlisted":
         # don't allow to make media public in this case
@@ -304,7 +309,6 @@ def show_related_media_author(media, request, limit):
 
 
 def show_related_media_calculated(media, request, limit):
-
     """Return a list of related media based on ML recommendations
     A big todo!
     """
@@ -324,8 +328,6 @@ def update_user_ratings(user, media, user_ratings):
 
 def notify_user_on_comment(friendly_token):
     """Notify users through email, for a set of actions"""
-
-    media = None
     media = models.Media.objects.filter(friendly_token=friendly_token).first()
     if not media:
         return False
@@ -347,6 +349,55 @@ View it on %s
     return True
 
 
+def notify_user_on_mention(friendly_token, user_mentioned, cleaned_comment):
+    from users.models import User
+
+    media = models.Media.objects.filter(friendly_token=friendly_token).first()
+    if not media:
+        return False
+
+    user = User.objects.filter(username=user_mentioned).first()
+    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)
+        msg = """
+You were mentioned in a comment on  %s .
+View it on %s
+
+Comment : %s
+        """ % (
+            media.title,
+            media_url,
+            cleaned_comment,
+        )
+        email = EmailMessage(title, msg, settings.DEFAULT_FROM_EMAIL, [user.email])
+        email.send(fail_silently=True)
+    return True
+
+
+def check_comment_for_mention(friendly_token, comment_text):
+    """Check the comment for any mentions, and notify each mentioned users"""
+    cleaned_comment = ''
+
+    matches = re.findall('@\\(_(.+?)_\\)', comment_text)
+    if matches:
+        cleaned_comment = clean_comment(comment_text)
+
+    for match in list(dict.fromkeys(matches)):
+        notify_user_on_mention(friendly_token, match, cleaned_comment)
+
+
+def clean_comment(raw_comment):
+    """Clean the comment fromn ID and username Mentions for preview purposes"""
+
+    cleaned_comment = re.sub('@\\(_(.+?)_\\)', '', raw_comment)
+    cleaned_comment = cleaned_comment.replace("[_", '')
+    cleaned_comment = cleaned_comment.replace("_]", '')
+
+    return cleaned_comment
+
+
 def list_tasks():
     """Lists celery tasks
     To be used in an admin dashboard

files/migrations/0001_initial.py

@@ -10,7 +10,6 @@ import files.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

files/migrations/0002_auto_20201201_0712.py

@@ -8,7 +8,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

files/migrations/0003_auto_20210927_1245.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('files', '0002_auto_20201201_0712'),
     ]

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/models.py

@@ -1,3 +1,4 @@
+import glob
 import json
 import logging
 import os
@@ -15,9 +16,9 @@ from django.core.files import File
 from django.db import connection, models
 from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete
 from django.dispatch import receiver
-from django.template.defaultfilters import slugify
 from django.urls import reverse
 from django.utils import timezone
+from django.utils.crypto import get_random_string
 from django.utils.html import strip_tags
 from imagekit.models import ProcessedImageField
 from imagekit.processors import ResizeToFit
@@ -83,6 +84,10 @@ 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 = "{0}.{1}".format(instance.uid.hex, helpers.get_file_name(filename))
@@ -313,7 +318,6 @@ class Media(models.Model):
         self.__original_uploaded_poster = self.uploaded_poster
 
     def save(self, *args, **kwargs):
-
         if not self.title:
             self.title = self.media_file.path.split("/")[-1]
 
@@ -371,7 +375,6 @@ class Media(models.Model):
         # will run only when a poster is uploaded for the first time
         if self.uploaded_poster and self.uploaded_poster != self.__original_uploaded_poster:
             with open(self.uploaded_poster.path, "rb") as f:
-
                 # set this otherwise gets to infinite loop
                 self.__original_uploaded_poster = self.uploaded_poster
 
@@ -429,12 +432,16 @@ class Media(models.Model):
         Performs all related tasks, as check for media type,
         video duration, encode
         """
-
         self.set_media_type()
         if self.media_type == "video":
             self.set_thumbnail(force=True)
-            self.produce_sprite_from_video()
-            self.encode()
+            if settings.DO_NOT_TRANSCODE_VIDEO:
+                self.encoding_status = "success"
+                self.save()
+                self.produce_sprite_from_video()
+            else:
+                self.produce_sprite_from_video()
+                self.encode()
         elif self.media_type == "image":
             self.set_thumbnail(force=True)
         return True
@@ -444,7 +451,6 @@ class Media(models.Model):
         Set encoding_status as success for non video
         content since all listings filter for encoding_status success
         """
-
         kind = helpers.get_file_type(self.media_file.path)
         if kind is not None:
             if kind == "image":
@@ -452,7 +458,7 @@ class Media(models.Model):
             elif kind == "pdf":
                 self.media_type = "pdf"
 
-        if self.media_type in ["image", "pdf"]:
+        if self.media_type in ["audio", "image", "pdf"]:
             self.encoding_status = "success"
         else:
             ret = helpers.media_file_info(self.media_file.path)
@@ -470,13 +476,22 @@ class Media(models.Model):
                 self.media_type = ""
                 self.encoding_status = "fail"
 
+            audio_file_with_thumb = False
+            # handle case where a file identified as video is actually an
+            # audio file with thumbnail
             if ret.get("is_video"):
                 # case where Media is video. try to set useful
                 # metadata as duration/height
                 self.media_type = "video"
                 self.duration = int(round(float(ret.get("video_duration", 0))))
                 self.video_height = int(ret.get("video_height"))
-            elif ret.get("is_audio"):
+                if ret.get("video_info", {}).get("codec_name", {}) in ["mjpeg"]:
+                    # best guess that this is an audio file with a thumbnail
+                    # in other cases, it is not (eg it can be an AVI file)
+                    if ret.get("video_info", {}).get("avg_frame_rate", "") == '0/0':
+                        audio_file_with_thumb = True
+
+            if ret.get("is_audio") or audio_file_with_thumb:
                 self.media_type = "audio"
                 self.duration = int(float(ret.get("audio_info", {}).get("duration", 0)))
                 self.encoding_status = "success"
@@ -574,9 +589,7 @@ class Media(models.Model):
 
         # attempt to break media file in chunks
         if self.duration > settings.CHUNKIZE_VIDEO_DURATION and chunkize:
-
             for profile in profiles:
-
                 if profile.extension == "gif":
                     profiles.remove(profile)
                     encoding = Encoding(media=self, profile=profile)
@@ -637,15 +650,16 @@ class Media(models.Model):
 
     def set_encoding_status(self):
         """Set encoding_status for videos
-        Set success if at least one mp4 exists
+        Set success if at least one mp4 or webm exists
         """
         mp4_statuses = set(encoding.status for encoding in self.encodings.filter(profile__extension="mp4", chunk=False))
+        webm_statuses = set(encoding.status for encoding in self.encodings.filter(profile__extension="webm", chunk=False))
 
-        if not mp4_statuses:
+        if not mp4_statuses and not webm_statuses:
             encoding_status = "pending"
-        elif "success" in mp4_statuses:
+        elif "success" in mp4_statuses or "success" in webm_statuses:
             encoding_status = "success"
-        elif "running" in mp4_statuses:
+        elif "running" in mp4_statuses or "running" in webm_statuses:
             encoding_status = "running"
         else:
             encoding_status = "fail"
@@ -663,6 +677,13 @@ class Media(models.Model):
             return ret
         for key in ENCODE_RESOLUTIONS_KEYS:
             ret[key] = {}
+
+        # if this is enabled, return original file on a way
+        # that video.js can consume
+        if settings.DO_NOT_TRANSCODE_VIDEO:
+            ret['0-original'] = {"h264": {"url": helpers.url_from_path(self.media_file.path), "status": "success", "progress": 100}}
+            return ret
+
         for encoding in self.encodings.select_related("profile").filter(chunk=False):
             if encoding.profile.extension == "gif":
                 continue
@@ -764,6 +785,36 @@ class Media(models.Model):
             return helpers.url_from_path(self.poster.path)
         return None
 
+    @property
+    def slideshow_items(self):
+        slideshow_items = getattr(settings, "SLIDESHOW_ITEMS", 30)
+        if self.media_type != "image":
+            items = []
+        else:
+            qs = Media.objects.filter(listable=True, user=self.user, media_type="image").exclude(id=self.id).order_by('id')[:slideshow_items]
+
+            items = [
+                {
+                    "poster_url": item.poster_url,
+                    "url": item.get_absolute_url(),
+                    "thumbnail_url": item.thumbnail_url,
+                    "title": item.title,
+                    "original_media_url": item.original_media_url,
+                }
+                for item in qs
+            ]
+            items.insert(
+                0,
+                {
+                    "poster_url": self.poster_url,
+                    "url": self.get_absolute_url(),
+                    "thumbnail_url": self.thumbnail_url,
+                    "title": self.title,
+                    "original_media_url": self.original_media_url,
+                },
+            )
+        return items
+
     @property
     def subtitles_info(self):
         """Property used on serializers
@@ -771,7 +822,9 @@ class Media(models.Model):
         """
 
         ret = []
-        for subtitle in self.subtitles.all():
+        # Retrieve all subtitles and sort by the first letter of their associated language's title
+        sorted_subtitles = sorted(self.subtitles.all(), key=lambda s: s.language.title[0])
+        for subtitle in sorted_subtitles:
             ret.append(
                 {
                     "src": helpers.url_from_path(subtitle.subtitle_file.path),
@@ -814,6 +867,7 @@ class Media(models.Model):
         """
 
         res = {}
+        valid_resolutions = [240, 360, 480, 720, 1080, 1440, 2160]
         if self.hls_file:
             if os.path.exists(self.hls_file):
                 hls_file = self.hls_file
@@ -825,11 +879,20 @@ class Media(models.Model):
                         uri = os.path.join(p, iframe_playlist.uri)
                         if os.path.exists(uri):
                             resolution = iframe_playlist.iframe_stream_info.resolution[1]
+                            # most probably video is vertical, getting the first value to
+                            # be the resolution
+                            if resolution not in valid_resolutions:
+                                resolution = iframe_playlist.iframe_stream_info.resolution[0]
+
                             res["{}_iframe".format(resolution)] = helpers.url_from_path(uri)
                     for playlist in m3u8_obj.playlists:
                         uri = os.path.join(p, playlist.uri)
                         if os.path.exists(uri):
                             resolution = playlist.stream_info.resolution[1]
+                            # same as above
+                            if resolution not in valid_resolutions:
+                                resolution = playlist.stream_info.resolution[0]
+
                             res["{}_playlist".format(resolution)] = helpers.url_from_path(uri)
         return res
 
@@ -899,11 +962,11 @@ class License(models.Model):
 class Category(models.Model):
     """A Category base model"""
 
-    uid = models.UUIDField(unique=True, default=uuid.uuid4)
+    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, unique=True, db_index=True)
+    title = models.CharField(max_length=100, db_index=True)
 
     description = models.TextField(blank=True)
 
@@ -923,6 +986,18 @@ class Category(models.Model):
 
     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
 
@@ -936,7 +1011,11 @@ class Category(models.Model):
     def update_category_media(self):
         """Set media_count"""
 
-        self.media_count = Media.objects.filter(listable=True, category=self).count()
+        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
 
@@ -997,10 +1076,8 @@ class Tag(models.Model):
         return True
 
     def save(self, *args, **kwargs):
-        self.title = slugify(self.title[:99])
-        strip_text_items = ["title"]
-        for item in strip_text_items:
-            setattr(self, item, strip_tags(getattr(self, item, None)))
+        self.title = helpers.get_alphanumeric_only(self.title)
+        self.title = self.title[:99]
         super(Tag, self).save(*args, **kwargs)
 
     @property
@@ -1154,9 +1231,36 @@ class Subtitle(models.Model):
 
     user = models.ForeignKey("users.User", on_delete=models.CASCADE)
 
+    class Meta:
+        ordering = ["language__title"]
+
     def __str__(self):
         return "{0}-{1}".format(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 RatingCategory(models.Model):
     """Rating Category
@@ -1229,7 +1333,7 @@ class Playlist(models.Model):
 
     @property
     def media_count(self):
-        return self.media.count()
+        return self.media.filter(listable=True).count()
 
     def get_absolute_url(self, api=False):
         if api:
@@ -1276,7 +1380,7 @@ class Playlist(models.Model):
 
     @property
     def thumbnail_url(self):
-        pm = self.playlistmedia_set.first()
+        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
@@ -1399,6 +1503,13 @@ def media_file_delete(sender, instance, **kwargs):
         helpers.rm_dir(p)
     instance.user.update_user_media()
 
+    # remove extra zombie thumbnails
+    if instance.thumbnail:
+        thumbnails_path = os.path.dirname(instance.thumbnail.path)
+        thumbnails = glob.glob(f'{thumbnails_path}/{instance.uid.hex}.*')
+        for thumbnail in thumbnails:
+            helpers.rm_file(thumbnail)
+
 
 @receiver(m2m_changed, sender=Media.category.through)
 def media_m2m(sender, instance, **kwargs):

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")
@@ -145,15 +164,20 @@ class SingleMediaSerializer(serializers.ModelSerializer):
             "ratings_info",
             "add_subtitle_url",
             "allow_download",
+            "slideshow_items",
         )
 
 
 class MediaSearchSerializer(serializers.ModelSerializer):
     url = serializers.SerializerMethodField()
+    api_url = serializers.SerializerMethodField()
 
     def get_url(self, obj):
         return self.context["request"].build_absolute_uri(obj.get_absolute_url())
 
+    def get_api_url(self, obj):
+        return self.context["request"].build_absolute_uri(obj.get_absolute_url(api=True))
+
     class Meta:
         model = Media
         fields = (
@@ -167,6 +191,7 @@ class MediaSearchSerializer(serializers.ModelSerializer):
             "friendly_token",
             "duration",
             "url",
+            "api_url",
             "media_type",
             "preview_url",
             "categories_info",

files/tasks.py

@@ -7,10 +7,11 @@ import tempfile
 from datetime import datetime, timedelta
 
 from celery import Task
-from celery.decorators 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
+
+# from celery.task.control import revoke
 from celery.utils.log import get_task_logger
 from django.conf import settings
 from django.core.cache import cache
@@ -47,7 +48,7 @@ ERRORS_LIST = [
 ]
 
 
-@task(name="chunkize_media", bind=True, queue="short_tasks", soft_time_limit=60 * 30)
+@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"""
 
@@ -268,7 +269,6 @@ 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)
         tfpass = create_temp_file(suffix=".{0}".format(profile.extension), dir=temp_dir)
         ffmpeg_commands = produce_ffmpeg_commands(
@@ -384,14 +384,16 @@ def produce_sprite_from_video(friendly_token):
         try:
             tmpdir_image_files = tmpdirname + "/img%03d.jpg"
             output_name = tmpdirname + "/sprites.jpg"
-            cmd = "{0} -i {1} -f image2 -vf 'fps=1/10, scale=160:90' {2}&&files=$(ls {3}/img*.jpg | sort -t '-' -n -k 2 | tr '\n' ' ')&&convert $files -append {4}".format(
-                settings.FFMPEG_COMMAND,
-                media.media_file.path,
-                tmpdir_image_files,
-                tmpdirname,
-                output_name,
-            )
-            subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+
+            fps = getattr(settings, 'SPRITE_NUM_SECS', 10)
+            ffmpeg_cmd = [settings.FFMPEG_COMMAND, "-i", media.media_file.path, "-f", "image2", "-vf", f"fps=1/{fps}, scale=160:90", tmpdir_image_files]  # noqa
+            run_command(ffmpeg_cmd)
+            image_files = [f for f in os.listdir(tmpdirname) if f.startswith("img") and f.endswith(".jpg")]
+            image_files = sorted(image_files, key=lambda x: int(re.search(r'\d+', x).group()))
+            image_files = [os.path.join(tmpdirname, f) for f in image_files]
+            cmd_convert = ["convert", *image_files, "-append", output_name]  # image files, unpacked into the list
+            ret = run_command(cmd_convert)  # noqa
+
             if os.path.exists(output_name) and get_file_type(output_name) == "image":
                 with open(output_name, "rb") as f:
                     myfile = File(f)
@@ -399,8 +401,8 @@ def produce_sprite_from_video(friendly_token):
                         content=myfile,
                         name=get_file_name(media.media_file.path) + "sprites.jpg",
                     )
-        except BaseException:
-            pass
+        except Exception as e:
+            print(e)
     return True
 
 
@@ -425,19 +427,27 @@ def create_hls(friendly_token):
     p = media.uid.hex
     output_dir = os.path.join(settings.HLS_DIR, p)
     encodings = media.encodings.filter(profile__extension="mp4", status="success", chunk=False, profile__codec="h264")
+
     if encodings:
         existing_output_dir = None
         if os.path.exists(output_dir):
             existing_output_dir = output_dir
             output_dir = os.path.join(settings.HLS_DIR, p + produce_friendly_token())
-        files = " ".join([f.media_file.path for f in encodings if f.media_file])
-        cmd = "{0} --segment-duration=4 --output-dir={1} {2}".format(settings.MP4HLS_COMMAND, output_dir, files)
-        subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
+        files = [f.media_file.path for f in encodings if f.media_file]
+        cmd = [settings.MP4HLS_COMMAND, '--segment-duration=4', f'--output-dir={output_dir}', *files]
+        run_command(cmd)
+
         if existing_output_dir:
             # override content with -T !
-            cmd = "cp -rT {0} {1}".format(output_dir, existing_output_dir)
-            subprocess.run(cmd, stdout=subprocess.PIPE, shell=True)
-            shutil.rmtree(output_dir)
+            cmd = ["cp", "-rT", output_dir, existing_output_dir]
+            run_command(cmd)
+
+            try:
+                shutil.rmtree(output_dir)
+            except:  # noqa
+                # this was breaking in some cases where it was already deleted
+                # because create_hls was running multiple times
+                pass
             output_dir = existing_output_dir
         pp = os.path.join(output_dir, "master.m3u8")
         if os.path.exists(pp):
@@ -461,10 +471,11 @@ def check_running_states():
         if (now - encoding.update_date).seconds > settings.RUNNING_STATE_STALE:
             media = encoding.media
             profile = encoding.profile
-            task_id = encoding.task_id
+            # task_id = encoding.task_id
             # terminate task
-            if task_id:
-                revoke(task_id, terminate=True)
+            # TODO: not imported
+            # if task_id:
+            #    revoke(task_id, terminate=True)
             encoding.delete()
             media.encode(profiles=[profile])
             # TODO: allign with new code + chunksize...
@@ -643,7 +654,11 @@ def save_user_action(user_or_session, friendly_token=None, action="watch", extra
 
     if action == "watch":
         media.views += 1
-        media.save(update_fields=["views"])
+        Media.objects.filter(friendly_token=friendly_token).update(views=media.views)
+
+        # update field without calling save, to avoid post_save signals being triggered
+        # same in other actions
+
     elif action == "report":
         media.reported_times += 1
 
@@ -658,10 +673,10 @@ def save_user_action(user_or_session, friendly_token=None, action="watch", extra
         )
     elif action == "like":
         media.likes += 1
-        media.save(update_fields=["likes"])
+        Media.objects.filter(friendly_token=friendly_token).update(likes=media.likes)
     elif action == "dislike":
         media.dislikes += 1
-        media.save(update_fields=["dislikes"])
+        Media.objects.filter(friendly_token=friendly_token).update(dislikes=media.dislikes)
 
     return True
 

files/templatetags/custom_filters.py

@@ -0,0 +1,10 @@
+from django import template
+
+from files.frontend_translations import translate_string
+
+register = template.Library()
+
+
+@register.filter
+def custom_translate(string, lang_code):
+    return translate_string(lang_code, string)