From c995c82dcb3a45fe1501746a3af904f43b8918c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Thu, 10 Jul 2025 03:09:27 +0200 Subject: [PATCH] Add game list and detail views with templates for Twitch Drops Tracker --- templates/base.html | 6 + templates/twitch/campaign_detail.html | 4 +- templates/twitch/dashboard.html | 7 +- templates/twitch/game_detail.html | 169 ++++++++++++++++++ templates/twitch/game_list.html | 49 +++++ .../commands/import_drop_campaign.py | 14 +- twitch/urls.py | 2 + twitch/views.py | 104 ++++++++++- 8 files changed, 343 insertions(+), 12 deletions(-) create mode 100644 templates/twitch/game_detail.html create mode 100644 templates/twitch/game_list.html diff --git a/templates/base.html b/templates/base.html index e95a21a..c4f94e9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -77,6 +77,12 @@ Campaigns +
  • + + Games + +
  • Admin diff --git a/templates/twitch/campaign_detail.html b/templates/twitch/campaign_detail.html index 5390c92..e131097 100644 --- a/templates/twitch/campaign_detail.html +++ b/templates/twitch/campaign_detail.html @@ -19,7 +19,9 @@

    {{ campaign.name }}

    - {{ campaign.game.display_name }} + + {{ campaign.game.display_name }} + {% if campaign.start_at <= now and campaign.end_at >= now %} {% if campaign.status == 'ACTIVE' %} Active diff --git a/templates/twitch/dashboard.html b/templates/twitch/dashboard.html index 2ec1198..caa88d7 100644 --- a/templates/twitch/dashboard.html +++ b/templates/twitch/dashboard.html @@ -27,7 +27,12 @@ {% endif %}
    {{ campaign.name }}
    -
    {{ campaign.game.display_name }}
    +
    + + {{ campaign.game.display_name }} + +

    {{ campaign.description|truncatewords:20 }}

    diff --git a/templates/twitch/game_detail.html b/templates/twitch/game_detail.html new file mode 100644 index 0000000..a2c7b0a --- /dev/null +++ b/templates/twitch/game_detail.html @@ -0,0 +1,169 @@ +{% extends "base.html" %} + +{% block title %}{{ game.display_name }} - Twitch Drops Tracker{% endblock %} + +{% block content %} +
    +
    + +

    + {{ game.display_name }} +

    +

    View all drop campaigns for {{ game.display_name }}.

    +
    +
    + +{% if active_campaigns %} +
    +
    +
    +
    +
    Active Campaigns
    +
    +
    +
    + + + + + + + + + + + {% for campaign in active_campaigns %} + + + + + + + {% endfor %} + +
    CampaignOrganizationTime RemainingActions
    {{ campaign.name }}{{ campaign.owner.name }} + + Ends in {{ campaign.end_at|timeuntil }} + + + + View Details + +
    +
    +
    +
    +
    +
    +{% endif %} + +{% if upcoming_campaigns %} +
    +
    +
    +
    +
    Upcoming Campaigns
    +
    +
    +
    + + + + + + + + + + + {% for campaign in upcoming_campaigns %} + + + + + + + {% endfor %} + +
    CampaignOrganizationStarts InActions
    {{ campaign.name }}{{ campaign.owner.name }} + + Starts in {{ campaign.start_at|timeuntil }} + + + + View Details + +
    +
    +
    +
    +
    +
    +{% endif %} + +{% if expired_campaigns %} +
    +
    +
    +
    +
    Past Campaigns
    +
    +
    +
    + + + + + + + + + + + {% for campaign in expired_campaigns %} + + + + + + + {% endfor %} + +
    CampaignOrganizationEndedActions
    {{ campaign.name }}{{ campaign.owner.name }} + + {{ campaign.end_at|timesince }} ago + + + + View Details + +
    +
    +
    +
    +
    +
    +{% endif %} + +{% if not active_campaigns and not upcoming_campaigns and not expired_campaigns %} +
    +
    +
    + No campaigns found for this game. +
    +
    +
    +{% endif %} + +{% endblock %} \ No newline at end of file diff --git a/templates/twitch/game_list.html b/templates/twitch/game_list.html new file mode 100644 index 0000000..0311a05 --- /dev/null +++ b/templates/twitch/game_list.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} + +{% block title %}Games - Twitch Drops Tracker{% endblock %} + +{% block content %} +
    +
    +

    Games

    +

    Browse all games with Twitch drop campaigns.

    +
    +
    + +
    + {% for item in games_with_counts %} +
    +
    +
    +
    + + {{ item.game.display_name }} + +
    +
    + + {{ item.campaign_count }} Campaigns + + {% if item.active_count > 0 %} + + {{ item.active_count }} Active + + {% endif %} +
    +
    +
    + + View Campaigns + +
    +
    +
    + {% empty %} +
    +
    + No games found. +
    +
    + {% endfor %} +
    +{% endblock %} \ No newline at end of file diff --git a/twitch/management/commands/import_drop_campaign.py b/twitch/management/commands/import_drop_campaign.py index 138f366..6d2d114 100644 --- a/twitch/management/commands/import_drop_campaign.py +++ b/twitch/management/commands/import_drop_campaign.py @@ -8,7 +8,7 @@ from pathlib import Path from typing import Any from django.core.management.base import BaseCommand, CommandError, CommandParser -from django.db import transaction, OperationalError +from django.db import OperationalError, transaction from twitch.models import DropBenefit, DropBenefitEdge, DropCampaign, Game, Organization, TimeBasedDrop @@ -60,7 +60,7 @@ class Command(BaseCommand): help="Delay in seconds between retries for database operations (default: 0.5)", ) - def handle(self, **options) -> None: + def handle(self, **options) -> None: # noqa: ANN003 """Execute the command. Args: @@ -235,14 +235,14 @@ class Command(BaseCommand): Args: campaign_data: The drop campaign data to import. - + Raises: OperationalError: If the database is still locked after max retries. """ # Retry logic for database operations max_retries = getattr(self, "max_retries", 5) # Default to 5 if not set retry_delay = getattr(self, "retry_delay", 0.5) # Default to 0.5 seconds if not set - + for attempt in range(max_retries): try: with transaction.atomic(): @@ -326,11 +326,9 @@ class Command(BaseCommand): # Check if this is a database lock error if "database is locked" in str(e).lower(): if attempt < max_retries - 1: # Don't sleep on the last attempt - sleep_time = retry_delay * (2 ** attempt) # Exponential backoff + sleep_time = retry_delay * (2**attempt) # Exponential backoff self.stdout.write( - self.style.WARNING( - f"Database locked, retrying in {sleep_time:.2f}s (attempt {attempt + 1}/{max_retries})" - ) + self.style.WARNING(f"Database locked, retrying in {sleep_time:.2f}s (attempt {attempt + 1}/{max_retries})") ) time.sleep(sleep_time) else: diff --git a/twitch/urls.py b/twitch/urls.py index f815f9b..0c36b52 100644 --- a/twitch/urls.py +++ b/twitch/urls.py @@ -10,4 +10,6 @@ urlpatterns = [ path("", views.dashboard, name="dashboard"), path("campaigns/", views.DropCampaignListView.as_view(), name="campaign_list"), path("campaigns//", views.DropCampaignDetailView.as_view(), name="campaign_detail"), + path("games/", views.GameListView.as_view(), name="game_list"), + path("games//", views.GameDetailView.as_view(), name="game_detail"), ] diff --git a/twitch/views.py b/twitch/views.py index 0a429ca..7965cdd 100644 --- a/twitch/views.py +++ b/twitch/views.py @@ -40,7 +40,7 @@ class DropCampaignListView(ListView): return queryset.select_related("game", "owner").order_by("-start_at") - def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + def get_context_data(self, **kwargs) -> dict[str, Any]: """Add additional context data. Args: @@ -74,7 +74,7 @@ class DropCampaignDetailView(DetailView): template_name = "twitch/campaign_detail.html" context_object_name = "campaign" - def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + def get_context_data(self, **kwargs) -> dict[str, Any]: """Add additional context data. Args: @@ -99,6 +99,106 @@ class DropCampaignDetailView(DetailView): return context +class GameListView(ListView): + """List view for games.""" + + model = Game + template_name = "twitch/game_list.html" + context_object_name = "games" + + def get_queryset(self) -> QuerySet[Game]: + """Get queryset of games. + + Returns: + QuerySet: Sorted games. + """ + return super().get_queryset().order_by("display_name") + + def get_context_data(self, **kwargs) -> dict[str, Any]: + """Add additional context data. + + Args: + **kwargs: Additional arguments. + + Returns: + dict: Context data. + """ + context = super().get_context_data(**kwargs) + + # Get campaign count for each game + games_with_counts = [] + for game in context["games"]: + campaign_count = DropCampaign.objects.filter(game=game).count() + active_count = DropCampaign.objects.filter( + game=game, + start_at__lte=timezone.now(), + end_at__gte=timezone.now(), + status="ACTIVE", + ).count() + games_with_counts.append({ + "game": game, + "campaign_count": campaign_count, + "active_count": active_count, + }) + + context["games_with_counts"] = games_with_counts + return context + + +class GameDetailView(DetailView): + """Detail view for a game.""" + + model = Game + template_name = "twitch/game_detail.html" + context_object_name = "game" + + def get_context_data(self, **kwargs) -> dict[str, Any]: + """Add additional context data. + + Args: + **kwargs: Additional arguments. + + Returns: + dict: Context data. + """ + context = super().get_context_data(**kwargs) + game = self.get_object() + + # Get all campaigns for this game + now = timezone.now() + + # Active campaigns + active_campaigns = ( + DropCampaign.objects.filter( + game=game, + start_at__lte=now, + end_at__gte=now, + status="ACTIVE", + ) + .select_related("owner") + .order_by("end_at") + ) + + # Upcoming campaigns + upcoming_campaigns = ( + DropCampaign.objects.filter(game=game, start_at__gt=now, status="UPCOMING").select_related("owner").order_by("start_at") + ) + + # Expired campaigns + expired_campaigns = ( + DropCampaign.objects.filter(game=game, end_at__lt=now).select_related("owner").order_by("-end_at")[:10] + ) # Limit to 10 most recent + + context.update({ + "active_campaigns": active_campaigns, + "upcoming_campaigns": upcoming_campaigns, + "expired_campaigns": expired_campaigns, + "now": now, + }) + + return context + + def dashboard(request: HttpRequest) -> HttpResponse: """Dashboard view showing active campaigns and progress.