shiftregister/pages/admin.py

@@ -1,26 +1,16 @@
 from pathlib import Path
 
-from django.contrib import admin, messages
+from django.contrib import admin
 
 from .models import Page
-from .parser import import_pages
 
 
 def reimport(modeladmin, request, queryset):
-    num_pages = len(list(import_pages(True, set(page.url for page in queryset))))
-
-    if num_pages == 0:
-        modeladmin.message_user(
-            request, "Es wurden keine Seiten reimportiert.", messages.WARNING
-        )
-    elif num_pages == 1:
-        modeladmin.message_user(
-            request, "Eine Seite wurde reimportiert.", messages.SUCCESS
-        )
-    else:
-        modeladmin.message_user(
-            request, f"{num_pages} Seiten wurden reimportiert.", messages.SUCCESS
-        )
+    for page in queryset:
+        path = Path(__file__).resolve().parent / "default_content" / f"{page.url}.html"
+        if path.exists():
+            page.content = path.read_text()
+            page.save()
 
 
 @admin.register(Page)

shiftregister/pages/default_content/team_faq.html

@@ -1,4 +1,3 @@
-<title>Team-FAQ</title>
 <div class="content">
     <h2 id="Muss-das-sein">Muss das sein?</h2>
     <p>A: Alle Teammitglieder bekommen Schichten. Selbst AK Sicherheit. Es gibt keine Ausnahmen. Alle packen an.</p>

shiftregister/pages/management/commands/importhtml.py

@@ -1,6 +1,9 @@
-from django.core.management.base import BaseCommand
+from pathlib import Path
 
-from ...parser import import_pages
+from bs4 import BeautifulSoup
+from django.core.management.base import BaseCommand, CommandError
+
+from ...models import Page
 
 
 class Command(BaseCommand):
@@ -13,9 +16,30 @@ class Command(BaseCommand):
         parser.add_argument("pages", help="Specify which pages to import", nargs="*")
 
     def handle(self, *args, **options):
-        pages = import_pages(options["force"], options["pages"])
+        content_path = Path(__file__).resolve().parent.parent.parent / "default_content"
+        for file in content_path.iterdir():
+            if (pages := options["pages"]) and file.stem not in pages:
+                continue
 
-        for p in pages:
-            self.stderr.write(
-                self.style.SUCCESS(f'created new page "{p.title}" for slug {p.url}')
-            )
+            slug = file.stem
+            p, created = Page.objects.get_or_create(url=slug)
+            if (not created) and (not options["force"]):
+                continue
+
+            soup = BeautifulSoup(file.read_text(), "html.parser")
+
+            if soup.title:
+                p.title = soup.title.string
+                soup.title.decompose()
+            else:
+                p.title = slug.title()
+
+            if visible := soup.find("meta", attrs={"name": "visible"}):
+                p.visible = "content" not in visible.attrs or visible.attrs[
+                    "content"
+                ].lower() in ("1", "true", "yes")
+                visible.decompose()
+
+            p.content = str(soup).strip()
+            p.save()
+            print(f'created new page "{p.title}" for slug {slug}')

shiftregister/pages/parser.py

@@ -1,37 +0,0 @@
-from pathlib import Path
-
-from bs4 import BeautifulSoup
-
-from .models import Page
-
-content_path = Path(__file__).resolve().parent / "default_content"
-
-
-def import_pages(force, pages):
-    for file in content_path.iterdir():
-        if pages and file.stem not in pages:
-            continue
-
-        slug = file.stem
-        p, created = Page.objects.get_or_create(url=slug)
-        if not created and not force:
-            continue
-
-        soup = BeautifulSoup(file.read_text(), "html.parser")
-
-        if soup.title:
-            p.title = soup.title.string
-            soup.title.decompose()
-        else:
-            p.title = slug.title()
-
-        if visible := soup.find("meta", attrs={"name": "visible"}):
-            p.visible = "content" not in visible.attrs or visible.attrs[
-                "content"
-            ].lower() in ("1", "true", "yes")
-            visible.decompose()
-
-        p.content = str(soup).strip()
-        p.save()
-
-        yield p