TheLovinator/feedvault.se
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use templates for rendering

Browse source
This commit is contained in:
Joakim Hellsén 2026-03-27 04:26:09 +01:00
commit 603090205a
Signed by: Joakim Hellsén
SSH key fingerprint: SHA256:/9h/CsExpFp+PRhsfA0xznFx2CGfTT5R/kpuFfUgEQk
6 changed files with 248 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

63
feeds/views.py
View file

@ -4,7 +4,7 @@ import html
import json
from typing import TYPE_CHECKING
from django.http import HttpResponse
from django.db.models.query import QuerySet
from django.shortcuts import get_object_or_404
from django.shortcuts import redirect
from django.shortcuts import render
@ -14,6 +14,7 @@ from feeds.models import Feed
if TYPE_CHECKING:
from django.http import HttpRequest
from django.http import HttpResponse
from pytest_django.asserts import QuerySet
@ -38,35 +39,16 @@ def feed_detail(request: HttpRequest, feed_id: int) -> HttpResponse:
HttpResponse: An HTML response containing the feed details and its entries.
"""
feed: Feed = get_object_or_404(Feed, id=feed_id)
entries: QuerySet[Entry, Entry] = Entry.objects.filter(feed=feed).order_by(
"-published_at",
"-fetched_at",
)[:50]
html: list[str] = [
"<!DOCTYPE html>",
f"<html><head><title>FeedVault - {feed.url}</title></head><body>",
"<h1>Feed Detail</h1>",
f"<p><b>URL:</b> {feed.url}</p>",
f"<p><b>Domain:</b> {feed.domain}</p>",
f"<p><b>Active:</b> {'yes' if feed.is_active else 'no'}</p>",
f"<p><b>Created:</b> {feed.created_at}</p>",
f"<p><b>Last fetched:</b> {feed.last_fetched_at}</p>",
"<h2>Entries (latest 50)</h2>",
"<ul>",
]
for entry in entries:
title: str | None = entry.data.get("title") if entry.data else None
summary: str | None = entry.data.get("summary") if entry.data else None
snippet: str = title or summary or "[no title]"
html.append(
f"<li><b>{entry.published_at or entry.fetched_at}:</b> "
f'<a href="/feeds/{feed.pk}/entries/{entry.pk}/">{snippet}</a> '
f"<small>(id: {entry.entry_id})</small></li>",
)
html.extend(("</ul>", '<p><a href="/">Back to list</a></p>', "</body></html>"))
return HttpResponse("\n".join(html))
context: dict[str, Feed | QuerySet[Entry, Entry]] = {
"feed": feed,
"entries": entries,
}
return render(request, "feeds/feed_detail.html", context)
def entry_detail(request: HttpRequest, feed_id: int, entry_id: int) -> HttpResponse:
@ -83,32 +65,19 @@ def entry_detail(request: HttpRequest, feed_id: int, entry_id: int) -> HttpRespo
feed: Feed = get_object_or_404(Feed, id=feed_id)
entry: Entry = get_object_or_404(Entry, id=entry_id, feed=feed)
# Render images if present in entry.data
entry_data_html: str = ""
# Prepare entry data for display
if entry.data:
formatted_json: str = json.dumps(entry.data, indent=2, ensure_ascii=False)
escaped_json: str = html.escape(formatted_json)
note: str = '<div style="font-size:small;color:#666;margin-bottom:4px;">Note: HTML in the JSON is escaped for display and will not be rendered as HTML.</div>'
entry_data_html: str = f"{note}<pre>{escaped_json}</pre>"
escaped_json: str | None = html.escape(formatted_json)
else:
entry_data_html: str = "<p>[No data]</p>"
escaped_json: str | None = None
html_lines: list[str] = [
"<!DOCTYPE html>",
f"<html><head><title>FeedVault - Entry {entry.entry_id}</title></head><body>",
"<h1>Entry Detail</h1>",
f"<p><b>Feed:</b> <a href='/feeds/{feed.pk}/'>{feed.url}</a></p>",
f"<p><b>Entry ID:</b> {entry.entry_id}</p>",
f"<p><b>Published:</b> {entry.published_at}</p>",
f"<p><b>Fetched:</b> {entry.fetched_at}</p>",
f"<p><b>Content Hash:</b> {entry.content_hash}</p>",
f"<p><b>Error Message:</b> {entry.error_message or '[none]'} </p>",
"<h2>Entry Data</h2>",
entry_data_html,
f'<p><a href="/feeds/{feed.pk}/">Back to feed</a></p>',
"</body></html>",
]
return HttpResponse("\n".join(html_lines))
context = {
"feed": feed,
"entry": entry,
"escaped_json": escaped_json,
}
return render(request, "feeds/entry_detail.html", context)
def home(request: HttpRequest) -> HttpResponse: