Merge branch 'develop'

README.md

@@ -20,7 +20,6 @@ After switching to Wagtail, the documentation has to be updated. Stay tuned 😄
 - Video support - not as sophisticated as image / audio support, but it works 🤗
 - Comments via [django-fluent-comments](https://github.com/django-fluent/django-fluent-comments)
   and a build in moderating spam filter
-- Full-text search via [django-watson](https://github.com/etianen/django-watson)
 
 ## Deployment
 

cast/__init__.py

@@ -1,4 +1,4 @@
 """
 Just another blogging / podcasting package
 """
-__version__ = "0.2.1"
+__version__ = "0.2.2"

cast/api/serializers.py

@@ -2,8 +2,7 @@
 
 from rest_framework import serializers
 
-from ..models import Audio, Request, Video
-
+from ..models import Audio, Video
 
 logger = logging.getLogger(__name__)
 
@@ -31,13 +30,8 @@ class AudioPodloveSerializer(serializers.HyperlinkedModelSerializer):
     audio = serializers.ListField()
     chapters = serializers.ListField()
     duration = serializers.CharField(source="duration_str")
+    link = serializers.URLField(source="episode_url")
 
     class Meta:
         model = Audio
-        fields = ("title", "subtitle", "audio", "duration", "chapters")
-
-
-class RequestSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Request
-        fields = "__all__"
+        fields = ("title", "subtitle", "audio", "duration", "chapters", "link")

cast/api/urls.py

@@ -25,8 +25,6 @@
         views.AudioPodloveDetailView.as_view(),
         name="audio_podlove_detail",
     ),
-    # request
-    path("request/", views.RequestListView.as_view(), name="request_list"),
     # comment training data
     path("comment_training_data/", views.CommentTrainingDataView.as_view(), name="comment-training-data"),
 ]

cast/api/views.py

@@ -5,22 +5,16 @@
 from django.http import JsonResponse
 from django.urls import reverse
 from django.views.generic import CreateView
-from rest_framework import generics, status
+from rest_framework import generics
 from rest_framework.decorators import api_view
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
-from rest_framework.serializers import ListSerializer
 from rest_framework.views import APIView
 
 from ..forms import VideoForm
-from ..models import Audio, Request, SpamFilter, Video
-from .serializers import (
-    AudioPodloveSerializer,
-    AudioSerializer,
-    RequestSerializer,
-    VideoSerializer,
-)
+from ..models import Audio, SpamFilter, Video
+from .serializers import AudioPodloveSerializer, AudioSerializer, VideoSerializer
 from .viewmixins import AddRequestUserMixin, FileUploadResponseMixin
 
 logger = logging.getLogger(__name__)
@@ -37,7 +31,6 @@ def api_root(request):
         # ("galleries", request.build_absolute_uri(reverse("cast:api:gallery_list"))),
         ("videos", request.build_absolute_uri(reverse("cast:api:video_list"))),
         ("audios", request.build_absolute_uri(reverse("cast:api:audio_list"))),
-        ("requests", request.build_absolute_uri(reverse("cast:api:request_list"))),
         ("comment_training_data", request.build_absolute_uri(reverse("cast:api:comment-training-data"))),
     )
     return Response(OrderedDict(root_api_urls))
@@ -93,28 +86,16 @@ class AudioPodloveDetailView(generics.RetrieveAPIView):
     queryset = Audio.objects.all()
     serializer_class = AudioPodloveSerializer
 
-
-class RequestListView(generics.ListCreateAPIView):
-    queryset = Request.objects.all().order_by("-timestamp")
-    serializer_class = RequestSerializer
-    pagination_class = StandardResultsSetPagination
-    permission_classes = (IsAuthenticated,)
-
-    def create(self, request, *args, **kwargs):
-        """Allow for bulk create via many=True."""
-        serializer = self.get_serializer(data=request.data, many=isinstance(request.data, list))
-        serializer.is_valid(raise_exception=True)
-        self.perform_create(serializer)
-        headers = self.get_success_headers(serializer.data)
-        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
-
-    def perform_create(self, serializer):
-        """Use bulk_create for request lists, normal model serializer otherwise."""
-        if isinstance(serializer, ListSerializer):
-            requests = [Request(**d) for d in serializer.validated_data]
-            Request.objects.bulk_create(requests)
-        else:
-            serializer.save()
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        if (episode_id := request.query_params.get("episode_id")) is not None:
+            try:
+                episode_id = int(episode_id)
+                instance.set_episode_id(episode_id)
+            except (ValueError, TypeError):
+                pass
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
 
 
 class CommentTrainingDataView(APIView):

cast/blocks.py

@@ -1,8 +1,17 @@
 from itertools import chain, islice, tee
 
 from django.utils.functional import cached_property
-
-from wagtail.core.blocks import ChooserBlock, ListBlock
+from django.utils.safestring import mark_safe
+from pygments import highlight
+from pygments.formatters import HtmlFormatter
+from pygments.lexers import get_lexer_by_name
+from wagtail.core.blocks import (
+    CharBlock,
+    ChooserBlock,
+    ListBlock,
+    StructBlock,
+    TextBlock,
+)
 
 
 def previous_and_next(iterable):
@@ -58,3 +67,16 @@ def widget(self):
 
     def get_form_state(self, value):
         return self.widget.get_value_data(value)
+
+
+class CodeBlock(StructBlock):
+    language = CharBlock(help_text="The language of the code block")
+    source = TextBlock(rows=8, help_text="The source code of the block")
+
+    def render_basic(self, value, context=None):
+        if value:
+            lexer = get_lexer_by_name(value["language"], stripall=True)
+            highlighted = highlight(value["source"], lexer, HtmlFormatter())
+            return mark_safe(highlighted)
+        else:
+            return ""

cast/models/__init__.py

@@ -4,7 +4,6 @@
 from .itunes import ItunesArtWork
 from .moderation import SpamFilter
 from .pages import Blog, HomePage, Post, sync_media_ids
-from .request import Request
 from .video import Video, get_video_dimensions
 
 __all__ = [
@@ -19,7 +18,6 @@
     ItunesArtWork,
     Post,
     sync_media_ids,
-    Request,
     SpamFilter,
     Video,
     get_video_dimensions,