diff --git a/apps/podcast/models.py b/apps/podcast/models.py index 4daf73a..aed58e1 100644 --- a/apps/podcast/models.py +++ b/apps/podcast/models.py @@ -209,26 +209,35 @@ class PodcastPlaylist(LowercaseSlugMixin, models.Model): def effective_thumbnail(self): """ Get the thumbnail for this playlist. - If playlist has no explicit thumbnail, fall back to the first podcast with a thumbnail. + If playlist has no explicit thumbnail, fall back to the first podcast with a thumbnail + or external thumbnail URL. """ if self.thumbnail: return self.thumbnail if hasattr(self, '_prefetched_objects_cache') and 'playlist_items' in self._prefetched_objects_cache: items = sorted( - [item for item in self.playlist_items.all() if getattr(item, 'podcast', None) and item.podcast.status and item.podcast.thumbnail], + [ + item for item in self.playlist_items.all() + if getattr(item, 'podcast', None) + and item.podcast.status + and (item.podcast.thumbnail or getattr(item.podcast, 'external_thumbnail_url', None)) + ], key=lambda x: getattr(x, 'priority', 0) ) - if items and items[0].podcast and items[0].podcast.thumbnail: - return items[0].podcast.thumbnail + if items and items[0].podcast: + p = items[0].podcast + return p.thumbnail or getattr(p, 'external_thumbnail_url', None) return None first_item = self.playlist_items.filter( - podcast__thumbnail__isnull=False, + models.Q(podcast__thumbnail__isnull=False) & ~models.Q(podcast__thumbnail='') | + models.Q(podcast__external_thumbnail_url__isnull=False) & ~models.Q(podcast__external_thumbnail_url=''), podcast__status=True - ).exclude(podcast__thumbnail='').select_related('podcast').order_by('priority').first() - if first_item and first_item.podcast and first_item.podcast.thumbnail: - return first_item.podcast.thumbnail + ).select_related('podcast').order_by('priority').first() + if first_item and first_item.podcast: + p = first_item.podcast + return p.thumbnail or getattr(p, 'external_thumbnail_url', None) return None def save(self, *args, **kwargs): diff --git a/apps/podcast/serializers.py b/apps/podcast/serializers.py index 4e407c4..00e76b2 100755 --- a/apps/podcast/serializers.py +++ b/apps/podcast/serializers.py @@ -45,11 +45,15 @@ class PodcastListSerializer(serializers.ModelSerializer): in_user_playlist = serializers.SerializerMethodField() share_link = serializers.CharField(read_only=True) audio_time = serializers.SerializerMethodField() + is_external = serializers.SerializerMethodField() class Meta: model = Podcast fields = ['id', 'title', 'slug', 'thumbnail', 'description', 'audio_file', - 'audio_time', 'view_count', 'created_at', 'in_user_playlist', 'share_link'] + 'audio_time', 'view_count', 'created_at', 'in_user_playlist', 'share_link', 'is_external'] + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) def get_thumbnail(self, obj): if not obj.thumbnail and getattr(obj, 'external_thumbnail_url', None): @@ -98,7 +102,10 @@ class PodcastDetailSerializer(serializers.ModelSerializer): fields = ['id', 'title', 'slug', 'thumbnail', 'description', 'audio_file', 'audio_time', 'view_count', 'download_count', 'categories', 'created_at', 'user_rate', 'average_rate', 'bookmark', - 'is_in_playlist', 'playlist_podcasts', 'in_user_playlist', 'share_link'] + 'is_in_playlist', 'playlist_podcasts', 'in_user_playlist', 'share_link', 'is_external'] + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) def get_audio_file(self, obj): """Get full URL for audio file if it exists with HTTPS and cache-buster""" @@ -247,6 +254,12 @@ class PodcastPlaylistListSerializer(serializers.ModelSerializer): def get_thumbnail(self, obj): thumb = getattr(obj, 'effective_thumbnail', obj.thumbnail) + if isinstance(thumb, str): + return { + 'sm': thumb, + 'md': thumb, + 'lg': thumb, + } return get_thumbs(thumb, self.context.get('request')) def get_total_time_formatted(self, obj): @@ -276,6 +289,12 @@ class PodcastPlaylistDetailSerializer(serializers.ModelSerializer): def get_thumbnail(self, obj): thumb = getattr(obj, 'effective_thumbnail', obj.thumbnail) + if isinstance(thumb, str): + return { + 'sm': thumb, + 'md': thumb, + 'lg': thumb, + } return get_thumbs(thumb, self.context.get('request')) def get_total_time_formatted(self, obj): diff --git a/apps/podcast/serializers_admin.py b/apps/podcast/serializers_admin.py index a7f8787..b3190be 100644 --- a/apps/podcast/serializers_admin.py +++ b/apps/podcast/serializers_admin.py @@ -77,6 +77,10 @@ class AdminPodcastListSerializer(serializers.ModelSerializer): slug = serializers.CharField(required=False, allow_blank=True, allow_null=True) categories_detail = AdminPodcastCategorySerializer(source="categories", many=True, read_only=True) collections_detail = AdminPodcastCollectionSerializer(source="collections", many=True, read_only=True) + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) class Meta: model = Podcast @@ -95,10 +99,22 @@ class AdminPodcastListSerializer(serializers.ModelSerializer): "audio_file", "external_audio_url", "external_thumbnail_url", + "is_external", "rss_guid" ] read_only_fields = ["id", "view_count", "download_count", "created_at", "updated_at"] + def to_representation(self, instance): + data = super().to_representation(instance) + from .serializers import build_podcast_audio_url + request = self.context.get("request") + if not data.get("thumbnail") and instance.external_thumbnail_url: + data["thumbnail"] = instance.external_thumbnail_url + if not data.get("audio_file") and instance.external_audio_url: + data["audio_file"] = build_podcast_audio_url(instance, request) + data["is_external"] = bool(not instance.audio_file and instance.external_audio_url) + return data + class AdminPodcastDetailSerializer(serializers.ModelSerializer): thumbnail = AbsoluteImageField(required=False, allow_null=True) audio_file = AbsoluteFileField(required=False, allow_null=True) @@ -108,10 +124,18 @@ class AdminPodcastDetailSerializer(serializers.ModelSerializer): collections = serializers.PrimaryKeyRelatedField(queryset=PodcastCollection.objects.all(), many=True, required=False) categories_detail = AdminPodcastCategorySerializer(source="categories", many=True, read_only=True) collections_detail = AdminPodcastCollectionSerializer(source="collections", many=True, read_only=True) + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) remove_thumbnail = serializers.BooleanField(write_only=True, required=False, default=False) remove_audio_file = serializers.BooleanField(write_only=True, required=False, default=False) bookmark_count = serializers.SerializerMethodField() + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) class Meta: model = Podcast @@ -135,12 +159,24 @@ class AdminPodcastDetailSerializer(serializers.ModelSerializer): "collections_detail", "external_audio_url", "external_thumbnail_url", + "is_external", "rss_guid", "remove_thumbnail", "remove_audio_file", ] read_only_fields = ["id", "view_count", "download_count", "bookmark_count", "created_at", "updated_at"] + def to_representation(self, instance): + data = super().to_representation(instance) + from .serializers import build_podcast_audio_url + request = self.context.get("request") + if not data.get("thumbnail") and instance.external_thumbnail_url: + data["thumbnail"] = instance.external_thumbnail_url + if not data.get("audio_file") and instance.external_audio_url: + data["audio_file"] = build_podcast_audio_url(instance, request) + data["is_external"] = bool(not instance.audio_file and instance.external_audio_url) + return data + def get_bookmark_count(self, obj): from apps.bookmark.models.bookmark import Bookmark return Bookmark.objects.filter(service=Bookmark.ServiceChoices.PODCAST, content_id=obj.id, status=True).count() @@ -224,6 +260,10 @@ class AdminPodcastPlaylistListSerializer(serializers.ModelSerializer): slug = serializers.CharField(required=False, allow_blank=True, allow_null=True) categories_detail = AdminPodcastCategorySerializer(source="categories", many=True, read_only=True) collections_detail = AdminPodcastCollectionSerializer(source="collections", many=True, read_only=True) + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) items_count = serializers.SerializerMethodField() class Meta: @@ -261,10 +301,18 @@ class AdminPodcastPlaylistDetailSerializer(serializers.ModelSerializer): collections = serializers.PrimaryKeyRelatedField(queryset=PodcastCollection.objects.all(), many=True, required=False) categories_detail = AdminPodcastCategorySerializer(source="categories", many=True, read_only=True) collections_detail = AdminPodcastCollectionSerializer(source="collections", many=True, read_only=True) + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) playlist_items_detail = AdminPodcastPlaylistItemSerializer(source="playlist_items", many=True, read_only=True) remove_thumbnail = serializers.BooleanField(write_only=True, required=False, default=False) bookmark_count = serializers.SerializerMethodField() + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) class Meta: model = PodcastPlaylist diff --git a/apps/podcast/serializers_dovodi.py b/apps/podcast/serializers_dovodi.py index 43e34c9..a2f8bdf 100644 --- a/apps/podcast/serializers_dovodi.py +++ b/apps/podcast/serializers_dovodi.py @@ -1,3 +1,4 @@ +from .serializers import build_podcast_audio_url from rest_framework import serializers from .models import Podcast, PodcastCategory, PodcastCollection, PodcastPlaylist, PlaylistItem @@ -51,6 +52,10 @@ class DovodiPodcastItemSerializer(serializers.ModelSerializer): remove_audio_file = serializers.BooleanField(write_only=True, required=False, default=False) playlist = serializers.IntegerField(required=False, allow_null=True, write_only=True) playlist_id = serializers.SerializerMethodField(read_only=True) + is_external = serializers.SerializerMethodField(read_only=True) + + def get_is_external(self, obj): + return bool(not obj.audio_file and getattr(obj, 'external_audio_url', None)) class Meta: model = Podcast @@ -71,6 +76,10 @@ class DovodiPodcastItemSerializer(serializers.ModelSerializer): "updated_at", "remove_thumbnail", "remove_audio_file", + "external_audio_url", + "external_thumbnail_url", + "is_external", + "rss_guid", ] read_only_fields = ["id", "view_count", "download_count", "playlist_id", "created_at", "updated_at"] @@ -78,6 +87,16 @@ class DovodiPodcastItemSerializer(serializers.ModelSerializer): appearance = obj.playlist_appearances.first() return appearance.playlist_id if appearance else None + def to_representation(self, instance): + data = super().to_representation(instance) + request = self.context.get("request") + if not data.get("thumbnail") and instance.external_thumbnail_url: + data["thumbnail"] = instance.external_thumbnail_url + if not data.get("audio_file") and instance.external_audio_url: + data["audio_file"] = build_podcast_audio_url(instance, request) + data["is_external"] = bool(not instance.audio_file and instance.external_audio_url) + return data + def create(self, validated_data): playlist_id = validated_data.pop("playlist", None) validated_data.pop("remove_thumbnail", False) @@ -95,13 +114,17 @@ class DovodiPodcastItemSerializer(serializers.ModelSerializer): remove_thumbnail = validated_data.pop("remove_thumbnail", False) remove_audio_file = validated_data.pop("remove_audio_file", False) - if remove_thumbnail and instance.thumbnail: - instance.thumbnail.delete(save=False) - instance.thumbnail = None - - if remove_audio_file and instance.audio_file: - instance.audio_file.delete(save=False) - instance.audio_file = None + if remove_thumbnail: + if instance.thumbnail: + instance.thumbnail.delete(save=False) + instance.thumbnail = None + instance.external_thumbnail_url = None + + if remove_audio_file: + if instance.audio_file: + instance.audio_file.delete(save=False) + instance.audio_file = None + instance.external_audio_url = None playlist_in_payload = "playlist" in self.initial_data playlist_id = validated_data.pop("playlist", None) diff --git a/apps/podcast/services/rss_importer.py b/apps/podcast/services/rss_importer.py index efc87af..ab6a460 100644 --- a/apps/podcast/services/rss_importer.py +++ b/apps/podcast/services/rss_importer.py @@ -170,6 +170,17 @@ class MaveRSSImporter: playlist.rss_feed_url = self.feed_url playlist.save(update_fields=['rss_feed_url']) + # Download playlist cover if missing + if not playlist.thumbnail and channel_img_url: + try: + img_res = requests.get(channel_img_url, timeout=10) + if img_res.status_code == 200 and img_res.content: + from django.core.files.base import ContentFile + ext = "png" if "png" in img_res.headers.get("Content-Type", "") else "jpg" + playlist.thumbnail.save(f"playlist_{playlist.id}.{ext}", ContentFile(img_res.content), save=True) + except Exception as img_err: + logger.warning(f"Could not download playlist thumbnail: {img_err}") + # Step 3: Check which items already exist in DB using a SINGLE IN query! all_guids = [p["guid"] for p in parsed_items] existing_guid_map = { @@ -252,7 +263,22 @@ class MaveRSSImporter: ) PlaylistItem.objects.bulk_create(playlist_items_to_create, batch_size=200) - # Step 7: Update playlist total time & sync date (1 query) + # Step 7: Inherit playlist categories to episodes + playlist_categories = list(playlist.categories.all()) + if playlist_categories: + all_playlist_podcast_ids = list( + PlaylistItem.objects.filter(playlist=playlist).values_list("podcast_id", flat=True) + ) + if all_playlist_podcast_ids: + PodcastCategoryThrough = Podcast.categories.through + through_records = [ + PodcastCategoryThrough(podcast_id=p_id, podcastcategory_id=cat.id) + for p_id in all_playlist_podcast_ids + for cat in playlist_categories + ] + PodcastCategoryThrough.objects.bulk_create(through_records, ignore_conflicts=True) + + # Step 8: Update playlist total time & sync date (1 query) playlist.total_time = playlist.calculate_total_time() playlist.last_synced_at = timezone.now() playlist.save(update_fields=['total_time', 'last_synced_at'])