From 83d75823a411660a9c5398b934840d1e9403f5a0 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Mon, 2 Oct 2023 21:08:11 +0200 Subject: [PATCH] don't save empty slugs for blogposts --- .../migrations/0002_alter_blogpost_slug.py | 18 ++++++++++++++++++ gawa/blog/models.py | 14 ++++++++++++-- gawa/start/models.py | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 gawa/blog/migrations/0002_alter_blogpost_slug.py diff --git a/gawa/blog/migrations/0002_alter_blogpost_slug.py b/gawa/blog/migrations/0002_alter_blogpost_slug.py new file mode 100644 index 0000000..d9fadbb --- /dev/null +++ b/gawa/blog/migrations/0002_alter_blogpost_slug.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.5 on 2023-10-02 19:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='blogpost', + name='slug', + field=models.SlugField(unique=True), + ), + ] diff --git a/gawa/blog/models.py b/gawa/blog/models.py index 0bc6f2c..89bc886 100644 --- a/gawa/blog/models.py +++ b/gawa/blog/models.py @@ -76,7 +76,7 @@ class BlogPost(Searchable): body_de = models.TextField(blank=True, default="""This aritcle is not available in english.""") category = models.ForeignKey( - Category, on_delete=models.SET_DEFAULT, null=False, + Category, on_delete=models.SET_DEFAULT, blank=False, default=Category.get_or_create_uncategorized) thumbnail = models.ImageField( blank=True, @@ -85,7 +85,15 @@ class BlogPost(Searchable): featured = models.BooleanField(default=False) langs = models.CharField( default=DEFAULT_LANGS.__repr__(), max_length=64) - slug = models.SlugField() + slug = models.SlugField(unique=True, blank=False) + + def save(self): + # check if the slug is empty if we remove whitespaces + if len(self.slug.strip()) == 0: + logger.error( + f"trying to save '{self.__class__}' with empty slug: {self}") + raise ValueError(f"trying to save '{self.__class__}' with empty slug: {self}") + super().save() def regenerate(self): """ @@ -239,7 +247,9 @@ class BlogPost(Searchable): try: matches = re.match(regex, file[0]) if matches is None: + # file is not a toml / meta file files.remove(file) + continue else: current_lang = matches.group(1) file[1] = matches.group(1) diff --git a/gawa/start/models.py b/gawa/start/models.py index 71a8d0e..b81660f 100644 --- a/gawa/start/models.py +++ b/gawa/start/models.py @@ -75,7 +75,7 @@ class Searchable(models.Model): class StaticSite(Searchable): """ - This model represents any static site, such as start:index, + This model represents any static site, such as start:index, that should show up in search. Every searchable view should inherit from start.views.SearchableView.