TheLovinator/twitch-drop-notifier
1
Fork 0
Code Issues Actions Packages Releases Activity

Sort drops within campaigns by required minutes watched
All checks were successful
Ruff / ruff (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Joakim Hellsén
2025-05-01 21:46:15 +02:00
parent ef02f7878e
commit 4e40bc032c
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/templates/index.html
View File

@ -45,21 +45,18 @@
{% for campaign, drops_list in campaigns.items %}
<div class="card mb-3">
<div class="card-header bg-secondary bg-opacity-25">
<h4 class="h6 mb-0">{{ campaign.name|default:"Unknown Campaign" }}</h4>
<h4 class="h6 mb-0"><a
href="{{ campaign.details_url|default:'#' }}">{{ campaign.name|default:"Unknown Campaign" }}</a>
</h4>
<div class="mt-1">
<a href="{{ campaign.details_url|default:'#' }}"
class="text-decoration-none">Details</a>
{% if campaign.details_url != campaign.account_link_url and campaign.account_link_url %}
| <a href="{{ campaign.account_link_url }}" class="text-decoration-none">Link
<a href="{{ campaign.account_link_url }}" class="text-decoration-none">Link
Account</a>
{% endif %}
</div>
<p class="mb-0 mt-1 text-muted small">
Ends in:
<abbr
title="{{ campaign.start_at|date:'l d F H:i' }} - {{ campaign.end_at|date:'l d F H:i' }}">
{{ campaign.end_at|timeuntil }}
</abbr>
{{ campaign.start_at|date:'l d F H:i' }} -
{{ campaign.end_at|date:'l d F H:i' }} | {{ campaign.end_at|timeuntil }}
</p>
</div>
<div class="card-body p-0">
@ -86,11 +83,11 @@
</td>
<td>{{ drop.name|default:'Unknown Drop' }}</td>
<td>
<abbr title="{{ drop.name|default:'Unknown Drop' }}">
{{ benefit.name|default:'Unknown Benefit' }}
</abbr>
{{ benefit.name|default:'Unknown Benefit' }}
</td>
<td>
{{ drop.required_minutes_watched|minutes_to_hours }}
</td>
<td>{{ drop.required_minutes_watched|minutes_to_hours }}</td>
</tr>
{% endfor %}
{% else %}

14
core/views.py
View File

@ -24,7 +24,8 @@ def get_home(request: HttpRequest) -> HttpResponse:
"""Render the index page with drops grouped hierarchically by game and campaign.
This view fetches all currently active drops (where current time is between start_at and end_at),
and organizes them by game and campaign for display.
and organizes them by game and campaign for display. Drops within each campaign are sorted by
required minutes watched.
Args:
request (HttpRequest): The request object.
@ -43,7 +44,7 @@ def get_home(request: HttpRequest) -> HttpResponse:
TimeBasedDrop.objects.filter(start_at__lte=now, end_at__gte=now)
.select_related("campaign", "campaign__game", "campaign__owner")
.prefetch_related("benefits")
.order_by("campaign__game__display_name", "campaign__name", "name")
.order_by("campaign__game__display_name", "campaign__name", "required_minutes_watched")
)
# Drops without associated games or campaigns
@ -70,6 +71,15 @@ def get_home(request: HttpRequest) -> HttpResponse:
orphaned_drops.append(drop)
logger.warning("Drop %s does not have an associated game or campaign.", drop.name or drop.drop_id)
# Make sure drops within each campaign are sorted by required_minutes_watched
for campaigns in grouped_drops.values():
for drops in campaigns.values():
drops.sort(key=lambda drop: drop.required_minutes_watched or 0)
# Also sort orphaned drops if any
if orphaned_drops:
orphaned_drops.sort(key=lambda drop: drop.required_minutes_watched or 0)
context: dict[str, Any] = {
"grouped_drops": grouped_drops,
"orphaned_drops": orphaned_drops,