Fix summaries #14
|
@ -1,6 +1,7 @@
|
|||
"""
|
||||
URL configuration for ausglamr project.
|
||||
"""
|
||||
|
||||
from django.contrib import admin
|
||||
from django.urls import path, re_path
|
||||
from django.views.generic import TemplateView
|
||||
|
@ -65,6 +66,8 @@ urlpatterns = [
|
|||
views.UnsubscribeEmail.as_view(),
|
||||
name="unsubscribe-email",
|
||||
),
|
||||
path('robots.txt', TemplateView.as_view(template_name='robots.txt',
|
||||
content_type='text/plain')),
|
||||
path(
|
||||
"robots.txt",
|
||||
TemplateView.as_view(template_name="robots.txt", content_type="text/plain"),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
"""django apps"""
|
||||
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
|
|
@ -141,7 +141,7 @@ class ContactForm(forms.Form):
|
|||
bot_check = forms.CharField(
|
||||
label="What is usually stored in a library?",
|
||||
max_length=10,
|
||||
help_text="Checking that you are human"
|
||||
help_text="Checking that you are human",
|
||||
)
|
||||
|
||||
def clean_bot_check(self):
|
||||
|
|
|
@ -117,7 +117,7 @@ class Command(BaseCommand):
|
|||
if not opt_out:
|
||||
author_name = getattr(
|
||||
article, "author", None
|
||||
) or getattr(blog, "author", None)
|
||||
) or getattr(blog, "author", "")
|
||||
|
||||
description = (
|
||||
html.strip_tags(article.summary)
|
||||
|
@ -125,20 +125,26 @@ class Command(BaseCommand):
|
|||
hasattr(article, "summary")
|
||||
and len(article.summary) > 0
|
||||
)
|
||||
else html.strip_tags(article.description)
|
||||
else (
|
||||
html.strip_tags(article.description)
|
||||
if (
|
||||
hasattr(article, "description")
|
||||
and len(article.summary)
|
||||
)
|
||||
else html.strip_tags(article.content[0].value)[:200]
|
||||
else (
|
||||
html.strip_tags(article.content[0].value)
|
||||
if (
|
||||
hasattr(article, "content")
|
||||
and len(article.content)
|
||||
)
|
||||
else ""
|
||||
else None
|
||||
)
|
||||
)
|
||||
)
|
||||
if description:
|
||||
description += "..."
|
||||
description[:200] += "..."
|
||||
else:
|
||||
description = ""
|
||||
|
||||
instance = models.Article.objects.create(
|
||||
title=article.title,
|
||||
|
@ -168,7 +174,9 @@ class Command(BaseCommand):
|
|||
if newish:
|
||||
instance.announce()
|
||||
blog.set_success(
|
||||
updateddate=date_to_tz_aware(article.updated_parsed)
|
||||
updateddate=date_to_tz_aware(
|
||||
article.updated_parsed
|
||||
)
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
|
@ -191,7 +199,7 @@ class Command(BaseCommand):
|
|||
| Q(guid=getattr(edition, "id", edition.link))
|
||||
).exists():
|
||||
author_name = getattr(edition, "author", None) or getattr(
|
||||
edition, "author", None
|
||||
edition, "author", ""
|
||||
)
|
||||
|
||||
description = (
|
||||
|
@ -199,20 +207,26 @@ class Command(BaseCommand):
|
|||
if (
|
||||
hasattr(edition, "summary") and len(edition.summary)
|
||||
)
|
||||
else html.strip_tags(edition.description)
|
||||
else (
|
||||
html.strip_tags(edition.description)
|
||||
if (
|
||||
hasattr(edition, "description")
|
||||
and len(edition.description)
|
||||
)
|
||||
else html.strip_tags(edition.content[0].value)[:200] + "..."
|
||||
else (
|
||||
html.strip_tags(edition.content[0].value)
|
||||
if (
|
||||
hasattr(article, "content")
|
||||
and len(article.content)
|
||||
)
|
||||
else ""
|
||||
else None
|
||||
)
|
||||
)
|
||||
)
|
||||
if description:
|
||||
description += "..."
|
||||
description[:200] += "..."
|
||||
else:
|
||||
description = ""
|
||||
|
||||
instance = models.Edition.objects.create(
|
||||
title=edition.title,
|
||||
|
|
|
@ -94,9 +94,7 @@ class EventFeed(Feed):
|
|||
return (
|
||||
item.description
|
||||
if hasattr(item, "description")
|
||||
else item.details
|
||||
if hasattr(item, "details")
|
||||
else None
|
||||
else item.details if hasattr(item, "details") else None
|
||||
)
|
||||
|
||||
def item_link(self, item):
|
||||
|
@ -215,9 +213,7 @@ class CombinedFeed(Feed):
|
|||
return (
|
||||
item.description
|
||||
if hasattr(item, "description")
|
||||
else item.details
|
||||
if hasattr(item, "details")
|
||||
else None
|
||||
else item.details if hasattr(item, "details") else None
|
||||
)
|
||||
|
||||
def item_link(self, item):
|
||||
|
|
|
@ -194,9 +194,9 @@ class RegisterBlog(View):
|
|||
data["blog_info"] = blog_info
|
||||
|
||||
else:
|
||||
data[
|
||||
"error"
|
||||
] = "Could not auto-discover your feed info, please enter manually"
|
||||
data["error"] = (
|
||||
"Could not auto-discover your feed info, please enter manually"
|
||||
)
|
||||
|
||||
return render(request, "blogs/confirm-register.html", data)
|
||||
|
||||
|
|
Loading…
Reference in a new issue