Reorganize episodes and podcasts views into focused modules

config/settings.py

@@ -52,9 +52,7 @@
     "health_check.contrib.redis",
     "heroicons",
     "widget_tweaks",
-    "simplecasts.episodes",
-    "simplecasts.podcasts",
-    "simplecasts.users",
+    "simplecasts",
 ]
 
 
@@ -77,8 +75,8 @@
     "simplecasts.middleware.HtmxCacheMiddleware",
     "simplecasts.middleware.HtmxMessagesMiddleware",
     "simplecasts.middleware.HtmxRedirectMiddleware",
+    "simplecasts.middleware.PlayerMiddleware",
     "simplecasts.middleware.SearchMiddleware",
-    "simplecasts.episodes.middleware.PlayerMiddleware",
 ]
 
 # Databases
@@ -216,7 +214,7 @@
 # authentication settings
 # https://docs.djangoproject.com/en/dev/ref/settings/#authentication-backends
 
-AUTH_USER_MODEL = "users.User"
+AUTH_USER_MODEL = "simplecasts.User"
 
 AUTHENTICATION_BACKENDS = [
     "django.contrib.auth.backends.ModelBackend",

config/urls.py

@@ -2,25 +2,8 @@
 from django.contrib import admin
 from django.urls import include, path
 
-from simplecasts import views
-
 urlpatterns = [
-    path("", views.index, name="index"),
-    path("about/", views.about, name="about"),
-    path("privacy/", views.privacy, name="privacy"),
-    path("accept-cookies/", views.accept_cookies, name="accept_cookies"),
-    path(
-        "covers/<int:size>/<str:encoded_url>.webp",
-        views.cover_image,
-        name="cover_image",
-    ),
-    path("robots.txt", views.robots, name="robots"),
-    path("manifest.json", views.manifest, name="manifest"),
-    path(".well-known/assetlinks.json", views.assetlinks, name="assetlinks"),
-    path(".well-known/security.txt", views.security, name="security"),
-    path("", include("simplecasts.episodes.urls")),
-    path("", include("simplecasts.podcasts.urls")),
-    path("", include("simplecasts.users.urls")),
+    path("", include("simplecasts.urls")),
     path("account/", include("allauth.urls")),
     path("ht/", include("health_check.urls")),
     path(settings.ADMIN_URL, admin.site.urls),

conftest.py

@@ -1,6 +1,3 @@
 pytest_plugins = [
     "simplecasts.tests.fixtures",
-    "simplecasts.episodes.tests.fixtures",
-    "simplecasts.podcasts.tests.fixtures",
-    "simplecasts.users.tests.fixtures",
 ]

justfile

@@ -16,11 +16,11 @@ export USE_X_FORWARDED_HOST := "false"
 
 # Install all dependencies
 [group('development')]
-install: pyinstall precommitinstall nltkdownload
+install: pyinstall pcinstall nltkdownload
 
 # Update all dependencies
 [group('development')]
-update: pyupdate pyinstall precommitupdate
+update: pyupdate pyinstall pcupdate
 
 # Install all Python dependencies
 [group('development')]
@@ -59,7 +59,7 @@ typecheck *args:
 
 # Run all checks
 [group('development')]
-check: precommitall typecheck test
+check: pcrunall typecheck test
 
 # Download NLTK data
 [group('development')]
@@ -88,24 +88,24 @@ psql *args:
 
 # Run pre-commit manually
 [group('development')]
-precommit *args:
+pc *args:
    uv run --with pre-commit-uv pre-commit {{ args }}
 
 # Install pre-commit hooks
 [group('development')]
-precommitinstall:
+pcinstall:
    @just precommit install
    @just precommit install --hook-type commit-msg
 
 # Update pre-commit hooks
 [group('development')]
-precommitupdate:
+pcupdate:
    @just precommit autoupdate
 
 # Re-run pre-commit on all files
 [group('development')]
-precommitall:
-   @just precommit run --all-files
+pcrunall:
+   @just pc run --all-files
 
 # Run Ansible playbook
 [group('deployment')]

pyproject.toml

@@ -195,7 +195,7 @@ django_settings_module = "simplecasts.settings"
 include=["simplecasts"]
 exclude=[
   "**/migrations/*.py",
-  "**/tests/*.py",
+  "**/tests/**",
 ]
 
 typeCheckingMode = "basic"

simplecasts/podcasts/admin.py → simplecasts/admin.py

@@ -1,19 +1,24 @@
 from typing import TYPE_CHECKING, ClassVar
 
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.db.models import Count, Exists, OuterRef, QuerySet
 from django.http import HttpRequest
+from django.template.defaultfilters import truncatechars
 from django.utils import timezone
 from django.utils.timesince import timesince, timeuntil
 
-from simplecasts.podcasts.models import (
+from simplecasts.models import (
+    AudioLog,
     Category,
+    Episode,
     Podcast,
-    PodcastQuerySet,
     Recommendation,
     Subscription,
+    User,
 )
-from simplecasts.search import search_queryset
+from simplecasts.models.episodes import EpisodeQuerySet
+from simplecasts.models.podcasts import PodcastQuerySet
 
 if TYPE_CHECKING:
     from django_stubs_ext import StrOrPromise  # pragma: no cover
@@ -27,6 +32,21 @@ class CategoryWithNumPodcasts(Category):
     CategoryWithNumPodcasts = Category
 
 
+@admin.register(User)
+class UserAdmin(BaseUserAdmin):
+    """User model admin."""
+
+    fieldsets = (
+        *tuple(BaseUserAdmin.fieldsets or ()),
+        (
+            "User preferences",
+            {
+                "fields": ("send_email_notifications",),
+            },
+        ),
+    )
+
+
 @admin.register(Category)
 class CategoryAdmin(admin.ModelAdmin):
     """Admin for podcast categories."""
@@ -228,7 +248,7 @@ class PodcastAdmin(admin.ModelAdmin):
         "exception",
     )
 
-    search_fields = ("search_vector",)
+    search_fields = ("search_document",)
 
     fieldsets = (
         (
@@ -294,11 +314,9 @@ def get_search_results(
         """Search episodes."""
         return (
             (
-                search_queryset(
-                    queryset,
-                    search_term,
-                    *self.search_fields,
-                ).order_by("-rank", "-pub_date"),
+                queryset.search(search_term, *self.search_fields).order_by(
+                    "-rank", "-pub_date"
+                ),
                 False,
             )
             if search_term
@@ -352,3 +370,76 @@ class SubscriptionAdmin(admin.ModelAdmin):
     def get_queryset(self, request: HttpRequest) -> QuerySet[Subscription]:
         """Returns queryset with related fields."""
         return super().get_queryset(request).select_related("podcast", "subscriber")
+
+
+@admin.register(Episode)
+class EpisodeAdmin(admin.ModelAdmin):
+    """Django admin for Episode model."""
+
+    list_display = ("episode_title", "podcast_title", "pub_date")
+    list_select_related = ("podcast",)
+    raw_id_fields = ("podcast",)
+    search_fields = ("search_document",)
+
+    @admin.display(description="Title")
+    def episode_title(self, obj: Episode) -> str:
+        """Render truncated episode title."""
+        return truncatechars(obj.title, 30)
+
+    @admin.display(description="Podcast")
+    def podcast_title(self, obj: Episode) -> str:
+        """Render truncated podcast title."""
+        return truncatechars(obj.podcast.title, 30)
+
+    def get_search_results(
+        self,
+        request: HttpRequest,
+        queryset: EpisodeQuerySet,
+        search_term: str,
+    ) -> tuple[QuerySet[Episode], bool]:
+        """Search episodes."""
+        return (
+            (
+                queryset.search(search_term, *self.search_fields).order_by(
+                    "-rank", "-pub_date"
+                ),
+                False,
+            )
+            if search_term
+            else super().get_search_results(request, queryset, search_term)
+        )
+
+    def get_ordering(self, request: HttpRequest) -> list[str]:
+        """Returns optimized search ordering.
+
+        If unfiltered, just search by id.
+        """
+        return (
+            []
+            if request.GET.get("q")
+            else [
+                "-id",
+            ]
+        )
+
+
+@admin.register(AudioLog)
+class AudioLogAdmin(admin.ModelAdmin):
+    """Django admin for AudioLog model."""
+
+    list_display = (
+        "episode",
+        "user",
+    )
+    readonly_fields = (
+        "episode",
+        "user",
+        "current_time",
+        "duration",
+        "listened",
+    )
+    ordering = ("-listened",)
+
+    def get_queryset(self, request: HttpRequest) -> QuerySet[AudioLog]:
+        """Optimize queryset for admin."""
+        return super().get_queryset(request).select_related("episode", "user")

simplecasts/podcasts/apps.py → simplecasts/apps.py

@@ -1,8 +1,8 @@
 from django.apps import AppConfig
 
 
-class PodcastsConfig(AppConfig):
+class ProjectConfig(AppConfig):
     """App configuration."""
 
-    name = "simplecasts.podcasts"
+    name = "simplecasts"
     default_auto_field = "django.db.models.BigAutoField"