[release] 26

Ultimately these should probably be templated

PROJECT.org

@@ -79,7 +79,7 @@ fetching and simple saving.
 :LOGBOOK:
 CLOCK: [2025-07-09 Wed 09:55]--[2025-07-09 Wed 10:15] =>  0:20
 :END:
-* Backlog [2/22]
+* Backlog [3/23]
 ** TODO [#A] Add classmethod for metadata fetching to tracks :vrobbler:feature:music:personal:project:
 :PROPERTIES:
 :ID:       bc4b45e5-4c65-13c5-ab7b-1937d3fbf5c2
@@ -442,6 +442,32 @@ it's annoying.
 ** TODO [#C] Allow users to see tasks on calendar view :vrobbler:personal:project:templates:feature:
 https://codepen.io/oliviale/pen/QYqybo
 ** TODO [#C] Come up with a possible flow using WebDAV and super-productivity for tasks :personal:feature:project:vrobbler:tasks:
+* Version 26.0 [3/3]
+** DONE Clean up templates for scrobble details :vrobbler:personal:bug:templates:
+:PROPERTIES:
+:ID:       43dc1e02-c110-5b49-0ac7-4c4f7656d1aa
+:END:
+** DONE Add named locations visited to dashboard :vrobbler:personal:feature:locations:templates:
+:PROPERTIES:
+:ID:       ebc365a1-cef4-f75d-569f-c24b072ef5a4
+:END:
+** DONE Add moods to dashboard :vrobbler:moods:feature:templates:personal:
+:PROPERTIES:
+:ID:       c03a38ce-b337-f4fa-adba-aee08d4329f5
+:END:
+* Version 25.0 [3/3]
+** DONE Add basic food templates and fix urls :food:vrobbler:personal:project:bug:urls:
+:PROPERTIES:
+:ID:       3de3459e-8e7e-abba-e068-b919a819d3e3
+:END:
+** DONE [#C] Fix how elapsed time is calculated :vrobbler:personal:project:scrobbles:bug:
+:PROPERTIES:
+:ID:       cff58fc4-06ac-8016-4eae-130b51e3c9b7
+:END:
+** DONE Fix templates for videos and dashboard links :personal:feature:project:vrobbler:templates:
+:PROPERTIES:
+:ID:       7debfbaf-cdd8-f49b-57ff-804bfe7c9236
+:END:
 * Version 24.0 [2/2]
 ** DONE Clean up logdata for various media :personal:feature:project:vrobbler:logdata:
 :PROPERTIES:

vrobbler/apps/foods/migrations/0003_food_calories.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.19 on 2025-09-11 13:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('foods', '0002_alter_food_run_time_seconds'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='food',
+            name='calories',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

vrobbler/apps/foods/models.py

@@ -8,14 +8,15 @@ from django.urls import reverse
 from django_extensions.db.models import TimeStampedModel
 from imagekit.models import ImageSpecField
 from imagekit.processors import ResizeToFit
-from scrobbles.dataclasses import BaseLogData
+from scrobbles.dataclasses import BaseLogData, WithPeopleLogData
 from scrobbles.mixins import ScrobblableConstants, ScrobblableMixin
 
 BNULL = {"blank": True, "null": True}
 
 
 @dataclass
-class FoodLogData(BaseLogData):
+class FoodLogData(BaseLogData, WithPeopleLogData):
+    calories: Optional[int] = None
     meal: Optional[str] = None
     rating: Optional[str] = None
 
@@ -48,6 +49,7 @@ class FoodCategory(TimeStampedModel):
 
 class Food(ScrobblableMixin):
     description = models.TextField(**BNULL)
+    calories = models.IntegerField(**BNULL)
     allrecipe_image = models.ImageField(upload_to="food/recipe/", **BNULL)
     allrecipe_image_small = ImageSpecField(
         source="allrecipe_image",
@@ -72,7 +74,8 @@ class Food(ScrobblableMixin):
 
     @property
     def subtitle(self):
-        return self.category.name
+        if self.category:
+            return self.category.name
 
     @property
     def strings(self) -> ScrobblableConstants:

vrobbler/apps/lifeevents/models.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 from django.apps import apps
 from django.db import models
 from django.urls import reverse

vrobbler/apps/locations/models.py

@@ -1,11 +1,13 @@
-from decimal import Decimal, getcontext
 import logging
+from dataclasses import dataclass
+from decimal import Decimal
 from typing import Dict
 
-from django.contrib.auth import get_user_model
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.db import models
 from django.urls import reverse
+from scrobbles.dataclasses import BaseLogData, WithPeopleLogData
 from scrobbles.mixins import ScrobblableConstants, ScrobblableMixin
 
 logger = logging.getLogger(__name__)
@@ -15,6 +17,9 @@ User = get_user_model()
 GEOLOC_ACCURACY = int(getattr(settings, "GEOLOC_ACCURACY", 4))
 GEOLOC_PROXIMITY = Decimal(getattr(settings, "GEOLOC_PROXIMITY", "0.0001"))
 
+@dataclass
+class GeoLocationLogData(BaseLogData, WithPeopleLogData):
+    pass
 
 class GeoLocation(ScrobblableMixin):
     COMPLETION_PERCENT = getattr(settings, "LOCATION_COMPLETION_PERCENT", 100)
@@ -36,9 +41,13 @@ class GeoLocation(ScrobblableMixin):
 
     def get_absolute_url(self):
         return reverse(
-            "locations:geo_location_detail", kwargs={"slug": self.uuid}
+            "locations:geolocation_detail", kwargs={"slug": self.uuid}
         )
 
+    @property
+    def logdata_cls(self):
+        return GeoLocationLogData
+
     @classmethod
     def find_or_create(cls, data_dict: Dict) -> "GeoLocation":
         """Given a data dict from GPSLogger, does the heavy lifting of looking up

vrobbler/apps/locations/urls.py

@@ -8,11 +8,11 @@ urlpatterns = [
     path(
         "locations/",
         views.GeoLocationListView.as_view(),
-        name="geo_locations_list",
+        name="geolocation_list",
     ),
     path(
         "locations/<slug:slug>/",
         views.GeoLocationDetailView.as_view(),
-        name="geo_location_detail",
+        name="geolocation_detail",
     ),
 ]

vrobbler/apps/moods/models.py

@@ -42,7 +42,7 @@ class Mood(ScrobblableMixin):
         return str(self.uuid)
 
     def get_absolute_url(self):
-        return reverse("moods:mood-detail", kwargs={"slug": self.uuid})
+        return reverse("moods:mood_detail", kwargs={"slug": self.uuid})
 
     @property
     def subtitle(self) -> str:

vrobbler/apps/moods/urls.py

@@ -5,10 +5,10 @@ app_name = "moods"
 
 
 urlpatterns = [
-    path("moods/", views.MoodListView.as_view(), name="mood-list"),
+    path("moods/", views.MoodListView.as_view(), name="mood_list"),
     path(
         "moods/<slug:slug>/",
         views.MoodDetailView.as_view(),
-        name="mood-detail",
+        name="mood_detail",
     ),
 ]

vrobbler/apps/music/models.py

@@ -573,7 +573,7 @@ class Album(TimeStampedModel):
             alt_name = name
 
         album = Album.objects.filter(
-            name=found_name, musicbrainz_id=album_dict.get("mbid")
+            musicbrainz_id=album_dict.get("mbid")
         ).first()
 
         if not album:

vrobbler/apps/podcasts/views.py

@@ -1,6 +1,7 @@
 from django.views import generic
 from podcasts.models import Podcast
 
+from scrobbles.views import ScrobbleableListView, ScrobbleableDetailView
 
 class PodcastListView(generic.ListView):
     model = Podcast

vrobbler/apps/scrobbles/models.py

@@ -655,6 +655,13 @@ class Scrobble(TimeStampedModel):
                 (scrobble.elapsed_time)
             )
 
+        # Remove any locations without titles
+        if "GeoLocation" in scrobbles_by_type.keys():
+            for loc_scrobble in scrobbles_by_type["GeoLocation"]:
+                if not loc_scrobble.media_obj.title:
+                    scrobbles_by_type["GeoLocation"].remove(loc_scrobble)
+                    scrobbles_by_type["GeoLocation_count"] -= 1
+
         return scrobbles_by_type
 
     @classmethod
@@ -892,8 +899,9 @@ class Scrobble(TimeStampedModel):
         if self.played_to_completion:
             if self.playback_position_seconds:
                 return self.playback_position_seconds
-            if self.media_obj.run_time_seconds:
+            if self.media_obj and self.media_obj.run_time_seconds:
                 return self.media_obj.run_time_seconds
+
         return (timezone.now() - self.timestamp).seconds
 
     @property
@@ -1070,6 +1078,8 @@ class Scrobble(TimeStampedModel):
             media_obj = self.puzzle
         if self.task:
             media_obj = self.task
+        if self.food:
+            media_obj = self.food
         return media_obj
 
     def __str__(self):

vrobbler/apps/scrobbles/notifications.py

@@ -47,8 +47,8 @@ class ScrobbleNtfyNotification(ScrobbleNotification):
             self.click_url = self.url_tmpl.format(path=self.scrobble.finish_url)
             self.title = "Finish " + self.media_obj.strings.verb.lower() + "?"
 
-        if self.scrobble.log and isinstance(self.scrobble.log, dict) and self.scrobble.log.get("description"):
+        if self.scrobble.log and isinstance(self.scrobble.log, dict) and self.scrobble.log.get("title"):
-            self.ntfy_str += f" - {self.scrobble.log.get('description')}"
+            self.ntfy_str += f" - {self.scrobble.log.get('title')}"
 
     def send(self):
         if (
@@ -72,7 +72,7 @@ class MoodNtfyNotification(BasicNtfyNotification):
     def __init__(self, profile, **kwargs):
         super().__init__(profile)
         self.ntfy_str: str = "Would you like to check in about your mood?"
-        self.click_url = self.url_tmpl.format(path=reverse("moods:mood-list"))
+        self.click_url = self.url_tmpl.format(path=reverse("moods:mood_list"))
         self.title = "Mood Check-in!"
 
     def send(self):

vrobbler/apps/scrobbles/scrobblers.py

@@ -368,7 +368,7 @@ def email_scrobble_board_game(
         enriched_game = find_and_enrich_board_game_data(game)
         if game.get("isBaseGame"):
             base_games[game.get("id")] = enriched_game
-        elif game.get("isExpansion"):
+        if game.get("isExpansion"):
             expansions[game.get("id")] = enriched_game
 
     locations = {}

vrobbler/apps/scrobbles/utils.py

@@ -2,6 +2,7 @@ import hashlib
 import logging
 import re
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING, Optional
 from urllib.parse import urlparse
 from zoneinfo import ZoneInfo
 
@@ -13,7 +14,10 @@ from django.utils import timezone
 from profiles.models import UserProfile
 from profiles.utils import now_user_timezone
 from scrobbles.constants import LONG_PLAY_MEDIA
-from scrobbles.notifications import MoodNtfyNotification, ScrobbleNtfyNotification
+from scrobbles.notifications import (
+    MoodNtfyNotification,
+    ScrobbleNtfyNotification,
+)
 from scrobbles.tasks import (
     process_koreader_import,
     process_lastfm_import,
@@ -21,6 +25,9 @@ from scrobbles.tasks import (
 )
 from webdav.client import get_webdav_client
 
+if TYPE_CHECKING:
+    from scrobbles.models import Scrobble
+
 logger = logging.getLogger(__name__)
 User = get_user_model()
 
@@ -345,3 +352,22 @@ def extract_domain(url):
         + parsed_url.netloc.split(".")[-1]
     )
     return domain
+
+def fix_playback_position_seconds(*scrobbles: "Scrobble", commit=True) -> list["Scrobble"]:
+    updated_scrobbles = list()
+    for scrobble in scrobbles:
+        if not scrobble.media_obj:
+            logger.info(f"No media object found for scrobble {scrobble.id}, cannot update elapsed time")
+            continue
+
+        if scrobble.media_type == "Track" and scrobble.media_obj.run_time_seconds:
+            too_long = scrobble.playback_position_seconds > scrobble.media_obj.run_time_seconds
+            zero = scrobble.playback_position_seconds == 0
+            null = not scrobble.playback_position_seconds
+            if too_long or zero or null:
+                scrobble.playback_position_seconds = scrobble.media_obj.run_time_seconds
+                updated_scrobbles.append(scrobble)
+                if commit:
+                    scrobble.save(update_fields=["playback_position_seconds"])
+
+    return updated_scrobbles

vrobbler/apps/scrobbles/views.py

@@ -940,7 +940,7 @@ class ScrobbleDetailView(DetailView):
     slug_url_kwarg = "uuid"
 
     def get_form_class(self):
-        return self.object.media_obj.logdata_cls.form()
+        return self.object.media_obj.logdata_cls().form()
 
     def get_form(self):
         FormClass = self.get_form_class()

vrobbler/apps/videos/urls.py

@@ -5,7 +5,6 @@ app_name = "videos"
 
 
 urlpatterns = [
-    # path('', views.scrobble_endpoint, name='scrobble-list'),
     path("movies/", views.MovieListView.as_view(), name="movie_list"),
     path("series/", views.SeriesListView.as_view(), name="series_list"),
     path(
@@ -13,6 +12,7 @@ urlpatterns = [
         views.SeriesDetailView.as_view(),
         name="series_detail",
     ),
+    path('videos/', views.VideoListView.as_view(), name='video_list'),
     path(
         "video/<slug:slug>/",
         views.VideoDetailView.as_view(),

vrobbler/templates/_scrobblable_list.html

@@ -1,8 +1,10 @@
 {% load urlreplace %}
+{% load naturalduration %}
 
 <table class="table table-striped table-sm">
     <thead>
         <tr>
+            <th scope="col">Latest</th>
             <th scope="col">Title</th>
             <th scope="col">Scrobbles</th>
             <th scope="col">Start</th>
@@ -11,6 +13,7 @@
     <tbody>
         {% for obj in object_list %}
         <tr>
+            <td><a href="{{obj.scrobble_set.last.get_absolute_url}}">{{obj.scrobble_set.last.local_timestamp}}
             <td><a href="{{obj.get_absolute_url}}">{{obj}}</a></td>
             {% if request.user.is_authenticated %}
             <td>{{obj.scrobble_count}}</td>

vrobbler/templates/base.html

@@ -219,7 +219,7 @@
                                 {% if scrobble.media_obj.primary_image_url %}<div style="float:left;padding-right:10px;padding-bottom:10px;"><img src="{{scrobble.media_obj.primary_image_url}}" /></div>{% endif %}
                                 <p><a href="{{scrobble.media_obj.get_absolute_url}}">{{scrobble.media_obj.title}}</a></p>
                                 {% if scrobble.media_obj.subtitle %}<p><em><a href="{{scrobble.media_obj.subtitle.get_absolute_url}}">{{scrobble.media_obj.subtitle}}</a></em></p>{% endif %}
-                                {% if scrobble.logdata %}{% if scrobble.logdata.description %}<p><em>{{scrobble.logdata.description}}</em></p>{% endif %}{% endif %}
+                                {% if scrobble.logdata %}{% if scrobble.logdata.title%}<p><em>{{scrobble.logdata.title}}</em></p>{% endif %}{% endif %}
                                 <p><small>{{scrobble.local_timestamp|naturaltime}} from {{scrobble.source}}</small></p>
                                 <div class="progress-bar" style="margin-right:5px;">
                                     <span class="progress-bar-fill" style="width: {{scrobble.percent_played}}%;"></span>

vrobbler/templates/boardgames/boardgame_detail.html

@@ -55,7 +55,7 @@
                 <thead>
                     <tr>
                         <th scope="col">Date</th>
-                        <th scope="col">Publisher</th>
+                        <th scope="col">Location</th>
                         <th scope="col">Players</th>
                     </tr>
                 </thead>
@@ -63,7 +63,7 @@
                     {% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
                     <tr>
                         <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
-                        <td>{{scrobble.media_obj.publisher}}</td>
+                        <td>{{scrobble.logdata.location }}</td>
                         <td>{% if scrobble.logdata.player_log %}{{scrobble.logdata.player_log}}{% else %}No data{% endif %}</td>
                     </tr>
                     {% endfor %}

vrobbler/templates/foods/food_detail.html

@@ -0,0 +1,37 @@
+{% extends "base_list.html" %}
+{% load static %}
+
+{% block title %}{{object.title}}{% endblock %}
+
+{% block lists %}
+<div class="row webpage">
+    <div class="webpage-metadata">
+      <p>{{object.description}}</p>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md">
+        <h3>Last scrobbles</h3>
+        <div class="table-responsive">
+            <table class="table table-striped table-sm">
+            <thead>
+                <tr>
+                    <th scope="col">Date</th>
+                    <th scope="col">Calories</th>
+                    <th scope="col">Notes</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for scrobble in scrobbles.all %}
+                <tr>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
+                        <td>{% if scrobble.logdata.calories %}{{scrobble.logdata.calories}}{% else %}{{scrobble.media_obj.calories}}{% endif %}</td>
+                        <td>{% for note in scrobble.logdata.notes %}{{note}}{% if not forloop.last %}; {% endif%}{% endfor %}
+                </tr>
+                {% endfor %}
+            </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+{% endblock %}

vrobbler/templates/foods/food_list.html

@@ -0,0 +1,23 @@
+{% extends "base_list.html" %}
+
+{% block title %}Foods{% endblock %}
+
+{% block head_extra %}
+<style>
+ dl { width: 210px; float:left; margin-right: 10px; }
+ dt a { color:white; text-decoration: none; font-size:smaller; }
+ img { height:200px; width: 200px; object-fit: cover; }
+ dd .right { float:right; }
+</style>
+{% endblock  %}
+
+{% block lists %}
+<div class="row">
+
+    <div class="col-md">
+        <div class="table-responsive">
+            {% include "_scrobblable_list.html" %}
+        </div>
+    </div>
+</div>
+{% endblock %}

vrobbler/templates/locations/geolocation_detail.html

@@ -57,12 +57,16 @@
                 <thead>
                     <tr>
                         <th scope="col">Date</th>
+                        <th scope="col">With</th>
+                        <th scope="col">Notes</th>
                     </tr>
                 </thead>
                 <tbody>
-                    {% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
+                    {% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
                     <tr>
-                        <td>{{scrobble.local_timestamp|naturaltime}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
+                        <td>{% for person in scrobble.logdata.with_people%}{{person}}{% if not forloop.last %}, {% endif%}{% endfor %}</td>
+                        <td>{% for note in scrobble.logdata.notes %}{{note}}{% if not forloop.last %}; {% endif%}{% endfor %}
                     </tr>
                     {% endfor %}
                 </tbody>

vrobbler/templates/locations/geolocation_list.html

@@ -67,13 +67,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    {% for location in object_list %}
+                    {% include "_scrobblable_list.html" %}
-                    <tr>
-                        <td>{{location.scrobble_set.count}}</td>
-                        <td>{{location.title}}</td>
-                        <td><a href="{{location.get_absolute_url}}">{{location.lat}}x{{location.lon}}</a></td>
-                    </tr>
-                    {% endfor %}
                 </tbody>
             </table>
         </div>

vrobbler/templates/moods/mood_detail.html

@@ -28,7 +28,7 @@
             <tbody>
                 {% for scrobble in scrobbles.all %}
                 <tr>
-                    <td>{{scrobble.local_timestamp}}</td>
+                    <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                 </tr>
                 {% endfor %}
             </tbody>

vrobbler/templates/music/album_detail.html

@@ -82,7 +82,7 @@
             <tbody>
                 {% for scrobble in object.scrobbles %}
                 <tr>
-                    <td>{{scrobble.local_timestamp}}</td>
+                    <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                     <td><a href="{{scrobble.track.get_absolute_url}}">{{scrobble.track.title}}</a></td>
                     <td><a href="{{scrobble.track.artist.get_absolute_url}}">{{scrobble.track.artist.name}}</a></td>
                 </tr>

vrobbler/templates/music/artist_detail.html

@@ -83,7 +83,7 @@
             <tbody>
                 {% for scrobble in object.scrobbles %}
                 <tr>
-                    <td>{{scrobble.local_timestamp}}</td>
+                    <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                     <td><a href="{{scrobble.track.get_absolute_url}}">{{scrobble.track.title}}</a></td>
                     <td><a href="{{scrobble.track.primary_album.get_absolute_url}}">{{scrobble.track.primary_album.name}}</a></td>
                 </tr>

vrobbler/templates/music/track_detail.html

@@ -28,7 +28,7 @@
                 <tbody>
                     {% for scrobble in scrobbles.all %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                         <td><a href="{{scrobble.track.get_absolute_url}}">{{scrobble.track.title}}</a></td>
                         <td><a href="{{scrobble.track.primary_album.get_absolute_url}}">{{scrobble.track.primary_album}}</a></td>
                         <td><a href="{{scrobble.track.artist.get_absolute_url}}">{{scrobble.track.artist}}</a></td>

vrobbler/templates/music/track_list.html

@@ -20,40 +20,7 @@
     <hr />
 
     <div class="col-md">
-        <div class="table-responsive">
+        <div class="table-responsive">{% include "_scrobblable_list.html" %}</div>
-            <table class="table table-striped table-sm">
-            <thead>
-                <tr>
-                    <th scope="col">Scrobbles</th>
-                    <th scope="col">Track</th>
-                    <th scope="col">Artist</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for track in object_list %}
-                <tr>
-                    <td>{{track.scrobble_set.count}}</td>
-                    <td><a href="{{track.get_absolute_url}}">{{track}}</a></td>
-                    <td><a href="{{track.artist.get_absolute_url}}">{{track.artist}}</a></td>
-                </tr>
-                {% endfor %}
-            </tbody>
-            </table>
-        </div>
-    </div>
-
-    <div class="pagination" style="margin-bottom:50px;">
-        <span class="page-links">
-            {% if page_obj.has_previous %}
-                <a href="?page={{ page_obj.previous_page_number }}">previous</a>
-            {% endif %}
-                <span class="page-current">
-                    Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
-                </span>
-            {% if page_obj.has_next %}
-                <a href="?page={{ page_obj.next_page_number }}">next</a>
-            {% endif %}
-        </span>
     </div>
 </div>
 {% endblock %}

vrobbler/templates/podcasts/podcast_detail.html

@@ -45,7 +45,7 @@
                 <tbody>
                     {% for scrobble in scrobbles.all %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                         <td>{{scrobble.podcast_episode}}</td>
                     </tr>
                     {% endfor %}

vrobbler/templates/podcasts/podcast_list.html

@@ -1,5 +1,6 @@
 {% extends "base_list.html" %}
 
+{% block title %}Podcasts{% endblock %}
 {% block lists %}
 <div class="row">
     <div class="col-md">
@@ -7,20 +8,19 @@
             <table class="table table-striped table-sm">
                 <thead>
                     <tr>
-                        <th scope="col">Series</th>
                         <th scope="col">Episode</th>
+                        <th scope="col">Podcast</th>
                         <th scope="col">Scrobbles</th>
-                        <th scope="col">All time</th>
                     </tr>
                 </thead>
                 <tbody>
-                    {% for obj in object_list %}
+                    {% for obj in object_list.all %}
-                    {% for episode in obj.episode_set.all %}
+                        {{obj.episodes}}
+                    {% for episode in obj.podcastepisode_set.all %}
                     <tr>
                         <td><a href="{{episode.get_absolute_url}}">{{episode}}</a></td>
                         <td><a href="{{obj.get_absolute_url}}">{{obj}}</a></td>
                         <td>{{episode.scrobble_set.count}}</td>
-                        <td></td>
                     </tr>
                     {% endfor %}
                     {% endfor %}

vrobbler/templates/puzzles/puzzle_detail.html

@@ -57,7 +57,7 @@
                 <tbody>
                     {% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                     </tr>
                     {% endfor %}
                 </tbody>

vrobbler/templates/scrobbles/_last_scrobbles.html

@@ -13,8 +13,27 @@
         {% include "scrobbles/_scrobble_table.html" %}
         {% endwith %}
         {% else %}
-        No tracks today
+        <p>No tracks today</p>
         {% endif %}
+
+        <h3><a href="{% url 'foods:food_list' %}">Food</a></h3>
+        {% if Food %}
+        {% with scrobbles=Food count=Food_count time=Food_time %}
+        {% include "scrobbles/_scrobble_table.html" %}
+        {% endwith %}
+        {% else %}
+        <p>No food today</p>
+        {% endif %}
+
+        <h3><a href="{% url 'moods:mood_list' %}">Moods</a></h3>
+        {% if Mood %}
+        {% with scrobbles=Mood count=Mood_count time=Mood_time %}
+        {% include "scrobbles/_scrobble_table.html" %}
+        {% endwith %}
+        {% else %}
+        <p>No moods felt today </p>
+        {% endif %}
+
     </div>
     <div class="col-md">
 
@@ -27,7 +46,7 @@
         <p>No tasks today</p>
         {% endif %}
 
-        <h3><a href="{% url 'videos:movie_list' %}">Videos</a></h3>
+        <h3><a href="{% url 'videos:video_list' %}">Videos</a></h3>
         {% if Video %}
         {% with scrobbles=Video count=Video_count time=Video_time %}
         {% include "scrobbles/_scrobble_table.html" %}
@@ -81,11 +100,12 @@
         <p>No board games today</p>
         {% endif %}
 
+        <h3><a href="{% url 'beers:beer_list' %}">Beers</a></h3>
         {% if Beer %}
-        <h4>Beers</h4>
         {% with scrobbles=Beer count=Beer_count time=Beer_time %}
         {% include "scrobbles/_scrobble_table.html" %}
         {% endwith %}
+        <p>No beer today</p>
         {% endif %}
 
         <h3><a href="{% url 'bricksets:brickset_list' %}">Brick sets</a></h3>
@@ -97,7 +117,7 @@
         <p>No brick sets today</p>
         {% endif %}
 
-        <h3><a href="{% url 'puzzles:puzzle_list' %}">Puzzles</aa></h3>
+        <h3><a href="{% url 'puzzles:puzzle_list' %}">Puzzles</a></h3>
         {% if Puzzle %}
         {% with scrobbles=Puzzle count=Puzzle_count time=Puzzle_time %}
         {% include "scrobbles/_scrobble_table.html" %}
@@ -112,7 +132,16 @@
         {% include "scrobbles/_scrobble_table.html" %}
         {% endwith %}
         {% else %}
-        <p>No books today</p>
+        <p>No books read today</p>
+        {% endif %}
+
+        <h3><a href="{% url 'locations:geolocation_list' %}">Locations</a></h3>
+        {% if GeoLocation %}
+        {% with scrobbles=GeoLocation count=GeoLocation_count time=GeoLocation_time %}
+        {% include "scrobbles/_scrobble_table.html" %}
+        {% endwith %}
+        {% else %}
+        <p>No locations visited today</p>
         {% endif %}
 
     </div>

vrobbler/templates/scrobbles/_row.html

@@ -1,10 +1,10 @@
 {% load humanize %}
 {% load naturalduration %}
 <tr {% if scrobble.in_progress %}class="in-progress"{% endif %}>
-    <td>{% if scrobble.in_progress %}{{scrobble.media_obj.strings.verb}} now | <a class="right" href="{% url "scrobbles:finish" scrobble.uuid %}">Finish</a>{% else %}{{scrobble.local_timestamp|naturaltime}}{% endif %}</td>
+    <td>{% if scrobble.in_progress %}<a href="{{scrobble.get_absolute_url}}">{{scrobble.media_obj.strings.verb}} now</a> | <a class="right" href="{% url "scrobbles:finish" scrobble.uuid %}">Finish</a>{% else %}<a href="{{scrobble.get_absolute_url}}">{{scrobble.local_timestamp|naturaltime}}</a>{% endif %}</td>
     <td>
         {% if scrobble.media_type == "Task" %}
-        <p><em><a href="{{scrobble.media_obj.get_absolute_url}}">{{scrobble.media_obj.title|truncatechars_html:45}} - {% if scrobble.logdata %}{% if scrobble.logdata.description %}{{scrobble.logdata.description}}{% endif %}{% endif %}</a></em></p>
+        <p><em><a href="{{scrobble.media_obj.get_absolute_url}}">{{scrobble.media_obj.title|truncatechars_html:45}} - {% if scrobble.logdata %}{% if scrobble.logdata.title%}{{scrobble.logdata.title}}{% endif %}{% endif %}</a></em></p>
         {% else %}
         <a href="{{scrobble.media_obj.get_absolute_url}}">{{scrobble.media_obj|truncatechars_html:45}}</a>
         {% endif %}

vrobbler/templates/scrobbles/scrobble_detail.html

@@ -12,7 +12,9 @@
 <h1>{{ object.media_obj }} - {{object.media_type}}</h1>
 
 <!-- Your existing detail page content -->
+{% if object.logdata.avg_seconds_per_page %}
 <p>Rate: {{object.logdata.avg_seconds_per_page}}s per page</p>
+{% endif %}
 
 <h2>Edit Log</h2>
 <form method="post" class="needs-validation" novalidate>

vrobbler/templates/sports/sportevent_detail.html

@@ -20,7 +20,7 @@
                 <tbody>
                     {% for scrobble in scrobbles.all %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                         <td>{{scrobble.media_obj.round.season.name}}</td>
                         <td>{{scrobble.media_obj.round.season.league}}</td>
                     </tr>

vrobbler/templates/trails/trail_detail.html

@@ -57,7 +57,7 @@
                 <tbody>
                     {% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                     </tr>
                     {% endfor %}
                 </tbody>

vrobbler/templates/videos/movie_list.html

@@ -1,28 +1,32 @@
 {% extends "base_list.html" %}
+{% block title %}Movies{% endblock %}
+{% block head_extra %}
+<style>
+  dl {
+    width: 210px;
+    float: left;
+    margin-right: 10px;
+  }
+  dt a {
+    color: white;
+    text-decoration: none;
+    font-size: smaller;
+  }
+  img {
+    height: 200px;
+    width: 200px;
+    object-fit: cover;
+  }
+  dd .right {
+    float: right;
+  }
+</style>
+{% endblock %}
 
 {% block lists %}
 <div class="row">
-    <div class="col-md">
+  <div class="col-md">
-        <div class="table-responsive">
+    <div class="table-responsive">{% include "_scrobblable_list.html" %}</div>
-            <table class="table table-striped table-sm">
+  </div>
-                <thead>
-                    <tr>
-                        <th scope="col">Title</th>
-                        <th scope="col">Scrobbles</th>
-                        <th scope="col">All time</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for obj in object_list %}
-                    <tr>
-                        <td><a href="{{obj.get_absolute_url}}">{{obj}}</a></td>
-                        <td>{{obj.scrobble_set.count}}</td>
-                        <td></td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    </div>
 </div>
-{% endblock %}
+{% endblock %}

vrobbler/templates/videos/series_detail.html

@@ -60,7 +60,7 @@
                 <tbody>
                     {% for scrobble in scrobbles %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                         <td><a href="{{scrobble.media_obj.get_absolute_url}}">{{scrobble.media_obj.title}}</a></td>
                         <td>{{scrobble.media_obj.season_number}}</td>
                         <td>{{scrobble.media_obj.episode_number}}</td>

vrobbler/templates/videos/series_list.html

@@ -1,32 +1,32 @@
 {% extends "base_list.html" %}
+{% block title %}Series{% endblock %}
+{% block head_extra %}
+<style>
+  dl {
+    width: 210px;
+    float: left;
+    margin-right: 10px;
+  }
+  dt a {
+    color: white;
+    text-decoration: none;
+    font-size: smaller;
+  }
+  img {
+    height: 200px;
+    width: 200px;
+    object-fit: cover;
+  }
+  dd .right {
+    float: right;
+  }
+</style>
+{% endblock %}
 
 {% block lists %}
 <div class="row">
-    <div class="col-md">
+  <div class="col-md">
-        <div class="table-responsive">
+    <div class="table-responsive">{% include "_scrobblable_list.html" %}</div>
-            <table class="table table-striped table-sm">
+  </div>
-                <thead>
-                    <tr>
-                        <th scope="col">Series</th>
-                        <th scope="col">Episode</th>
-                        <th scope="col">Scrobbles</th>
-                        <th scope="col">All time</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for obj in object_list %}
-                    {% for video in obj.video_set.all %}
-                    <tr>
-                        <td><a href="{{video.get_absolute_url}}">{{video}}</a></td>
-                        <td><a href="{{obj.get_absolute_url}}">{{obj}}</a></td>
-                        <td>{{video.scrobble_set.count}}</td>
-                        <td></td>
-                    </tr>
-                    {% endfor %}
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    </div>
 </div>
-{% endblock %}
+{% endblock %}

vrobbler/templates/videos/video_detail.html

@@ -87,7 +87,7 @@ dd {
                 <tbody>
                     {% for scrobble in scrobbles.all %}
                     <tr>
-                        <td>{{scrobble.local_timestamp}}</td>
+                        <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
                     </tr>
                     {% endfor %}
                 </tbody>

vrobbler/templates/videos/video_list.html

@@ -0,0 +1,32 @@
+{% extends "base_list.html" %}
+{% block title %}Videos{% endblock %}
+{% block head_extra %}
+<style>
+  dl {
+    width: 210px;
+    float: left;
+    margin-right: 10px;
+  }
+  dt a {
+    color: white;
+    text-decoration: none;
+    font-size: smaller;
+  }
+  img {
+    height: 200px;
+    width: 200px;
+    object-fit: cover;
+  }
+  dd .right {
+    float: right;
+  }
+</style>
+{% endblock %}
+
+{% block lists %}
+<div class="row">
+  <div class="col-md">
+    <div class="table-responsive">{% include "_scrobblable_list.html" %}</div>
+  </div>
+</div>
+{% endblock %}

vrobbler/templates/webpages/webpage_detail.html

@@ -48,12 +48,14 @@
             <thead>
                 <tr>
                     <th scope="col">Date</th>
+                    <th scope="col">Notes</th>
                 </tr>
             </thead>
             <tbody>
                 {% for scrobble in scrobbles.all %}
                 <tr>
-                    <td>{{scrobble.local_timestamp}}</td>
+                    <td><a href={{scrobble.get_absolute_url}}>{{scrobble.local_timestamp}}</a></td>
+                    <td>{% for note in scrobble.logdata.notes %}{{note}}{% if not forloop.last %}; {% endif%}{% endfor %}
                 </tr>
                 {% endfor %}
             </tbody>