feat(media): Add formatted progress properties for media models and update templates

Author: FuzzyGrim

src/app/models.py

@@ -27,6 +27,7 @@
 from simple_history.models import HistoricalRecords
 from simple_history.utils import bulk_create_with_history, bulk_update_with_history
 
+import app
 import events
 import users
 from app import providers
@@ -624,6 +625,11 @@ def process_status(self):
         ):
             events.tasks.reload_calendar.delay(items_to_process=[self.item])
 
+    @property
+    def formatted_progress(self):
+        """Return the progress of the media in a formatted string."""
+        return str(self.progress)
+
     def increase_progress(self):
         """Increase the progress of the media by one."""
         self.progress += 1
@@ -667,6 +673,33 @@ def progress(self):
         """Return the total episodes watched for the TV show."""
         return sum(season.progress for season in self.seasons.all())
 
+    @property
+    def formatted_progress(self):
+        """Return the latest watched episode in SxxExx format."""
+        if not hasattr(self, "seasons"):
+            return ""
+
+        watched_episodes = [
+            {
+                "season": season.item.season_number,
+                "episode": episode.item.episode_number,
+            }
+            for season in self.seasons.all()
+            if hasattr(season, "episodes")
+            for episode in season.episodes.all()
+        ]
+
+        if not watched_episodes:
+            return ""
+
+        # Find the episode with highest season and episode numbers
+        latest_episode = max(
+            watched_episodes,
+            key=lambda x: (x["season"], x["episode"]),
+        )
+
+        return f"S{latest_episode['season']:02d}E{latest_episode['episode']:02d}"
+
     @property
     def repeats(self):
         """Return the number of max repeated episodes in the TV show."""
@@ -1163,6 +1196,11 @@ class Game(Media):
 
     tracker = FieldTracker()
 
+    @property
+    def formatted_progress(self):
+        """Return progress in hours:minutes format."""
+        return app.helpers.minutes_to_hhmm(self.progress)
+
     def increase_progress(self):
         """Increase the progress of the media by 30 minutes."""
         self.progress += 30

src/templates/app/components/media_table_items.html

@@ -79,15 +79,24 @@
         </div>
       </td>
     {% endif %}
-    <td class="p-2 text-center">{{ media.progress }}</td>
+
+    {% if media_type == MediaTypes.TV.value %}
+      <td class="p-2 text-center">{{ media.progress }}</td>
+      <td class="p-2 text-center">{{ media.formatted_progress }}</td>
+    {% else %}
+      <td class="p-2 text-center">{{ media.formatted_progress }}</td>
+    {% endif %}
+
     <td class="p-2 text-center">{{ media.status|media_status_readable }}</td>
+  
     {% if media.start_date %}
       <td class="p-2 text-center">{{ media.start_date|date:"Y-m-d" }}</td>
     {% else %}
       <td class="p-2 text-center">
         <span class="text-gray-500">-</span>
       </td>
     {% endif %}
+  
     {% if media.end_date %}
       <td class="p-2 text-center">{{ media.end_date|date:"Y-m-d" }}</td>
     {% else %}

src/templates/app/media_list.html

@@ -9,22 +9,19 @@
 {% block content %}
   <h1 class="text-3xl font-bold mb-6">{{ media_type|media_type_readable_plural }}</h1>
 
-  <div x-data="{
-    sort: '{{ current_sort }}',
-    status: '{{ current_status }}',
-    layout: '{{ current_layout }}',
-    search: '{{ request.GET.search|default:'' }}',
-    statusLabels: {
-      {% for value, label in status_choices %}
-        '{{ value }}': '{{ label }}'{% if not forloop.last %},{% endif %}
-      {% endfor %}
-    },
-    sortLabels: {
-      {% for value, label in sort_choices %}
-        '{{ value }}': '{{ label }}'{% if not forloop.last %},{% endif %}
-      {% endfor %}
-    }
-  }">
+  <div x-data="{ sort: '{{ current_sort }}', status: '{{ current_status }}', layout: '{{ current_layout }}', search: '{{ request.GET.search|default:'' }}', statusLabels: {
+    {% for value, label in status_choices %}
+      '{{ value }}': '{{ label }}'
+      {% if not forloop.last %},{% endif %}
+
+    {% endfor %}
+    }, sortLabels: {
+    {% for value, label in sort_choices %}
+      '{{ value }}': '{{ label }}'
+      {% if not forloop.last %},{% endif %}
+
+    {% endfor %}
+    } }">
 
     <!-- Form to manage state -->
     <form id="filter-form" class="hidden">
@@ -265,6 +262,7 @@ <h3 class="text-xl font-semibold mb-2">No {{ media_type|media_type_readable_plur
               <th class="p-2 w-2/5">Title</th>
               <th class="p-2 text-center">Score</th>
               <th class="p-2 text-center">Progress</th>
+              {% if media_type == MediaTypes.TV.value %}<th class="p-2 text-center">Last Watched</th>{% endif %}
               <th class="p-2 text-center">Status</th>
               <th class="p-2 text-center">Start Date</th>
               <th class="p-2 text-center">End Date</th>