revert

.github/workflows/python.yml

@@ -26,7 +26,7 @@ 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

AUTHORS.txt

@@ -1 +1,5 @@
+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

@@ -11,7 +11,6 @@ RUN mkdir -p /home/mediacms.io/mediacms/{logs} && cd /home/mediacms.io && python
 
 # Install dependencies:
 COPY requirements.txt .
-
 RUN pip install -r requirements.txt
 
 COPY . /home/mediacms.io/mediacms

Dockerfile-dev

@@ -10,13 +10,11 @@ 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 .
+COPY requirements.txt . 
 COPY requirements-dev.txt .
-
-RUN pip install -r requirements.txt
-
 RUN pip install -r requirements-dev.txt
 
+
 COPY . /home/mediacms.io/mediacms
 WORKDIR /home/mediacms.io/mediacms
 

README.md

@@ -6,7 +6,7 @@
 
 
 
-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.
 
@@ -56,15 +56,15 @@ A demo is available at https://demo.mediacms.io
 
 ## 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 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 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.
+MediaCMS is released under [GNU Affero General Public License v3.0 license](LICENSE.txt). 
+Copyright Markos Gogoulos and Yiannis Stergiou
 
 
 ## Support and paid services
@@ -73,9 +73,9 @@ We provide custom installations, development of extra functionality, migration f
 
 
 
-## Hardware considerations
+## Hardware dependencies
 
-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.
+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).
 
@@ -99,10 +99,6 @@ There are two ways to run MediaCMS, through Docker Compose and through installin
 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
@@ -119,7 +115,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
-- **American Association of Gynecologic Laparoscopists** - https://surgeryu.aagl.org/
+- **Heritales** International Heritage Film Festival - https://stage.heritales.org
 
 
 ## How to contribute
@@ -129,10 +125,9 @@ 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](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
+- Open issues, participate on discussions, report bugs, suggest ideas
 - Star the project
-- Add functionality, work on a PR, fix an issue!
+- Add functionality, work on a PR, fix an issue! 
 
 
 ## Contact

cli-tool/cli.py

@@ -73,7 +73,7 @@ def upload_media():
     if os.path.isdir(path):
         for filename in os.listdir(path):
             files = {}
-            abs = os.path.abspath(f"{path}/{filename}")
+            abs = os.path.abspath("{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:

cms/dev_settings.py

@@ -1,48 +0,0 @@
-# Development settings, used in docker-compose-dev.yaml
-import os
-
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'allauth',
-    'allauth.account',
-    'allauth.socialaccount',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.sites',
-    'rest_framework',
-    'rest_framework.authtoken',
-    'imagekit',
-    'files.apps.FilesConfig',
-    'users.apps.UsersConfig',
-    'actions.apps.ActionsConfig',
-    'debug_toolbar',
-    'mptt',
-    'crispy_forms',
-    'uploader.apps.UploaderConfig',
-    'djcelery_email',
-    'ckeditor',
-    'drf_yasg',
-    'corsheaders',
-]
-
-MIDDLEWARE = [
-    'corsheaders.middleware.CorsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    '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',
-]
-
-DEBUG = True
-CORS_ORIGIN_ALLOW_ALL = True
-STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static/'),)
-STATIC_ROOT = None

cms/settings.py

@@ -93,9 +93,6 @@ ALLOW_MENTION_IN_COMMENTS = False  # allowing to mention other users with @ in t
 # 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
@@ -493,13 +490,3 @@ if GLOBAL_LOGIN_REQUIRED:
 DO_NOT_TRANSCODE_VIDEO = False
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-
-# the following is related to local development using docker
-# and docker-compose-dev.yaml
-try:
-    DEVELOPMENT_MODE = os.environ.get("DEVELOPMENT_MODE")
-    if DEVELOPMENT_MODE:
-        # keep a dev_settings.py file for local overrides
-        from .dev_settings import *  # noqa
-except ImportError:
-    pass

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,5 +67,4 @@ 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

docker-compose-dev.yaml

@@ -1,22 +1,6 @@
 version: "3"
 
 services:
-  migrations:
-    build:
-      context: .
-      dockerfile: ./Dockerfile-dev
-    image: mediacms/mediacms-dev:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    command: "python manage.py migrate"
-    environment:
-      DEVELOPMENT_MODE: "True"
-    restart: on-failure
-    depends_on:
-      redis:
-        condition: service_healthy
-      db:
-        condition: service_healthy
   frontend:
     image: node:14
     volumes:
@@ -34,9 +18,7 @@ services:
       context: .
       dockerfile: ./Dockerfile-dev
     image: mediacms/mediacms-dev:latest
-    command: "python manage.py runserver 0.0.0.0:80"
     environment:
-      DEVELOPMENT_MODE: "True"
       ADMIN_USER: 'admin'
       ADMIN_PASSWORD: 'admin'
       ADMIN_EMAIL: 'admin@localhost'
@@ -45,7 +27,10 @@ services:
     volumes:
       - ./:/home/mediacms.io/mediacms/
     depends_on:
-      - migrations
+      redis:
+        condition: service_healthy
+      db:
+        condition: service_healthy
   db:
     image: postgres:15.2-alpine
     volumes:
@@ -69,16 +54,3 @@ 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'
-    depends_on:
-      - web

docs/admins_docs.md

@@ -470,14 +470,6 @@ 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
-```
-
 ## 6. Manage pages
 to be written
 

docs/dev_exp.md

@@ -1,60 +0,0 @@
-# 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.
-
-### 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

files/admin.py

@@ -40,12 +40,6 @@ 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"
 
 
@@ -80,18 +74,7 @@ class SubtitleAdmin(admin.ModelAdmin):
 
 
 class EncodingAdmin(admin.ModelAdmin):
-    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"
+    pass
 
 
 admin.site.register(EncodeProfile, EncodeProfileAdmin)

files/tasks.py

@@ -644,11 +644,7 @@ def save_user_action(user_or_session, friendly_token=None, action="watch", extra
 
     if action == "watch":
         media.views += 1
-        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
-
+        media.save(update_fields=["views"])
     elif action == "report":
         media.reported_times += 1
 
@@ -663,10 +659,10 @@ def save_user_action(user_or_session, friendly_token=None, action="watch", extra
         )
     elif action == "like":
         media.likes += 1
-        Media.objects.filter(friendly_token=friendly_token).update(likes=media.likes)
+        media.save(update_fields=["likes"])
     elif action == "dislike":
         media.dislikes += 1
-        Media.objects.filter(friendly_token=friendly_token).update(dislikes=media.dislikes)
+        media.save(update_fields=["dislikes"])
 
     return True
 

files/urls.py

@@ -89,6 +89,3 @@ urlpatterns = [
     re_path(r"^manage/media$", views.manage_media, name="manage_media"),
     re_path(r"^manage/users$", views.manage_users, name="manage_users"),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-
-if hasattr(settings, "GENERATE_SITEMAP") and settings.GENERATE_SITEMAP:
-    urlpatterns.append(path("sitemap.xml", views.sitemap, name="sitemap"))

files/views.py

@@ -292,16 +292,6 @@ def search(request):
     return render(request, "cms/search.html", context)
 
 
-def sitemap(request):
-    """Sitemap"""
-
-    context = {}
-    context["media"] = list(Media.objects.filter(Q(listable=True)).order_by("-add_date"))
-    context["playlists"] = list(Playlist.objects.filter().order_by("-add_date"))
-    context["users"] = list(User.objects.filter())
-    return render(request, "sitemap.xml", context, content_type="application/xml")
-
-
 def tags(request):
     """List tags view"""
 

frontend/src/static/js/components/media-actions/MediaMoreOptionsIcon.jsx

@@ -22,7 +22,7 @@ function downloadOptions(mediaData, allowDownload) {
       if (Object.keys(encodingsInfo[k]).length) {
         for (g in encodingsInfo[k]) {
           if (encodingsInfo[k].hasOwnProperty(g)) {
-            if ('success' === encodingsInfo[k][g].status && 100 === encodingsInfo[k][g].progress && null !== encodingsInfo[k][g].url) {
+            if ('success' === encodingsInfo[k][g].status && 100 === encodingsInfo[k][g].progress) {
               options[encodingsInfo[k][g].title] = {
                 text: k + ' - ' + g.toUpperCase() + ' (' + encodingsInfo[k][g].size + ')',
                 link: formatInnerLink(encodingsInfo[k][g].url, site.url),

frontend/src/static/js/components/media-actions/VideoMediaDownloadLink.jsx

@@ -19,7 +19,7 @@ function downloadOptionsList() {
       if (Object.keys(encodings_info[k]).length) {
         for (g in encodings_info[k]) {
           if (encodings_info[k].hasOwnProperty(g)) {
-            if ('success' === encodings_info[k][g].status && 100 === encodings_info[k][g].progress && null !== encodings_info[k][g].url) {
+            if ('success' === encodings_info[k][g].status && 100 === encodings_info[k][g].progress) {
               optionsList[encodings_info[k][g].title] = {
                 text: k + ' - ' + g.toUpperCase() + ' (' + encodings_info[k][g].size + ')',
                 link: formatInnerLink(encodings_info[k][g].url, SiteContext._currentValue.url),

requirements-dev.txt

@@ -12,5 +12,3 @@ pytest-cov
 pytest-django
 pytest-factoryboy
 Faker
-django-cors-headers
-

templates/robots.txt

@@ -1,3 +1,2 @@
 User-Agent: *
 Allow: /
-Sitemap: {{ FRONTEND_HOST }}/sitemap.xml

templates/sitemap.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% load static %}
-	<url>
-		<loc>{{ FRONTEND_HOST }}</loc>
-		<changefreq>always</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/featured</loc>
-		<changefreq>daily</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/recommended</loc>
-		<changefreq>always</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/latest</loc>
-		<changefreq>hourly</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/members</loc>
-		<changefreq>daily</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/tags</loc>
-		<changefreq>daily</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/categories</loc>
-		<changefreq>weekly</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/history</loc>
-		<changefreq>always</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/liked</loc>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/about</loc>
-		<changefreq>monthly</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/tos</loc>
-		<changefreq>monthly</changefreq>
-	</url>
-	<url>
-		<loc>{{ FRONTEND_HOST }}/contact</loc>
-		<changefreq>never</changefreq>
-	</url>
-	{% for media_object in media %}
-	<url>
-		<loc>{{ FRONTEND_HOST}}/view?m={{ media_object.friendly_token }}</loc>
-	</url>
-	{% endfor %}
-	{% for playlist_object in playlists %}
-	<url>
-		<loc>{{ FRONTEND_HOST}}/playlists/{{ playlist_object.friendly_token }}</loc>
-	</url>
-	{% endfor %}
-	{% for user_object in users %}
-	<url>
-		<loc>{{ FRONTEND_HOST}}/user/{{ user_object.username }}/</loc>
-	</url>
-	{% endfor %}
-</urlset>