From f363859ccc231e283d977d52244bbd8bdd0ca0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Thu, 19 Oct 2023 18:17:35 +0200
Subject: [PATCH] fix import
---
district/forms.py | 12 +++++++-----
shared/jekyll_import.py | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/district/forms.py b/district/forms.py
index 59f7252e..a64c0571 100644
--- a/district/forms.py
+++ b/district/forms.py
@@ -1,4 +1,5 @@
from django import forms
+from django.utils.safestring import mark_safe
from wagtail.admin.forms import WagtailAdminPageForm
from wagtail.models.collections import Collection
@@ -29,11 +30,12 @@ class JekyllImportForm(WagtailAdminPageForm):
jekyll_repo_url = forms.URLField(
max_length=512,
required=False,
- help_text="V GitHubu tlačítko Code -> a odkaz z Download zip"
- "např. 'https://github.com/pirati-web/cb.pirati.cz/archive/refs/heads/gh-pages.zip',"
- "pokud máte nainstalovaný Git, zvolte Použít Git a vložte"
- "jednoduše URL repozitáře "
- "např. 'https://github.com/pirati-web/cb.pirati.cz'",
+ help_text=mark_safe(
+ "V GitHubu tlačítko Code -> a odkaz z <strong>Download zip</strong>, "
+ "např. <em>https://github.com/pirati-web/cb.pirati.cz/archive/refs/heads/gh-pages.zip</em>. "
+ "Pokud máte nainstalovaný Git, zvolte <strong>Použít Git</strong> a vložte jednoduše "
+ "URL repozitáře, např. <em>https://github.com/pirati-web/cb.pirati.cz</em>."
+ )
)
readonly_log = forms.CharField(
disabled=True,
diff --git a/shared/jekyll_import.py b/shared/jekyll_import.py
index 8087bfca..cdd77721 100644
--- a/shared/jekyll_import.py
+++ b/shared/jekyll_import.py
@@ -546,7 +546,7 @@ class JekyllArticleImporter:
r = re.split(r"^---\s*$", f.read(), maxsplit=3, flags=re.MULTILINE)
try:
meta = yaml.safe_load(r[1].replace("\t", ""))
- except (ScannerError, ValueError):
+ except (ScannerError, ValueError, IndexError):
msg = "Nelze importovat článek - neparsovatelný YAML"
logger.warning(msg, extra={"file_path": file_path})
self.page_log += "{} - {}\n".format(msg, file_path)
--
GitLab