Private
Public Access
Subscription editing was a real gap: there was no way to rename a feed's display title, move it between folders, or create a folder at all outside OPML import. Added an edit page (apps/feeds/views.py:edit_subscription, EditSubscriptionForm) reachable from the subscriptions list. Added feed-level tagging via a new SubscriptionTag model (apps/articles/ models.py), mirroring the existing ArticleTag — tag a whole feed on its edit page, and every one of its articles surfaces under that tag in the stream alongside individually-tagged articles (apps.reader.views._apply_ scope now matches either). Renamed AddTagToArticleForm to AddTagForm since it's shared by both now. The stream also now remembers the last filter (unread/all/starred/saved) in the session instead of always defaulting to "unread" when a sidebar feed/folder/tag link omits ?filter= — sidebar links no longer force ?filter=all, letting the remembered choice apply. Verified end to end against a running dev server: editing a subscription's title/folder, creating a folder inline, tagging a feed and seeing its articles appear under that tag, and the remembered-filter behavior across requests with no ?filter= param. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
164 lines
6.0 KiB
Python
164 lines
6.0 KiB
Python
from io import BytesIO
|
|
|
|
from django.contrib import messages
|
|
from django.contrib.auth.decorators import login_required
|
|
from django.http import HttpResponse
|
|
from django.shortcuts import get_object_or_404, redirect, render
|
|
from django.views.decorators.http import require_POST
|
|
|
|
from apps.articles.forms import AddTagForm
|
|
from apps.articles.models import SubscriptionTag, Tag
|
|
|
|
from .forms import AddFeedForm, EditSubscriptionForm, OPMLImportForm
|
|
from .models import Feed, Subscription
|
|
from .opml import export_opml, import_opml, parse_opml
|
|
from .services.fetcher import fetch_and_ingest
|
|
from .tasks import import_opml_task
|
|
|
|
OPML_ASYNC_THRESHOLD = 50
|
|
|
|
|
|
@login_required
|
|
def add_feed(request):
|
|
form = AddFeedForm(request.POST or None, user=request.user)
|
|
if request.method == "POST" and form.is_valid():
|
|
feed_url = form.cleaned_data["feed_url"]
|
|
feed, _created = Feed.objects.get_or_create(feed_url=feed_url)
|
|
|
|
subscription, created = Subscription.objects.get_or_create(
|
|
user=request.user,
|
|
feed=feed,
|
|
defaults={"folder": form.cleaned_data["folder"]},
|
|
)
|
|
if not created:
|
|
messages.info(request, "You're already subscribed to that feed.")
|
|
return redirect("reader:stream")
|
|
|
|
# Fetch synchronously so the user sees results immediately; the
|
|
# periodic Celery poll takes over from here for subsequent fetches.
|
|
result = fetch_and_ingest(feed)
|
|
feed.save()
|
|
|
|
if result.status == Feed.STATUS_ERROR:
|
|
messages.warning(
|
|
request,
|
|
f"Subscribed to {feed_url}, but the initial fetch failed: {result.error_message}",
|
|
)
|
|
else:
|
|
article_count = len(result.new_article_ids)
|
|
messages.success(
|
|
request,
|
|
f"Subscribed to '{subscription.display_title}' — "
|
|
f"{article_count} article(s) fetched.",
|
|
)
|
|
return redirect("reader:stream")
|
|
|
|
return render(request, "feeds/add_feed.html", {"form": form})
|
|
|
|
|
|
@login_required
|
|
def subscription_list(request):
|
|
subscriptions = (
|
|
Subscription.objects.filter(user=request.user)
|
|
.select_related("feed", "folder")
|
|
.order_by("folder__name", "order", "id")
|
|
)
|
|
return render(request, "feeds/subscriptions.html", {"subscriptions": subscriptions})
|
|
|
|
|
|
@login_required
|
|
def edit_subscription(request, subscription_id):
|
|
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
|
form = EditSubscriptionForm(request.POST or None, instance=subscription, user=request.user)
|
|
if request.method == "POST" and form.is_valid():
|
|
form.save()
|
|
messages.success(request, f"Updated '{subscription.display_title}'.")
|
|
return redirect("feeds:subscription_list")
|
|
|
|
return render(
|
|
request, "feeds/edit_subscription.html", {"form": form, "subscription": subscription}
|
|
)
|
|
|
|
|
|
@login_required
|
|
def subscription_tags_partial(request, subscription_id):
|
|
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
|
tags = Tag.objects.filter(
|
|
subscription_tags__subscription=subscription, subscription_tags__user=request.user
|
|
)
|
|
all_user_tags = Tag.objects.filter(user=request.user).exclude(pk__in=[t.pk for t in tags])
|
|
return render(
|
|
request,
|
|
"feeds/_subscription_tags.html",
|
|
{"subscription": subscription, "tags": tags, "all_user_tags": all_user_tags},
|
|
)
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def add_tag_to_subscription(request, subscription_id):
|
|
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
|
form = AddTagForm(request.POST)
|
|
if form.is_valid():
|
|
tag_name = form.cleaned_data["tag_name"].strip()
|
|
if tag_name:
|
|
tag, _ = Tag.objects.get_or_create(user=request.user, name=tag_name)
|
|
SubscriptionTag.objects.get_or_create(
|
|
user=request.user, subscription=subscription, tag=tag
|
|
)
|
|
return subscription_tags_partial(request, subscription_id)
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def remove_tag_from_subscription(request, subscription_id, tag_id):
|
|
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
|
SubscriptionTag.objects.filter(
|
|
user=request.user, subscription=subscription, tag_id=tag_id
|
|
).delete()
|
|
return subscription_tags_partial(request, subscription_id)
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def unsubscribe(request, subscription_id):
|
|
subscription = get_object_or_404(Subscription, user=request.user, pk=subscription_id)
|
|
title = subscription.display_title
|
|
subscription.delete()
|
|
messages.success(request, f"Unsubscribed from '{title}'.")
|
|
return redirect("feeds:subscription_list")
|
|
|
|
|
|
@login_required
|
|
def import_opml_view(request):
|
|
form = OPMLImportForm(request.POST or None, request.FILES or None)
|
|
if request.method == "POST" and form.is_valid():
|
|
content = form.cleaned_data["opml_file"].read()
|
|
try:
|
|
entry_count = len(parse_opml(BytesIO(content)))
|
|
except Exception:
|
|
messages.error(request, "That file doesn't look like a valid OPML export.")
|
|
return redirect("feeds:import_opml")
|
|
|
|
if entry_count > OPML_ASYNC_THRESHOLD:
|
|
import_opml_task.delay(request.user.id, content.decode("utf-8"))
|
|
messages.success(request, f"Importing {entry_count} feeds in the background.")
|
|
else:
|
|
result = import_opml(request.user, BytesIO(content))
|
|
messages.success(
|
|
request,
|
|
f"Imported {result['created']} feed(s) "
|
|
f"({result['already_subscribed']} already subscribed).",
|
|
)
|
|
return redirect("feeds:subscription_list")
|
|
|
|
return render(request, "feeds/import_opml.html", {"form": form})
|
|
|
|
|
|
@login_required
|
|
def export_opml_view(request):
|
|
content = export_opml(request.user)
|
|
response = HttpResponse(content, content_type="text/x-opml")
|
|
response["Content-Disposition"] = 'attachment; filename="evection-subscriptions.opml"'
|
|
return response
|