Slugify series title in a receiver

Author: ObserverOfTime

MangAdventure/templates/layout.html

@@ -5,6 +5,7 @@
       <meta charset="UTF-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
       <meta name="generator" content="MangAdventure v{{ MANGADV_VERSION }}">
+      <meta name="license" content="MIT">
     {% endcache %}
     {% block color %}
       <meta name="theme-color" content="{{ config.ALTER_BG_COLOR }}">

config/urls.py

@@ -23,11 +23,8 @@
 
 if settings.DEBUG:  # pragma: no cover
     from django.conf.urls.static import static
-    urlpatterns += static(
-        settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
-    )
-    urlpatterns += static(
-        settings.STATIC_URL, document_root=settings.STATIC_ROOT
+    urlpatterns.extend(
+        static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
     )
     if find_spec('debug_toolbar'):
         from debug_toolbar import urls as djdt_urls

reader/models.py

@@ -293,8 +293,8 @@ def sitemap_images(self) -> List[str]:
 
     def save(self, *args, **kwargs):
         """Save the current instance."""
-        # TODO: move this to a receiver?
-        self.slug = slugify(self.slug or self.title)
+        if not self.slug:
+            self.slug = slugify(self.title)
         super().save(*args, **kwargs)
 
     def __str__(self) -> str:

reader/receivers.py

@@ -15,6 +15,7 @@
 from django.http.request import QueryDict
 from django.urls.base import resolve
 from django.urls.exceptions import Resolver404
+from django.utils.text import slugify
 
 from .models import Chapter, Page, Series
 
@@ -46,6 +47,10 @@ def redirect_series(sender: Type[Series], instance: Series, **kwargs):
         current = Series.objects.get(id=instance.id)
     except Series.DoesNotExist:
         return
+    # update the slug while we're at it
+    if current.title != instance.title and \
+            current.slug == instance.slug == slugify(current.title):
+        instance.slug = slugify(instance.title)
     if current.slug != instance.slug:
         old_path = current.get_absolute_url()
         old_dir = current.get_directory()

reader/tests/test_models.py

@@ -70,6 +70,7 @@ def create_series(title: str = 'My Series', **kwargs):
     def test_create(self):
         series = self.create_series()
         assert str(series) == 'My Series'
+        assert series.slug == 'my-series'
 
     def test_get_absolute_url(self):
         series = self.create_series()

reader/tests/test_receivers.py

@@ -21,22 +21,27 @@ class TestRedirectSeries(ReaderTestBase):
     def setup_method(self):
         super().setup_method()
         self.series = Series.objects.create(
-            title='series', slug='old-slug', cover=get_test_image()
+            title='Old Slug', slug='old-slug', cover=get_test_image()
         )
         self.chapter = self.series.chapters.create(
             title='Chapter', number=1, file=get_valid_zip_file()
         )
 
+    def test_slug(self):
+        self.series.title = 'New Slug'
+        self.series.save(update_fields=('title', 'slug'))
+        assert self.series.slug == 'new-slug'
+
     def test_redirect(self):
         url1 = self.series.get_absolute_url()
 
         self.series.slug = 'new-slug'
-        self.series.save()
+        self.series.save(update_fields=('slug',))
         url2 = self.series.get_absolute_url()
         assert get_redirect_list() == [(url1, url2)]
 
         self.series.slug = 'another-slug'
-        self.series.save()
+        self.series.save(update_fields=('slug',))
         url3 = self.series.get_absolute_url()
         assert get_redirect_list() == [(url2, url3), (url1, url3)]
 
@@ -45,7 +50,7 @@ def test_redirect(self):
             assert name not in self.chapter.pages.first().image.name
 
         self.series.slug = 'old-slug'
-        self.series.save()
+        self.series.save(update_fields=('slug',))
         assert get_redirect_list() == [(url3, url1), (url2, url1)]
 
 
@@ -62,7 +67,7 @@ def setup_method(self):
     def test_redirect(self):
         self.chapter.number = 2
         self.chapter.volume = 2
-        self.chapter.save()
+        self.chapter.save(update_fields=('number', 'volume'))
         series_path = settings.MEDIA_ROOT / self.series.get_directory()
         assert (series_path / '2' / '2').exists()
         assert not (series_path / '0' / '1').exists()

requirements.txt

@@ -1,7 +1,7 @@
-django~=4.1.9
+django~=4.1.10
 djangorestframework>=3.14
 django-allauth>=0.54
-Pillow>=9.5
+Pillow>=10.0
 libsass-bin>=0.22
 yaenv~=1.4.3; python_version=='3.8'
 yaenv~=1.5.2; python_version=='3.9'