Private
Public Access
Folders are gone — organization is tags-only, via the SubscriptionTag model added last commit. A migration converts every existing Folder into a same-named Tag applied to its feeds, and every folder-scoped FilterRule into an equivalent tag-scoped one, before the Folder table is dropped, so upgrading an existing instance loses nothing (verified by seeding the pre-removal schema directly and running the migration chain against it). Unlike folders, a feed can carry more than one tag, so: - apps.articles.tasks.apply_filter_rules_for_feed and apps.rules.tasks's backlog re-apply now scope by "does this feed carry tag X" rather than "does this feed belong to folder X". - apps.feeds.opml: a feed's tags export as a comma-separated "category" attribute (the standard OPML way to represent multiple categories) instead of nesting under one folder outline. Import reads both that attribute and nested category outlines, turning each enclosing level into its own tag rather than collapsing to the nearest one. - The sidebar groups feeds by tag instead of folder, so a feed with two tags now appears in both groups; untagged feeds fall into "Untagged". AddFeedForm gained a comma-separated tag_names field for parity with the old add-time folder picker. EditSubscriptionForm dropped its folder field entirely — tagging a subscription happens through the tag editor already on that page. Verified end to end: the migration chain from empty, the data migration against a seeded pre-removal schema (folder/subscription/rule all convert correctly), and the running app's sidebar grouping, OPML export category attributes, and tag editor. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
56 lines
2.0 KiB
Python
56 lines
2.0 KiB
Python
from django.contrib import messages
|
|
from django.contrib.auth.decorators import login_required
|
|
from django.shortcuts import get_object_or_404, redirect, render
|
|
from django.views.decorators.http import require_POST
|
|
|
|
from .forms import FilterRuleForm
|
|
from .models import FilterRule
|
|
from .tasks import reapply_rules_for_user_backlog
|
|
|
|
|
|
@login_required
|
|
def rule_list(request):
|
|
rules = FilterRule.objects.filter(user=request.user).select_related("feed", "tag")
|
|
return render(request, "rules/rule_list.html", {"rules": rules})
|
|
|
|
|
|
@login_required
|
|
def create_rule(request):
|
|
form = FilterRuleForm(request.POST or None, user=request.user)
|
|
if request.method == "POST" and form.is_valid():
|
|
form.save()
|
|
messages.success(request, "Rule created.")
|
|
return redirect("rules:rule_list")
|
|
return render(request, "rules/rule_form.html", {"form": form})
|
|
|
|
|
|
@login_required
|
|
def edit_rule(request, rule_id):
|
|
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
|
|
form = FilterRuleForm(request.POST or None, instance=rule, user=request.user)
|
|
if request.method == "POST" and form.is_valid():
|
|
form.save()
|
|
messages.success(request, "Rule updated.")
|
|
return redirect("rules:rule_list")
|
|
return render(request, "rules/rule_form.html", {"form": form, "rule": rule})
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def delete_rule(request, rule_id):
|
|
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
|
|
rule.delete()
|
|
messages.success(request, "Rule deleted.")
|
|
return redirect("rules:rule_list")
|
|
|
|
|
|
@login_required
|
|
@require_POST
|
|
def reapply_rule(request, rule_id):
|
|
rule = get_object_or_404(FilterRule, user=request.user, pk=rule_id)
|
|
# Run synchronously for immediate feedback, same pattern as add_feed —
|
|
# a Celery worker isn't required for this to work.
|
|
count = reapply_rules_for_user_backlog(rule.pk)
|
|
messages.success(request, f"Re-applied your rules to {count} unread article(s).")
|
|
return redirect("rules:rule_list")
|