feat: enhance media progress tracking and display upcoming episodes

Author: FuzzyGrim

src/app/database.py

@@ -3,8 +3,9 @@
 
 from django.apps import apps
 from django.db import models
-from django.db.models import Count, F, Max
+from django.db.models import Count, F, Max, Min, Q
 from django.db.models.functions import TruncDate
+from django.utils import timezone
 
 from app.models import Item, Media
 
@@ -70,6 +71,7 @@ def get_historical_models():
 
 def get_in_progress(user):
     """Get a media list of in progress media by type."""
+    today = timezone.now().date()
     list_by_type = {}
 
     for media_type in Item.MediaTypes.values:
@@ -84,9 +86,17 @@ def get_in_progress(user):
                 ],
                 sort_filter="score",
             )
-            if media_list:
+            if media_list.exists():
                 media_list = media_list.annotate(
                     max_progress=Max("item__event__episode_number"),
+                    next_episode_number=Min(
+                        "item__event__episode_number",
+                        filter=Q(item__event__date__gt=today),
+                    ),
+                    next_episode_date=Min(
+                        "item__event__date",
+                        filter=Q(item__event__date__gt=today),
+                    ),
                 )
                 list_by_type[media_type] = media_list
 

src/app/templatetags/app_tags.py

@@ -2,6 +2,7 @@
 
 from django import template
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.html import format_html
 from unidecode import unidecode
 
@@ -91,10 +92,45 @@ def media_color(media_type):
     return models.Item.Colors[media_type.upper()].value
 
 
+@register.filter
+def percentage_ratio(value, total):
+    """Calculate percentage, showing one decimal place for values between 0 and 1."""
+    try:
+        if total == 0:
+            return "0"
+
+        result = (Decimal(value) / Decimal(total)) * 100
+
+        # If result is between 0 and 1, show one decimal
+        if 0 < result < 1:
+            return f"{result:.1f}"
+
+        # For all other values, show as integer
+        return str(int(round(result)))
+    except (TypeError, ValueError):
+        return "0"
+
+
+@register.filter
+def naturalday(value):
+    """Return the natural day for the date."""
+    today = timezone.now().date()
+    diff = value - today
+    days = diff.days
+    days_threshold = 5
+
+    if days == 0:
+        return "Today"
+    if days == 1:
+        return "Tomorrow"
+    if days > 1 and days <= days_threshold:
+        return f"In {days} days"
+    return value.strftime("%b %d, %Y")
+
+
 @register.filter
 def media_url(media):
     """Return the media URL for both metadata and model object cases."""
-    # Check if media is metadata or model instance
     is_dict = isinstance(media, dict)
 
     # Get attributes using either dict access or object attribute
@@ -126,52 +162,55 @@ def media_url(media):
     )
 
 
-@register.filter
-def percentage_ratio(value, total):
-    """Calculate percentage, showing one decimal place for values between 0 and 1."""
-    try:
-        if total == 0:
-            return "0"
-
-        result = (Decimal(value) / Decimal(total)) * 100
-
-        # If result is between 0 and 1, show one decimal
-        if 0 < result < 1:
-            return f"{result:.1f}"
-
-        # For all other values, show as integer
-        return str(int(round(result)))
-    except (TypeError, ValueError):
-        return "0"
-
-
 @register.simple_tag
 def component_id(component_type, media):
-    """Return the component ID."""
-    component_id = f"{component_type}-{media['media_type']}-{media['media_id']}"
+    """Return the component ID for both metadata and model object cases."""
+    is_dict = isinstance(media, dict)
+
+    # Get base attributes using either dict access or object attribute
+    media_type = media["media_type"] if is_dict else media.media_type
+    media_id = media["media_id"] if is_dict else media.media_id
+
+    component_id = f"{component_type}-{media_type}-{media_id}"
 
-    if "season_number" in media:
-        component_id += f"-{media['season_number']}"
-    if "episode_number" in media:
-        component_id += f"-{media['episode_number']}"
+    # Handle season/episode numbers if they exist
+    if is_dict:
+        if "season_number" in media:
+            component_id += f"-{media['season_number']}"
+        if "episode_number" in media:
+            component_id += f"-{media['episode_number']}"
+    else:
+        if media.season_number is not None:
+            component_id += f"-{media.season_number}"
+        if media.episode_number is not None:
+            component_id += f"-{media.episode_number}"
 
     return component_id
 
 
 @register.simple_tag
 def modal_url(modal_type, media):
-    """Return the modal URL."""
+    """Return the modal URL for both metadata and model object cases."""
+    is_dict = isinstance(media, dict)
+
+    # Build kwargs using either dict access or object attribute
     kwargs = {
-        "source": media["source"],
-        "media_type": media["media_type"],
-        "media_id": media["media_id"],
+        "source": media["source"] if is_dict else media.source,
+        "media_type": media["media_type"] if is_dict else media.media_type,
+        "media_id": media["media_id"] if is_dict else media.media_id,
     }
 
-    if "season_number" in media:
-        kwargs["season_number"] = media["season_number"]
-
-    if "episode_number" in media:
-        kwargs["episode_number"] = media["episode_number"]
+    # Handle season/episode numbers if they exist
+    if is_dict:
+        if "season_number" in media:
+            kwargs["season_number"] = media["season_number"]
+        if "episode_number" in media:
+            kwargs["episode_number"] = media["episode_number"]
+    else:
+        if media.season_number is not None:
+            kwargs["season_number"] = media.season_number
+        if media.episode_number is not None:
+            kwargs["episode_number"] = media.episode_number
 
     return reverse(f"{modal_type}_modal", kwargs=kwargs)
 

src/events/tasks.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime
+from datetime import date, datetime
 from zoneinfo import ZoneInfo
 
 import requests
@@ -79,9 +79,7 @@ def process_item(item, events_bulk):
     except requests.exceptions.HTTPError as err:
         # happens for niche media in which the mappings during import are incorrect
         if err.response.status_code == requests.codes.not_found:
-            msg = f"{item} ({item.media_id}) not found on {item.source}. Deleting it."
-            logger.warning(msg)
-            item.delete()
+            pass
         else:
             raise
 
@@ -207,17 +205,18 @@ def process_other(item, metadata, events_bulk):
                     episode_number = 1
                 else:
                     episode_number = None
-
                 events_bulk.append(
                     Event(item=item, episode_number=episode_number, date=air_date),
                 )
             except ValueError:
                 pass
     if item.media_type == "manga" and metadata["max_progress"]:
+        # MyAnimeList manga has an end date when it's completed
         if "end_date" in metadata["details"] and metadata["details"]["end_date"]:
             air_date = date_parser(metadata["details"]["end_date"])
+        # MangaUpdates doesn't have an end date, so use a placeholder
         else:
-            air_date = date_parser("9999-12-31")
+            air_date = date.min
         events_bulk.append(
             Event(
                 item=item,