mirror of
https://github.com/mediacms-io/mediacms.git
synced 2025-11-22 06:17:58 -05:00
Compare commits
2 Commits
feat-playl
...
fix/preser
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75b88a6f9c | ||
|
|
f2e04cbe2d |
@@ -1 +1 @@
|
|||||||
VERSION = "7.2.5"
|
VERSION = "7.2.1"
|
||||||
|
|||||||
@@ -729,6 +729,4 @@ def copy_media(media):
|
|||||||
def is_media_allowed_type(media):
|
def is_media_allowed_type(media):
|
||||||
if "all" in settings.ALLOWED_MEDIA_UPLOAD_TYPES:
|
if "all" in settings.ALLOWED_MEDIA_UPLOAD_TYPES:
|
||||||
return True
|
return True
|
||||||
if media.media_type == "playlist":
|
|
||||||
return True
|
|
||||||
return media.media_type in settings.ALLOWED_MEDIA_UPLOAD_TYPES
|
return media.media_type in settings.ALLOWED_MEDIA_UPLOAD_TYPES
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
# Generated by Django 5.2.6 on 2025-11-21 12:35
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
import files.models.utils
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('files', '0013_page_tinymcemedia'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterModelOptions(
|
|
||||||
name='subtitle',
|
|
||||||
options={'ordering': ['language__title'], 'verbose_name': 'Caption', 'verbose_name_plural': 'Captions'},
|
|
||||||
),
|
|
||||||
migrations.AlterModelOptions(
|
|
||||||
name='transcriptionrequest',
|
|
||||||
options={'verbose_name': 'Caption Request', 'verbose_name_plural': 'Caption Requests'},
|
|
||||||
),
|
|
||||||
migrations.AlterModelOptions(
|
|
||||||
name='videotrimrequest',
|
|
||||||
options={'verbose_name': 'Trim Request', 'verbose_name_plural': 'Trim Requests'},
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='media',
|
|
||||||
name='linked_playlist',
|
|
||||||
field=models.ForeignKey(blank=True, help_text='If set, this Media represents a Playlist in listings', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='media_representation', to='files.playlist'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='media',
|
|
||||||
name='media_file',
|
|
||||||
field=models.FileField(blank=True, help_text='media file', max_length=500, null=True, upload_to=files.models.utils.original_media_file_path, verbose_name='media file'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='media',
|
|
||||||
name='media_type',
|
|
||||||
field=models.CharField(blank=True, choices=[('video', 'Video'), ('image', 'Image'), ('pdf', 'Pdf'), ('audio', 'Audio'), ('playlist', 'Playlist')], db_index=True, default='video', max_length=20),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@@ -85,15 +85,6 @@ class Media(models.Model):
|
|||||||
|
|
||||||
likes = models.IntegerField(db_index=True, default=1)
|
likes = models.IntegerField(db_index=True, default=1)
|
||||||
|
|
||||||
linked_playlist = models.ForeignKey(
|
|
||||||
"Playlist",
|
|
||||||
on_delete=models.CASCADE,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
related_name="media_representation",
|
|
||||||
help_text="If set, this Media represents a Playlist in listings",
|
|
||||||
)
|
|
||||||
|
|
||||||
listable = models.BooleanField(default=False, help_text="Whether it will appear on listings")
|
listable = models.BooleanField(default=False, help_text="Whether it will appear on listings")
|
||||||
|
|
||||||
md5sum = models.CharField(max_length=50, blank=True, null=True, help_text="Not exposed, used internally")
|
md5sum = models.CharField(max_length=50, blank=True, null=True, help_text="Not exposed, used internally")
|
||||||
@@ -102,8 +93,6 @@ class Media(models.Model):
|
|||||||
"media file",
|
"media file",
|
||||||
upload_to=original_media_file_path,
|
upload_to=original_media_file_path,
|
||||||
max_length=500,
|
max_length=500,
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
help_text="media file",
|
help_text="media file",
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -251,10 +240,7 @@ class Media(models.Model):
|
|||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
if not self.title:
|
if not self.title:
|
||||||
if self.media_file:
|
|
||||||
self.title = self.media_file.path.split("/")[-1]
|
self.title = self.media_file.path.split("/")[-1]
|
||||||
elif self.linked_playlist:
|
|
||||||
self.title = self.linked_playlist.title
|
|
||||||
|
|
||||||
strip_text_items = ["title", "description"]
|
strip_text_items = ["title", "description"]
|
||||||
for item in strip_text_items:
|
for item in strip_text_items:
|
||||||
@@ -309,10 +295,6 @@ class Media(models.Model):
|
|||||||
|
|
||||||
self.state = helpers.get_default_state(user=self.user)
|
self.state = helpers.get_default_state(user=self.user)
|
||||||
|
|
||||||
# Set encoding_status to success for playlist type
|
|
||||||
if self.media_type == "playlist":
|
|
||||||
self.encoding_status = "success"
|
|
||||||
|
|
||||||
# condition to appear on listings
|
# condition to appear on listings
|
||||||
if self.state == "public" and self.encoding_status == "success" and self.is_reviewed is True:
|
if self.state == "public" and self.encoding_status == "success" and self.is_reviewed is True:
|
||||||
self.listable = True
|
self.listable = True
|
||||||
@@ -347,17 +329,10 @@ class Media(models.Model):
|
|||||||
|
|
||||||
if to_transcribe:
|
if to_transcribe:
|
||||||
TranscriptionRequest.objects.create(media=self, translate_to_english=False)
|
TranscriptionRequest.objects.create(media=self, translate_to_english=False)
|
||||||
tasks.whisper_transcribe.apply_async(
|
tasks.whisper_transcribe.delay(self.friendly_token, translate_to_english=False)
|
||||||
args=[self.friendly_token, False],
|
|
||||||
countdown=10,
|
|
||||||
)
|
|
||||||
|
|
||||||
if to_transcribe_and_translate:
|
if to_transcribe_and_translate:
|
||||||
TranscriptionRequest.objects.create(media=self, translate_to_english=True)
|
TranscriptionRequest.objects.create(media=self, translate_to_english=True)
|
||||||
tasks.whisper_transcribe.apply_async(
|
tasks.whisper_transcribe.delay(self.friendly_token, translate_to_english=True)
|
||||||
args=[self.friendly_token, True],
|
|
||||||
countdown=10,
|
|
||||||
)
|
|
||||||
|
|
||||||
def update_search_vector(self):
|
def update_search_vector(self):
|
||||||
"""
|
"""
|
||||||
@@ -401,15 +376,10 @@ class Media(models.Model):
|
|||||||
Performs all related tasks, as check for media type,
|
Performs all related tasks, as check for media type,
|
||||||
video duration, encode
|
video duration, encode
|
||||||
"""
|
"""
|
||||||
# Skip media_init for playlist type as it has no media file to process
|
|
||||||
if self.media_type == "playlist" or self.linked_playlist:
|
|
||||||
return True
|
|
||||||
|
|
||||||
self.set_media_type()
|
self.set_media_type()
|
||||||
from ..methods import is_media_allowed_type
|
from ..methods import is_media_allowed_type
|
||||||
|
|
||||||
if not is_media_allowed_type(self):
|
if not is_media_allowed_type(self):
|
||||||
if self.media_file and self.media_file.path:
|
|
||||||
helpers.rm_file(self.media_file.path)
|
helpers.rm_file(self.media_file.path)
|
||||||
if self.state == "public":
|
if self.state == "public":
|
||||||
self.state = "unlisted"
|
self.state = "unlisted"
|
||||||
@@ -788,9 +758,6 @@ class Media(models.Model):
|
|||||||
Prioritize uploaded_thumbnail, if exists, then thumbnail
|
Prioritize uploaded_thumbnail, if exists, then thumbnail
|
||||||
that is auto-generated
|
that is auto-generated
|
||||||
"""
|
"""
|
||||||
# If this media represents a playlist, use playlist's thumbnail
|
|
||||||
if self.linked_playlist:
|
|
||||||
return self.linked_playlist.thumbnail_url
|
|
||||||
|
|
||||||
if self.uploaded_thumbnail:
|
if self.uploaded_thumbnail:
|
||||||
return helpers.url_from_path(self.uploaded_thumbnail.path)
|
return helpers.url_from_path(self.uploaded_thumbnail.path)
|
||||||
@@ -806,9 +773,6 @@ class Media(models.Model):
|
|||||||
Prioritize uploaded_poster, if exists, then poster
|
Prioritize uploaded_poster, if exists, then poster
|
||||||
that is auto-generated
|
that is auto-generated
|
||||||
"""
|
"""
|
||||||
# If this media represents a playlist, use playlist's thumbnail
|
|
||||||
if self.linked_playlist:
|
|
||||||
return self.linked_playlist.thumbnail_url
|
|
||||||
|
|
||||||
if self.uploaded_poster:
|
if self.uploaded_poster:
|
||||||
return helpers.url_from_path(self.uploaded_poster.path)
|
return helpers.url_from_path(self.uploaded_poster.path)
|
||||||
@@ -946,14 +910,6 @@ class Media(models.Model):
|
|||||||
return helpers.url_from_path(self.user.logo.path)
|
return helpers.url_from_path(self.user.logo.path)
|
||||||
|
|
||||||
def get_absolute_url(self, api=False, edit=False):
|
def get_absolute_url(self, api=False, edit=False):
|
||||||
# If this media represents a playlist, redirect to playlist page
|
|
||||||
if self.linked_playlist:
|
|
||||||
if edit:
|
|
||||||
# For now, playlist editing is not supported via media edit page
|
|
||||||
return self.linked_playlist.get_absolute_url(api=api)
|
|
||||||
# Start playback from first media when clicking on playlist in listings
|
|
||||||
return self.linked_playlist.get_absolute_url(api=api, start_playback=True)
|
|
||||||
|
|
||||||
if edit:
|
if edit:
|
||||||
return f"{reverse('edit_media')}?m={self.friendly_token}"
|
return f"{reverse('edit_media')}?m={self.friendly_token}"
|
||||||
if api:
|
if api:
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models.signals import post_save, pre_delete
|
|
||||||
from django.dispatch import receiver
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.html import strip_tags
|
from django.utils.html import strip_tags
|
||||||
|
|
||||||
@@ -33,25 +31,7 @@ class Playlist(models.Model):
|
|||||||
def media_count(self):
|
def media_count(self):
|
||||||
return self.media.filter(listable=True).count()
|
return self.media.filter(listable=True).count()
|
||||||
|
|
||||||
def get_first_media(self):
|
def get_absolute_url(self, api=False):
|
||||||
"""Get the first media item in the playlist"""
|
|
||||||
pm = self.playlistmedia_set.filter(media__listable=True).first()
|
|
||||||
return pm.media if pm else None
|
|
||||||
|
|
||||||
def get_absolute_url(self, api=False, start_playback=False):
|
|
||||||
"""
|
|
||||||
Get the URL for this playlist.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
api: If True, return API URL
|
|
||||||
start_playback: If True, return URL to first media with playlist context
|
|
||||||
"""
|
|
||||||
if start_playback and not api:
|
|
||||||
# Get first media and return its URL with playlist parameter
|
|
||||||
first_media = self.get_first_media()
|
|
||||||
if first_media:
|
|
||||||
return f"{first_media.get_absolute_url()}&pl={self.friendly_token}"
|
|
||||||
|
|
||||||
if api:
|
if api:
|
||||||
return reverse("api_get_playlist", kwargs={"friendly_token": self.friendly_token})
|
return reverse("api_get_playlist", kwargs={"friendly_token": self.friendly_token})
|
||||||
else:
|
else:
|
||||||
@@ -61,11 +41,6 @@ class Playlist(models.Model):
|
|||||||
def url(self):
|
def url(self):
|
||||||
return self.get_absolute_url()
|
return self.get_absolute_url()
|
||||||
|
|
||||||
@property
|
|
||||||
def playback_url(self):
|
|
||||||
"""URL that starts playing the first media in the playlist"""
|
|
||||||
return self.get_absolute_url(start_playback=True)
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def api_url(self):
|
def api_url(self):
|
||||||
return self.get_absolute_url(api=True)
|
return self.get_absolute_url(api=True)
|
||||||
@@ -120,46 +95,3 @@ class PlaylistMedia(models.Model):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ["ordering", "-action_date"]
|
ordering = ["ordering", "-action_date"]
|
||||||
|
|
||||||
|
|
||||||
@receiver(post_save, sender=Playlist)
|
|
||||||
def create_or_update_playlist_media(sender, instance, created, **kwargs):
|
|
||||||
"""
|
|
||||||
Automatically create or update a Media object that represents this Playlist in listings.
|
|
||||||
This allows playlists to appear alongside regular media in search results and listings.
|
|
||||||
"""
|
|
||||||
from .media import Media
|
|
||||||
|
|
||||||
# Check if a Media representation already exists for this playlist
|
|
||||||
media_representation = Media.objects.filter(linked_playlist=instance).first()
|
|
||||||
|
|
||||||
if media_representation:
|
|
||||||
# Update existing media representation
|
|
||||||
media_representation.title = instance.title
|
|
||||||
media_representation.description = instance.description
|
|
||||||
media_representation.user = instance.user
|
|
||||||
media_representation.media_type = "playlist"
|
|
||||||
media_representation.encoding_status = "success"
|
|
||||||
media_representation.save()
|
|
||||||
else:
|
|
||||||
# Create new media representation for this playlist
|
|
||||||
Media.objects.create(
|
|
||||||
title=instance.title,
|
|
||||||
description=instance.description,
|
|
||||||
user=instance.user,
|
|
||||||
linked_playlist=instance,
|
|
||||||
media_type="playlist",
|
|
||||||
encoding_status="success",
|
|
||||||
# Inherit the same state and review status defaults
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@receiver(pre_delete, sender=Playlist)
|
|
||||||
def delete_playlist_media(sender, instance, **kwargs):
|
|
||||||
"""
|
|
||||||
Delete the associated Media representation when a Playlist is deleted.
|
|
||||||
"""
|
|
||||||
from .media import Media
|
|
||||||
|
|
||||||
# Delete any Media objects that represent this playlist
|
|
||||||
Media.objects.filter(linked_playlist=instance).delete()
|
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ MEDIA_TYPES_SUPPORTED = (
|
|||||||
("image", "Image"),
|
("image", "Image"),
|
||||||
("pdf", "Pdf"),
|
("pdf", "Pdf"),
|
||||||
("audio", "Audio"),
|
("audio", "Audio"),
|
||||||
("playlist", "Playlist"),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
ENCODE_EXTENSIONS = (
|
ENCODE_EXTENSIONS = (
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ class MediaList(APIView):
|
|||||||
if user:
|
if user:
|
||||||
base_filters &= Q(user=user)
|
base_filters &= Q(user=user)
|
||||||
|
|
||||||
base_queryset = Media.objects.prefetch_related("user", "tags").select_related("linked_playlist")
|
base_queryset = Media.objects.prefetch_related("user", "tags")
|
||||||
|
|
||||||
if not request.user.is_authenticated:
|
if not request.user.is_authenticated:
|
||||||
return base_queryset.filter(base_filters)
|
return base_queryset.filter(base_filters)
|
||||||
@@ -159,17 +159,17 @@ class MediaList(APIView):
|
|||||||
media = show_recommended_media(request, limit=50)
|
media = show_recommended_media(request, limit=50)
|
||||||
already_sorted = True
|
already_sorted = True
|
||||||
elif show_param == "featured":
|
elif show_param == "featured":
|
||||||
media = Media.objects.filter(listable=True, featured=True).prefetch_related("user", "tags").select_related("linked_playlist")
|
media = Media.objects.filter(listable=True, featured=True).prefetch_related("user", "tags")
|
||||||
elif show_param == "shared_by_me":
|
elif show_param == "shared_by_me":
|
||||||
if not self.request.user.is_authenticated:
|
if not self.request.user.is_authenticated:
|
||||||
media = Media.objects.none()
|
media = Media.objects.none()
|
||||||
else:
|
else:
|
||||||
media = Media.objects.filter(permissions__owner_user=self.request.user).prefetch_related("user", "tags").select_related("linked_playlist").distinct()
|
media = Media.objects.filter(permissions__owner_user=self.request.user).prefetch_related("user", "tags").distinct()
|
||||||
elif show_param == "shared_with_me":
|
elif show_param == "shared_with_me":
|
||||||
if not self.request.user.is_authenticated:
|
if not self.request.user.is_authenticated:
|
||||||
media = Media.objects.none()
|
media = Media.objects.none()
|
||||||
else:
|
else:
|
||||||
base_queryset = Media.objects.prefetch_related("user", "tags").select_related("linked_playlist")
|
base_queryset = Media.objects.prefetch_related("user", "tags")
|
||||||
|
|
||||||
# Build OR conditions similar to _get_media_queryset
|
# Build OR conditions similar to _get_media_queryset
|
||||||
conditions = Q(permissions__user=request.user)
|
conditions = Q(permissions__user=request.user)
|
||||||
@@ -183,14 +183,14 @@ class MediaList(APIView):
|
|||||||
user_queryset = User.objects.all()
|
user_queryset = User.objects.all()
|
||||||
user = get_object_or_404(user_queryset, username=author_param)
|
user = get_object_or_404(user_queryset, username=author_param)
|
||||||
if self.request.user == user or is_mediacms_editor(self.request.user):
|
if self.request.user == user or is_mediacms_editor(self.request.user):
|
||||||
media = Media.objects.filter(user=user).prefetch_related("user", "tags").select_related("linked_playlist")
|
media = Media.objects.filter(user=user).prefetch_related("user", "tags")
|
||||||
else:
|
else:
|
||||||
media = self._get_media_queryset(request, user)
|
media = self._get_media_queryset(request, user)
|
||||||
already_sorted = True
|
already_sorted = True
|
||||||
|
|
||||||
else:
|
else:
|
||||||
if is_mediacms_editor(self.request.user):
|
if is_mediacms_editor(self.request.user):
|
||||||
media = Media.objects.prefetch_related("user", "tags").select_related("linked_playlist")
|
media = Media.objects.prefetch_related("user", "tags")
|
||||||
else:
|
else:
|
||||||
media = self._get_media_queryset(request)
|
media = self._get_media_queryset(request)
|
||||||
already_sorted = True
|
already_sorted = True
|
||||||
@@ -995,7 +995,7 @@ class MediaSearch(APIView):
|
|||||||
|
|
||||||
if request.user.is_authenticated:
|
if request.user.is_authenticated:
|
||||||
if is_mediacms_editor(self.request.user):
|
if is_mediacms_editor(self.request.user):
|
||||||
media = Media.objects.prefetch_related("user", "tags").select_related("linked_playlist")
|
media = Media.objects.prefetch_related("user", "tags")
|
||||||
basic_query = Q()
|
basic_query = Q()
|
||||||
else:
|
else:
|
||||||
basic_query = Q(listable=True) | Q(permissions__user=request.user) | Q(user=request.user)
|
basic_query = Q(listable=True) | Q(permissions__user=request.user) | Q(user=request.user)
|
||||||
|
|||||||
@@ -222,12 +222,6 @@ a.item-thumb {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.item.playlist-item & {
|
|
||||||
&:before {
|
|
||||||
content: '\e05f'; // Material icon: playlist_play
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.item.category-item & {
|
.item.category-item & {
|
||||||
&:before {
|
&:before {
|
||||||
content: '\e892';
|
content: '\e892';
|
||||||
|
|||||||
@@ -31,11 +31,14 @@ export function PlaylistItem(props) {
|
|||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
style={!thumbnailUrl ? null : { backgroundImage: "url('" + thumbnailUrl + "')" }}
|
style={!thumbnailUrl ? null : { backgroundImage: "url('" + thumbnailUrl + "')" }}
|
||||||
>
|
>
|
||||||
{!thumbnailUrl ? null : (
|
<div className="playlist-count">
|
||||||
<div key="item-type-icon" className="item-type-icon">
|
<div>
|
||||||
<div></div>
|
<div>
|
||||||
|
<span>{props.media_count}</span>
|
||||||
|
<i className="material-icons">playlist_play</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="playlist-hover-play-all">
|
<div className="playlist-hover-play-all">
|
||||||
<div>
|
<div>
|
||||||
@@ -50,6 +53,9 @@ export function PlaylistItem(props) {
|
|||||||
<UnderThumbWrapper title={props.title} link={props.link}>
|
<UnderThumbWrapper title={props.title} link={props.link}>
|
||||||
{titleComponent()}
|
{titleComponent()}
|
||||||
{metaComponents()}
|
{metaComponents()}
|
||||||
|
<a href={props.link} title="" className="view-full-playlist">
|
||||||
|
VIEW FULL PLAYLIST
|
||||||
|
</a>
|
||||||
</UnderThumbWrapper>
|
</UnderThumbWrapper>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user