[release] Bump version to 27.0

[podcasts] Clean up lookup and creation
[templates] Small fix to obj title missing
2025-10-14 11:18:05 -04:00 · 2025-10-14 11:17:20 -04:00 · 2025-10-14 10:58:54 -04:00 · 2025-10-14 10:58:31 -04:00 · 2025-10-14 10:55:09 -04:00 · 2025-09-30 09:36:03 -04:00
59 changed files with 813 additions and 387 deletions
--- a/PROJECT.org
+++ b/PROJECT.org
@ -1,6 +1,20 @@
 #+title: Vrobbler Project

 * Overview
+Vrobbler began humbly enough as a way to use Jellyfin's webhook to keep track of
+the shows and movies I was watching. More specifically, I broke my ankle a few
+days after Christmas in 2022 and spent the next four months very slowly
+recovering after surgical repair. So once I had the webhook working, and
+scrobbling videos, it was only a matter of time till I expaned it to mopidy to
+replicate LastFM. Then I added board games, books via KoReader, sports events,
+podcasts ... it just keeps going. Vrobbler is now a sort of Frankenstein's
+monster of scrobbling an entire life.
+
+I am still unconvinced I can keep this going, but being able to scrobble org
+tasks, Todoist tasks, web pages I've read and trails I've hiked has turned out
+to be sometimes cathartic and sometimes functional as I try to remember when I
+did a thing.
+
 * Features
 ** Beer
 *** Triggers
@ -70,7 +84,6 @@ fetching and simple saving.
 **** Bookmarklet
 *** Metadata sources
 **** Scraper
-* Release history
 * Chores
 ** DONE Document various vrobbler features :chore:personal:project:vrobbler:documentation:
 :PROPERTIES:
@ -79,71 +92,8 @@ fetching and simple saving.
 :LOGBOOK:
 CLOCK: [2025-07-09 Wed 09:55]--[2025-07-09 Wed 10:15] =>  0:20
 :END:
-* Backlog [3/23]
-** TODO [#A] Add classmethod for metadata fetching to tracks :vrobbler:feature:music:personal:project:
-:PROPERTIES:
-:ID:       bc4b45e5-4c65-13c5-ab7b-1937d3fbf5c2
-:END:
-:LOGBOOK:
-CLOCK: [2025-07-09 Wed 10:15]
-:END:
-
-** TODO Add importer class for IMAP imports :vrobbler:feature:imap:importers:project:personal:
-** TODO Add youtube link in place of IMDB on video detail page :vrobbler:feature:videos:personal:project:
-** TODO [#A] Tasks from org-mode should properly update notes and leave them out of the body :vrobbler:bug:tasks:
-** TODO [#A] Fix small bug in views for TV series where next episode is now None :vrobbler:bug:personal:videos:
-
-#+begin_src python
-ERROR    django.request:241 log_response Internal Server Error: /series/c24100d1-da45-4abe-86bf-27cfce9b1f89/
-Traceback (most recent call last):
-  File "/usr/local/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
-    response = get_response(request)
-               ^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
-    response = wrapped_callback(request, *callback_args, **callback_kwargs)
-               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
-    return self.dispatch(request, *args, **kwargs)
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/django/contrib/auth/mixins.py", line 73, in dispatch
-    return super().dispatch(request, *args, **kwargs)
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
-    return handler(request, *args, **kwargs)
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/django/views/generic/detail.py", line 109, in get
-    context = self.get_context_data(object=self.object)
-              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/vrobbler/apps/videos/views.py", line 33, in get_context_data
-    context_data["next_episode_id"] = "tt" + next_episode_id
-                                      ~~~~~^~~~~~~~~~~~~~~~~
-TypeError: can only concatenate str (not "NoneType") to str
-#+end_src
-
-** TODO [#A] Send periodic check notifications for board games and beer that ask if you're still scrobbling :vrobbler:personal:project:beers:boardgames:notifications:feature:
-** TODO [#A] Fix raw text webpage title not truncating to 254 chars :vrobbler:personal:bug:webpages:
-** TODO [#A] Fix koreader scrobble imports to use DST properly :vrobbler:personal:bug:books:imports:
-The page data has the canonical date something was read in it, but it seems to be an hour off. I traced this back to being off during DST, so we just need the importer to be aware of whether a user is using DST or not and roll back an hour for part of the year.
-
-Also, we'd need to adjust any old scrobbles that took place with DST off to roll them back by an hour.
-** TODO [#A] Create small utility to clean up tracks scrobbled with wonky playback times :vrobbler:personal:bug:music:scrobbles:
-** TODO [#B] Add AllTrails as a source for Trail data :vrobbler:trails:feature:personal:project:
-Pretty clear, I would love to make trails more useful. Historically I wasn't
-hiking a lot, which made the source for this a bit silly. But it's clear that
-AllTrails is the best source, though having TrailForks is nice to.
-** TODO [#B] Add `garmin_activity_id` to the TrailMetadataLog class :vrobbler:trails:feature:personal:project:
-Would be nice to have some loose connection to the actual event in my Garmin profile.
-** TODO [#B] Explore a way to add metadata editing to scrobbles after saving :vrobbler:spike:scrobbling:personal:project:
-Could be as simple as a JSON form on the scrobble detail page (do I have have one of those yet?).
-** TODO [#B] Explore a good way to show notes and descriptions from scrobbles to users :personal:project:scrobbling:vrobbler:spike:
-** TODO [#B] Add webdav syncing to retroarch imports :vrobbler:videogames:webdav:feature:project:personal:
-** TODO [#B] Add CSV endpoint for book scrobbles that LibraryThing can ingest :personal:project:books:feature:export:
-https://app.todoist.com/app/task/add-a-csv-endpoint-for-users-book-reads-that-library-thing-can-ingest-6X7QPMRp265xMXqg#comment-6X7QrXq6gJjMP4hg
-** TODO [#C] Fix bug where podcast scrobbling creates duplicate Podcast :project:vrobbler:scrobbling:podcasts:bug:personal:
-Rather than pick up an existing Podcast using the podcast title in the mopidy
-file name, Vrobbler creates a new podcast with no enriched data. Not a big deal
-for my use as the volume of podcasts I listen to makes manual fixes easy. But
-it's annoying.
+* Backlog [3/27]
+** TODO [#C] Create small utility to clean up tracks scrobbled with wonky playback times :vrobbler:personal:bug:music:scrobbles:
 ** TODO [#C] Move to using more robust mopidy-webhooks pacakge form pypi :utility:improvement:
 :PROPERTIES:
 :ID:       ab31fdc3-359c-1b1d-6b9d-546b476021ba
@ -442,6 +392,169 @@ 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:
+** TODO [#B] Add importer class for IMAP imports :vrobbler:feature:imap:importers:project:personal:
+** TODO [#B] Clean up follow up notifications for board games and beer that ask if you're still scrobbling :vrobbler:personal:project:beers:boardgames:notifications:feature:
+
+- Note taken on [2025-09-30 Tue 09:32]
+
+  I added this feature in a very rough way, but now we should add "Action"
+  headers so that we can either Finish or Cancel the associated scrobble:
+
+  https://docs.ntfy.sh/publish/#send-http-request
+
+** TODO [#B] Add AllTrails as a source for Trail data :vrobbler:trails:feature:personal:project:
+Pretty clear, I would love to make trails more useful. Historically I wasn't
+hiking a lot, which made the source for this a bit silly. But it's clear that
+AllTrails is the best source, though having TrailForks is nice to.
+** TODO [#B] Add `garmin_activity_id` to the TrailMetadataLog class :vrobbler:trails:feature:personal:project:
+Would be nice to have some loose connection to the actual event in my Garmin profile.
+** TODO [#B] Explore a way to add metadata editing to scrobbles after saving :vrobbler:spike:scrobbling:personal:project:
+Could be as simple as a JSON form on the scrobble detail page (do I have have one of those yet?).
+** TODO [#B] Explore a good way to show notes and descriptions from scrobbles to users :personal:project:scrobbling:vrobbler:spike:
+** TODO [#B] Add webdav syncing to retroarch imports :vrobbler:videogames:webdav:feature:project:personal:
+** TODO [#B] Add CSV endpoint for book scrobbles that LibraryThing can ingest :personal:project:books:feature:export:
+https://app.todoist.com/app/task/add-a-csv-endpoint-for-users-book-reads-that-library-thing-can-ingest-6X7QPMRp265xMXqg#comment-6X7QrXq6gJjMP4hg
+** TODO [#B] Add youtube link in place of IMDB on video detail page :vrobbler:feature:videos:personal:project:
+** TODO [#B] Fix PuzzleLogData has no attribute form :vrobbler:puzzles:personal:project:logdata:
+** TODO [#B] Scrape ComicBookRoundUp ratings for comic book metadata :vrobbler:books:feature:comicbook:personal:project:
+
+- Note taken on [2025-09-25 Thu 10:51]
+
+  As an example https://comicbookroundup.com/comic-books/reviews/humanoids-publishing/the-history-of-science-fiction
+** TODO [#B] Add PuzzleLogData class with with_people and completed :vrobbler:feature:puzzles:logdata:personal:project:
+** TODO [#A] Add classmethod for metadata fetching to tracks :vrobbler:feature:music:personal:project:
+:PROPERTIES:
+:ID:       bc4b45e5-4c65-13c5-ab7b-1937d3fbf5c2
+:END:
+
+** TODO [#A] Tasks from org-mode should properly update notes and leave them out of the body :vrobbler:bug:tasks:
+** TODO [#A] Fix views for TV series where next episode is now None :vrobbler:bug:personal:videos:
+
+#+begin_src python
+ERROR    django.request:241 log_response Internal Server Error: /series/c24100d1-da45-4abe-86bf-27cfce9b1f89/
+Traceback (most recent call last):
+  File "/usr/local/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+    response = get_response(request)
+               ^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
+    return self.dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/django/contrib/auth/mixins.py", line 73, in dispatch
+    return super().dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
+    return handler(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/django/views/generic/detail.py", line 109, in get
+    context = self.get_context_data(object=self.object)
+              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/vrobbler/apps/videos/views.py", line 33, in get_context_data
+    context_data["next_episode_id"] = "tt" + next_episode_id
+                                      ~~~~~^~~~~~~~~~~~~~~~~
+TypeError: can only concatenate str (not "NoneType") to str
+#+end_src
+
+** TODO [#A] Fix koreader scrobble imports to use DST properly :vrobbler:personal:bug:books:imports:
+
+- Note taken on [2025-09-25 Thu 10:37] \\
+
+  This may already be fixed ... need to check.
+
+- Note taken on [2025-02-25 12:34] \\
+
+  The page data has the canonical date something was read in it, but it seems
+  to be an hour off. I traced this back to being off during DST, so we just need
+  the importer to be aware of whether a user is using DST or not and roll back
+  an hour for part of the year. Also, we'd need to adjust any old scrobbles that
+  took place with DST off to roll them back by an hour.
+
+** TODO [#A] Allow scrobbling from the Food list page's start links :vrobbler:bug:food:scrobbling:personal:project:
+https://life.lab.unbl.ink/scrobble/e39779c8-62a5-46a6-bdef-fb7662810dc6/start/
+** TODO [#A] Puzzles (and all longplays) should have a "Completed?" column on their detail page :vrobbler:bug:puzzles:personal:project:
+** TODO [#A] Fix raw text webpage title not truncating to 254 chars :vrobbler:personal:bug:webpages:
+
+- Note taken on [2025-09-30 Tue 09:33]
+
+  This may have already been resolved ... need to just confirm it.
+* Version 27.0 [3/3]
+** DONE [#A] Fix bug where podcast scrobbling creates duplicate Podcast :project:vrobbler:scrobbling:podcasts:bug:personal:
+:PROPERTIES:
+:ID:       7377ef6c-5fa7-9e4e-9080-f9810a76118c
+:END:
+
+Rather than pick up an existing Podcast using the podcast title in the mopidy
+file name, Vrobbler creates a new podcast with no enriched data. Not a big deal
+for my use as the volume of podcasts I listen to makes manual fixes easy. But
+it's annoying.
+
+** DONE [#A] Allow reading comic books from readcomicsoline.ru :vrobbler:books:feature:comicbook:personal:project:scrobbling:
+:PROPERTIES:
+:ID:       7c7e9ecc-b675-68c3-764f-ef771ce5d88f
+:END:
+
+- Note taken on [2025-09-25 Thu 10:52]
+
+  Things to consider are whether we scrobble the issue on one page, send it to
+  archivebox? (yes), and how best to enrich the data
+
+** DONE [#A] Add RSS feed lookups to podcasts :vrobbler:personal:feature:podcasts:
+:PROPERTIES:
+:ID:       d60645b0-7578-97c1-0278-05bd9de4269c
+:END:
+
+- Note taken on [2025-10-14 Tue 10:08]
+
+  Turns out the Podcast plugin for mopidy does a pretty good job of showing the
+  latest file without having to scroll the bottom using only Muse to not parse
+  the podcast title name. BUT, now we're getting urls like this:
+
+  https://nsf.libsyn.com/rss#77e01251-cb20-4609-b577-d48e985d2e7b
+
+  This is great, because there's more context there, but it has to read out of
+  the RSS feed. We should add a check in the podcast util to sniff out the file
+  referenced in the # in that url and populate the info from there. This should
+  actually be much more reliable than the current state of the podcast lookup
+  which depends on the file to be name properly.
+
+* 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:
+:ID:       d5cce807-1f45-ef19-45a4-9f7069fa2a93
+:END:
+** DONE Removed sidebar and add links to headers :personal:feature:templates:scrobbles:
+:PROPERTIES:
+:ID:       1a1c0aa6-0313-c8be-1676-5d6adddef0a4
+:END:
+
 * Version 23.0 [3/3]
 ** DONE Add dynamic forms for LogData classes :personal:feature:vrobbler:project:forms:logdata:
 :PROPERTIES:
--- a/poetry.lock
+++ b/poetry.lock
@ -1602,6 +1602,21 @@ files = [
 [package.extras]
 devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"]

+[[package]]
+name = "feedparser"
+version = "6.0.12"
+description = "Universal feed parser, handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds"
+optional = false
+python-versions = ">=3.6"
+groups = ["main"]
+files = [
+    {file = "feedparser-6.0.12-py3-none-any.whl", hash = "sha256:6bbff10f5a52662c00a2e3f86a38928c37c48f77b3c511aedcd51de933549324"},
+    {file = "feedparser-6.0.12.tar.gz", hash = "sha256:64f76ce90ae3e8ef5d1ede0f8d3b50ce26bcce71dd8ae5e82b1cd2d4a5f94228"},
+]
+
+[package.dependencies]
+sgmllib3k = "*"
+
 [[package]]
 name = "filelock"
 version = "3.18.0"
@ -4403,6 +4418,17 @@ enabler = ["pytest-enabler (>=2.2)"]
 test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
 type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]

+[[package]]
+name = "sgmllib3k"
+version = "1.0.0"
+description = "Py3k port of sgmllib."
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+    {file = "sgmllib3k-1.0.0.tar.gz", hash = "sha256:7868fb1c8bfa764c1ac563d3cf369c381d1325d36124933a726f29fcdaa812e9"},
+]
+
 [[package]]
 name = "shellingham"
 version = "1.5.4"
@ -5499,4 +5525,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.9,<3.12"
-content-hash = "3a483aefea0a3afebf187b17b7df72a158788024ca8121b512b39567fb5ec8ca"
+content-hash = "cd3b566597e09aa444f9af30f95f94f922bf3dca71fbd05c887fb10cbc11d7bf"
--- a/pyproject.toml
+++ b/pyproject.toml
@ -56,6 +56,7 @@ poetry-bumpversion = "^0.3.3"
 orgparse = "^0.4.20250520"
 tmdbv3api = "^1.9.0"
 themoviedb = "^1.0.2"
+feedparser = "^6.0.12"

 [tool.poetry.group.test]
 optional = true
--- a/vrobbler/apps/foods/migrations/0003_food_calories.py
+++ b/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),
+        ),
+    ]
--- a/vrobbler/apps/foods/models.py
+++ b/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:
--- a/vrobbler/apps/lifeevents/models.py
+++ b/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
--- a/vrobbler/apps/locations/models.py
+++ b/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
--- a/vrobbler/apps/locations/urls.py
+++ b/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",
    ),
 ]
--- a/vrobbler/apps/moods/models.py
+++ b/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:
--- a/vrobbler/apps/moods/urls.py
+++ b/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",
    ),
 ]
--- a/vrobbler/apps/music/models.py
+++ b/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:
--- a/vrobbler/apps/podcasts/models.py
+++ b/vrobbler/apps/podcasts/models.py
@ -144,6 +144,7 @@ class PodcastEpisode(ScrobblableMixin):
        cls,
        title: str,
        podcast_name: str,
+        podcast_description: str,
        pub_date: str,
        number: int = 0,
        mopidy_uri: str = "",
@ -155,31 +156,33 @@ class PodcastEpisode(ScrobblableMixin):
        producer before saving the epsiode so it can be scrobbled.

        """
+        log_context={"mopidy_uri": mopidy_uri, "media_type": "Podcast"}
        producer = None
        if producer_name:
            producer = Producer.find_or_create(producer_name)

-        podcast = Podcast.objects.filter(
-            name__iexact=podcast_name,
-        ).first()
-        if not podcast:
-            podcast = Podcast.objects.create(
-                name=podcast_name, producer=producer
-            )
-            if enrich:
-                podcast.fix_metadata()
+        podcast, created = Podcast.objects.get_or_create(name=podcast_name, defaults={"description": podcast_description})
+        log_context["podcast_id"] = podcast.id
+        log_context["podcast_name"] = podcast.name
+        if created:
+            logger.info("Created new podcast", extra=log_context)
+        if enrich and created:
+            logger.info("Enriching new podcast", extra=log_context)
+            podcast.fix_metadata()

-        episode = cls.objects.filter(
-            title__iexact=title, podcast=podcast
-        ).first()
-        if not episode:
-            episode = cls.objects.create(
-                title=title,
-                podcast=podcast,
-                run_time_seconds=run_time_seconds,
-                number=number,
-                pub_date=pub_date,
-                mopidy_uri=mopidy_uri,
-            )
+        episode, created = cls.objects.get_or_create(
+            title=title,
+            podcast=podcast,
+            defaults={
+                "run_time_seconds": run_time_seconds,
+                "number": number,
+                "pub_date": pub_date,
+                "mopidy_uri": mopidy_uri,
+            }
+        )
+        if created:
+            log_context["episode_id"] = episode.id
+            log_context["episode_title"] = episode.title
+            logger.info("Created new podcast episode", extra=log_context)

        return episode
--- a/vrobbler/apps/podcasts/utils.py
+++ b/vrobbler/apps/podcasts/utils.py
@ -1,7 +1,9 @@
 import logging
 import os
+from typing import Any
 from urllib.parse import unquote

+import feedparser
 from dateutil.parser import ParserError, parse
 from podcasts.models import PodcastEpisode

@ -10,26 +12,85 @@ logger = logging.getLogger(__name__)
 # TODO This should be configurable in settings or per deploy
 PODCAST_DATE_FORMAT = "YYYY-MM-DD"

+def parse_duration(d):
+    if not d:
+        return None
+    if d.isdigit():
+        return int(d)
+    parts = [int(p) for p in d.split(":")]
+    while len(parts) < 3:
+        parts.insert(0, 0)
+    h, m, s = parts
+    return h * 3600 + m * 60 + s
+
+def fetch_metadata_from_rss(uri: str) -> dict[str, Any]:
+    log_context = {"mopidy_uri": uri, "media_type": "Podcast"}
+    podcast_data: dict[str, Any] = {}
+
+    try:
+        feed = feedparser.parse(uri.split("#")[0])
+        target_guid = uri.split("#")[1]
+    except IndexError:
+        logger.warning("Tried to parse uri as RSS feed, but no target found", extra=log_context)
+        return podcast_data
+
+    podcast_publisher = feed.feed.get("itunes_publisher")
+    podcast_owner = feed.feed.itunes_owner.get("name") if isinstance(feed.feed.itunes_owner, dict) else feed.feed.itunes_owner
+    podcast_other = feed.feed.get("managingeditor") or feed.feed.get("copyright")
+
+    podcast_data = {
+        "podcast_name": feed.feed.get("title", "Unknown Podcast"),
+        "podcast_description": feed.feed.get("description", ""),
+        "podcast_link": feed.feed.get("link", ""),
+        "podcast_producer": podcast_publisher or podcast_owner or podcast_other
+    }
+
+    for entry in feed.entries:
+        if target_guid in target_guid:
+            logger.info("🎧 Episode found in RSS feed", extra=log_context)
+            podcast_data["episode_name"] = entry.title
+            podcast_data["episode_num"] = entry.guid
+            podcast_data["episode_pub_date"] = entry.get("published", None)
+            podcast_data["episode_description"] = entry.get("description", None)
+            podcast_data["episode_url"] = entry.enclosures[0].href if entry.get("enclosures") else None
+            podcast_data["episode_runtime_seconds"] = parse_duration(entry.get("itunes_duration", None))
+            return podcast_data
+    else:
+        logger.info("Episode not found in RSS feed.")
+
+
+def parse_mopidy_uri(uri: str) -> dict[str, Any]:
+    podcast_data: dict[str, Any] = {}

-def parse_mopidy_uri(uri: str) -> dict:
    logger.debug(f"Parsing URI: {uri}")
+    if "https://" in uri:
+        return fetch_metadata_from_rss(uri)
+
+
    parsed_uri = os.path.splitext(unquote(uri))[0].split("/")

+    podcast_data = {
+        "episode_filename": parsed_uri[-1],
+        "episode_num": None,
+        "podcast_name": parsed_uri[-2].strip(),
+        "pub_date": None,
+    }
+
+
    episode_str = parsed_uri[-1]
-    podcast_name = parsed_uri[-2].strip()
    episode_num = None
    episode_num_pad = 0

    try:
        # Without episode numbers the date will lead
-        pub_date = parse(episode_str[0:10])
+        podcast_data["pub_date"] = parse(episode_str[0:10])
    except ParserError:
-        episode_num = int(episode_str.split("-")[0])
-        episode_num_pad = len(str(episode_num)) + 1
+        podcast_data["episode_num"] = int(episode_str.split("-")[0])
+        episode_num_pad = len(str(podcast_data["episode_num"])) + 1

        try:
            # Beacuse we have epsiode numbers on
-            pub_date = parse(
+            podcast_data["pub_date"] = parse(
                episode_str[
                    episode_num_pad : len(PODCAST_DATE_FORMAT)
                    + episode_num_pad
@ -39,41 +100,35 @@ def parse_mopidy_uri(uri: str) -> dict:
            pub_date = ""

    gap_to_strip = 0
-    if pub_date:
+    if podcast_data["pub_date"]:
        gap_to_strip += len(PODCAST_DATE_FORMAT)
-    if episode_num:
+    if podcast_data["episode_num"]:
        gap_to_strip += episode_num_pad

-    episode_name = episode_str[gap_to_strip:].replace("-", " ").strip()
+    podcast_data["episode_name"] = episode_str[gap_to_strip:].replace("-", " ").strip()

-    return {
-        "episode_filename": episode_name,
-        "episode_num": episode_num,
-        "podcast_name": podcast_name,
-        "pub_date": pub_date,
-    }
+    return podcast_data


 def get_or_create_podcast(post_data: dict) -> PodcastEpisode:
+    logger.info("Looking up podcast", extra={"post_data": post_data, "media_type": "Podcast"})
+
    mopidy_uri = post_data.get("mopidy_uri", "")
    parsed_data = parse_mopidy_uri(mopidy_uri)
+    producer_name = parsed_data.get("podcast_producer", post_data.get("artist", ""))
+    podcast_name = parsed_data.get("podcast_name", post_data.get("album", ""))
+    episode_name = parsed_data.get("episode_title", parsed_data.get("episode_filename", ""))
+    run_time_seconds = parsed_data.get("episode_runtime_seconds", post_data.get("run_time", 2700))

-    producer_dict = {"name": post_data.get("artist")}
-
-    podcast_name = post_data.get("album")
-    if not podcast_name:
-        podcast_name = parsed_data.get("podcast_name")
-    podcast_dict = {"name": podcast_name}
-
-    episode_name = parsed_data.get("episode_filename")
    episode_dict = {
        "title": episode_name,
-        "run_time_seconds": post_data.get("run_time"),
-        "number": parsed_data.get("episode_num"),
+        "podcast_name": podcast_name,
+        "podcast_description": parsed_data.get("podcast_description"),
        "pub_date": parsed_data.get("pub_date"),
+        "number": parsed_data.get("episode_num"),
        "mopidy_uri": mopidy_uri,
+        "producer_name": producer_name,
+        "run_time_seconds": run_time_seconds,
    }

-    return PodcastEpisode.find_or_create(
-        podcast_dict, producer_dict, episode_dict
-    )
+    return PodcastEpisode.find_or_create(**episode_dict)
--- a/vrobbler/apps/podcasts/views.py
+++ b/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
--- a/vrobbler/apps/scrobbles/constants.py
+++ b/vrobbler/apps/scrobbles/constants.py
@ -18,6 +18,8 @@ PLAY_AGAIN_MEDIA = {
    "bricksets": "BrickSet",
    "trails": "Trail",
    "beers": "Beer",
+    "foods": "Food",
+    "locations": "GeoLocation",
 }

 MEDIA_END_PADDING_SECONDS = {
@ -35,6 +37,7 @@ SCROBBLE_CONTENT_URLS = {
    "-t": ["https://app.todoist.com/app/task/{id}"],
    "-p": ["https://www.ipdb.plus/IPDb/puzzle.php?id="],
    "-l": ["https://brickset.com/sets/"],
+    "-c": ["https://readcomicsonline.ru"],
 }

 EXCLUDE_FROM_NOW_PLAYING = ("GeoLocation",)
@ -50,6 +53,7 @@ MANUAL_SCROBBLE_FNS = {
    "-t": "manual_scrobble_task",
    "-p": "manual_scrobble_puzzle",
    "-l": "manual_scrobble_brickset",
+    "-c": "manual_scrobble_book",
 }


--- a/vrobbler/apps/scrobbles/forms.py
+++ b/vrobbler/apps/scrobbles/forms.py
@ -3,8 +3,6 @@ from typing import Union, get_args, get_origin

 from django import forms

-from people.models import Person
-

 class ExportScrobbleForm(forms.Form):
    """Provide options for downloading scrobbles"""
@ -76,10 +74,16 @@ def django_form_field_from_type(field_type, required=True):

 def form_from_dataclass(dataclass):
    form_fields = {}
-    # Override notes field
+    override_fields = {}
+    for klass in dataclass.mro():
+        if hasattr(klass, "override_fields"):
+            print(klass, ": ", klass.override_fields())
+            override_fields.update(klass.override_fields())
+    print("overrides: ", override_fields)
    for f in fields(dataclass):
-        if f.name in dataclass.override_fields():
-            form_fields[f.name] = dataclass.override_fields()[f.name]
+        print(f)
+        if f.name in override_fields:
+            form_fields[f.name] = override_fields[f.name]
            continue

        required = f.default is None and f.default_factory is None
--- a/vrobbler/apps/scrobbles/models.py
+++ b/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):
--- a/vrobbler/apps/scrobbles/notifications.py
+++ b/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"):
-            self.ntfy_str += f" - {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('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):
--- a/vrobbler/apps/scrobbles/scrobblers.py
+++ b/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 = {}
--- a/vrobbler/apps/scrobbles/utils.py
+++ b/vrobbler/apps/scrobbles/utils.py
@ -1,19 +1,26 @@
 import hashlib
 import logging
 import re
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
+from typing import TYPE_CHECKING, Optional
 from urllib.parse import urlparse
 from zoneinfo import ZoneInfo

+import pendulum
 import pytz
 from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.db import models
+from django.db.models.fields.json import KeyTextTransform
+from django.db.models.functions import Cast, TruncDate
 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 +28,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 +355,56 @@ 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
+
+
+def base_scrobble_qs(user_id: int) -> models.QuerySet:
+    """Base queryset with calories extracted as integer and day annotated."""
+    from scrobbles.models import Scrobble
+
+    return (
+        Scrobble.objects
+        .annotate(day=TruncDate("timestamp"))
+        .annotate(calories_int=Cast(KeyTextTransform("calories", "log"), models.IntegerField()))
+        .filter(calories_int__isnull=False, user_id=user_id)
+    )
+
+def get_daily_calories_for_user_by_day(user_id: int, date: date| str) -> int:
+    """Return total calories for a user on a specific day."""
+
+    if isinstance(date, str):
+        date = pendulum.parse(date)
+
+    qs = base_scrobble_qs(user_id).filter(day=date)
+    agg = qs.aggregate(total_calories=models.Sum("calories_int"))
+
+    return agg["total_calories"] or 0
+
+def get_daily_calorie_dict_for_user(user_id: int) -> dict[date, int]:
+    """Return {day: total_calories} for all days with scrobbles, in one query."""
+    qs = (
+        base_scrobble_qs(user_id)
+        .values("day")
+        .annotate(total_calories=models.Sum("calories_int"))
+        .order_by("day")
+    )
+
+    return {entry["day"]: entry["total_calories"] for entry in qs}
--- a/vrobbler/apps/scrobbles/views.py
+++ b/vrobbler/apps/scrobbles/views.py
@ -2,26 +2,27 @@ import calendar
 import json
 import logging
 from datetime import datetime, timedelta
-from dateutil.relativedelta import relativedelta

-from django.shortcuts import redirect
 import pendulum
 import pytz
+from dateutil.relativedelta import relativedelta
 from django.apps import apps
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db.models import Count, Q, Max
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
+from django.db.models import Count, Max, Q
 from django.db.models.query import QuerySet
 from django.http import FileResponse, HttpResponseRedirect, JsonResponse
+from django.shortcuts import redirect
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import DetailView, FormView, TemplateView
 from django.views.generic.edit import CreateView
 from django.views.generic.list import ListView
+from moods.models import Mood
 from music.aggregators import live_charts, scrobble_counts, week_of_scrobbles
-
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from pendulum.parsing.exceptions import ParserError
 from rest_framework import status
 from rest_framework.decorators import (
    api_view,
@ -54,10 +55,10 @@ from scrobbles.tasks import (
    process_tsv_import,
 )
 from scrobbles.utils import (
+    get_daily_calories_for_user_by_day,
    get_long_plays_completed,
    get_long_plays_in_progress,
 )
-from moods.models import Mood

 logger = logging.getLogger(__name__)

@ -146,7 +147,7 @@ class RecentScrobbleList(ListView):
            if date_str:
                try:
                    date = pendulum.parse(date_str)
-                except:
+                except ParserError:
                    pass
            if date_str:
                if date_str == "this_week" or "-W" in date_str:
@ -230,6 +231,7 @@ class RecentScrobbleList(ListView):
                user=self.request.user,
            )
            data["counts"] = []  # scrobble_counts(user)
+            data["daily_calories"] = get_daily_calories_for_user_by_day(self.request.user.id, date)
        else:
            data["weekly_data"] = week_of_scrobbles()
            data["counts"] = scrobble_counts()
@ -940,7 +942,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()
@ -969,11 +971,14 @@ class ScrobbleDetailView(DetailView):
                    original_value = (self.object.log or {}).get(field_name)
                    data[field_name] = original_value

-            if "with_people_ids" in data:
+            if data.get("with_people_ids", False):
                data["with_people_ids"] = [
                    p.id for p in data["with_people_ids"]
                ]

+            if data.get("platform_id", False):
+                data["platform_id"] = data["platform_id"].id
+
            self.object.log = data
            self.object.save(update_fields=["log"])
            return redirect(self.object.get_absolute_url())
--- a/vrobbler/apps/tasks/models.py
+++ b/vrobbler/apps/tasks/models.py
@ -82,7 +82,7 @@ class Task(LongPlayScrobblableMixin):

    def subtitle_for_user(self, user_id):
        scrobble = self.scrobbles(user_id).first()
-        return scrobble.logdata.description or ""
+        return scrobble.logdata.title or ""

    @classmethod
    def find_or_create(cls, title: str) -> "Task":
--- a/vrobbler/apps/videogames/models.py
+++ b/vrobbler/apps/videogames/models.py
@ -39,20 +39,13 @@ class VideoGameLogData(BaseLogData, LongPlayLogData, WithPeopleLogData):

    @classmethod
    def override_fields(cls) -> dict:
-        fields = {}
-        for base in cls.mro()[1:]:
-            if hasattr(base, "override_fields"):
-                base_fields = base.override_fields()
-                fields.update(base_fields)
-        custom_fields = {
+        return {
            "platform_id": forms.ModelChoiceField(
                queryset=VideoGamePlatform.objects.all(),
                required=False,
                widget=forms.Select(),
            )
        }
-        fields.update(custom_fields)
-        return fields


 class VideoGamePlatform(TimeStampedModel):
@ -70,19 +63,6 @@ class VideoGamePlatform(TimeStampedModel):
        )


-@dataclass
-class VideoGameLogData(BaseLogData, LongPlayLogData, WithPeopleLogData):
-    platform_id: Optional[int] = None
-    emulated: Optional[bool] = False
-    emulator: Optional[str] = None
-
-    @property
-    def platform(self) -> VideoGamePlatform | None:
-        if not self.platform_id:
-            return
-        return VideoGamePlatform.objects.filter(id=self.platform_id).first()
-
-
 class VideoGameCollection(TimeStampedModel):
    name = models.CharField(max_length=255)
    uuid = models.UUIDField(default=uuid4, editable=False, **BNULL)
--- a/vrobbler/apps/videos/urls.py
+++ b/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(),
--- a/vrobbler/apps/webpages/models.py
+++ b/vrobbler/apps/webpages/models.py
@ -67,10 +67,10 @@ class WebPage(ScrobblableMixin):
            self.save(update_fields=["extract"])

    def get_absolute_url(self):
-        return reverse("webpages:webpage-detail", kwargs={"slug": self.uuid})
+        return reverse("webpages:webpage_detail", kwargs={"slug": self.uuid})

    def get_read_url(self):
-        return reverse("webpages:webpage-read", kwargs={"slug": self.uuid})
+        return reverse("webpages:webpage_read", kwargs={"slug": self.uuid})

    @property
    def estimated_time_to_read_in_seconds(self):
--- a/vrobbler/apps/webpages/urls.py
+++ b/vrobbler/apps/webpages/urls.py
@ -5,15 +5,15 @@ app_name = "webpages"


 urlpatterns = [
-    path("webpages/", views.WebPageListView.as_view(), name="webpage-list"),
+    path("webpages/", views.WebPageListView.as_view(), name="webpage_list"),
    path(
        "webpages/<slug:slug>/",
        views.WebPageDetailView.as_view(),
-        name="webpage-detail",
+        name="webpage_detail",
    ),
    path(
        "webpage/<slug:slug>/read/",
        views.WebPageReadView.as_view(),
-        name="webpage-read",
+        name="webpage_read",
    ),
 ]
--- a/vrobbler/apps/webpages/views.py
+++ b/vrobbler/apps/webpages/views.py
@ -32,7 +32,7 @@ class WebPageReadView(
        if latest_scrobble.played_to_completion:
            redirect(
                reverse(
-                    "webpages:webpage-detail", kwargs={"slug": webpage.uuid}
+                    "webpages:webpage_detail", kwargs={"slug": webpage.uuid}
                )
            )
        return super().get(*args, **kwargs)
--- a/vrobbler/templates/_scrobblable_list.html
+++ b/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>
@ -10,13 +12,16 @@
    </thead>
    <tbody>
        {% for obj in object_list %}
+        {% if obj.title %}
        <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>
            <td><a type="button" class="btn btn-sm btn-primary" href="{{obj.start_url}}">Scrobble</a></td>
            {% endif %}
        </tr>
+        {% endif %}
        {% endfor %}
    </tbody>
 </table>
--- a/vrobbler/templates/base.html
+++ b/vrobbler/templates/base.html
@ -175,7 +175,7 @@
    </head>
    <body>
        <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-            <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="#">Vrobbler</a>
+            <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="/">Vrobbler</a>
            <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
                <span class="navbar-toggler-icon"></span>
            </button>
@ -208,85 +208,8 @@
                        {% endfor %}
                        </ul>
                        {% endif %}
-                        <ul class="nav flex-column">
-                            <li class="nav-item">
-                                <a class="nav-link active" aria-current="page" href="/">
-                                <span data-feather="music"></span>
-                                Dashboard
-                                </a>
-                            </li>
-                            {% if user.is_authenticated %}
-                            <li class="nav-item">
-                                <a class="nav-link" aria-current="page" href="/charts/">
-                                <span data-feather="bar-chart"></span>
-                                Charts
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" aria-current="page" href="/locations/">
-                                <span data-feather="map"></span>
-                                Locations
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/long-plays/">
-                                <span data-feather="playv"></span>
-                                Long plays
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/moods/">
-                                <span data-feather="smiley"></span>
-                                Moods
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/books/">
-                                <span data-feather="book"></span>
-                                Books
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/video-games/">
-                                <span data-feather="video"></span>
-                                Video games
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/board-games/">
-                                <span data-feather="board"></span>
-                                Board games
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/trails/">
-                                <span data-feather="trail"></span>
-                                Trails
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/beers/">
-                                <span data-feather="beer"></span>
-                                Beers
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/imports/">
-                                <span data-feather="log"></span>
-                                Imports
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="/admin/">
-                                <span data-feather="key"></span>
-                                Admin
-                                </a>
-                            </li>
-                            {% endif %}
-                        </ul>
                        {% block extra_nav %}
                        {% endblock %}
-                        <hr/>

                        {% if now_playing_list and user.is_authenticated %}
                        <ul>
@ -296,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>
--- a/vrobbler/templates/boardgames/boardgame_detail.html
+++ b/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 %}
--- a/vrobbler/templates/books/book_detail.html
+++ b/vrobbler/templates/books/book_detail.html
@ -45,7 +45,7 @@
                    {% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
                    <tr>
                        <td><a href="{{scrobble.get_absolute_url}}">{{scrobble.local_timestamp}}</a></td>
-                        <td>{% if scrobble.long_play_complete == True %}Yes{% endif %}</td>
+                        <td>{% if scrobble.logdata.long_play_complete == True %}Yes{% endif %}</td>
                        <td>{% if scrobble.in_progress %}Now reading{% else %}{{scrobble.session_pages_read}}{% endif %}</td>
                        <td>{% for author in scrobble.book.authors.all %}<a href="{{author.get_absolute_url}}">{{author}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
                    </tr>
--- a/vrobbler/templates/bricksets/brickset_detail.html
+++ b/vrobbler/templates/bricksets/brickset_detail.html
@ -0,0 +1,56 @@
+{% extends "base_list.html" %}
+{% load mathfilters %}
+{% load static %}
+{% load naturalduration %}
+
+{% block title %}{{object.title}}{% endblock %}
+
+{% block lists %}
+
+<div class="row">
+
+    {% if object.cover%}
+    <p style="float:left; width:402px; padding:0; border: 1px solid #ccc">
+        <img src="{{object.cover.url}}" width=400 />
+    </p>
+    {% endif %}
+    <div style="float:left; width:600px; margin-left:10px; ">
+        {% if object.summary %}
+        <p>{{object.summary|safe|linebreaks|truncatewords:160}}</p>
+        <hr />
+        {% endif %}
+        <p style="float:right;">
+            <a href="{{object.openlibrary_link}}"><img src="{% static " images/openlibrary-logo.png" %}" width=35></a>
+            <a href="{{object.amazon_link}}"><img src="{% static " images/amazon-logo.png" %}" width=35></a>
+        </p>
+    </div>
+</div>
+<div class="row">
+    <p>{{scrobbles.count}} scrobbles</p>
+</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">Completed</th>
+                        <th scope="col">Time</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
+                    <tr>
+                        <td><a href="{{scrobble.get_absolute_url}}">{{scrobble.local_timestamp}}</a></td>
+                        <td>{% if scrobble.logdata.long_play_complete == True %}Yes{% endif %}</td>
+                        <td>{% if scrobble.in_progress %}Now reading{% else %}{{scrobble.session_pages_read}}{% endif %}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+{% endblock %}
--- a/vrobbler/templates/bricksets/brickset_list.html
+++ b/vrobbler/templates/bricksets/brickset_list.html
@ -0,0 +1,23 @@
+{% extends "base_list.html" %}
+
+{% block title %}Brick Sets{% 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 %}
--- a/vrobbler/templates/foods/food_detail.html
+++ b/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 %}
--- a/vrobbler/templates/foods/food_list.html
+++ b/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 %}
--- a/vrobbler/templates/locations/geolocation_detail.html
+++ b/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>
--- a/vrobbler/templates/locations/geolocation_list.html
+++ b/vrobbler/templates/locations/geolocation_list.html
@ -67,13 +67,7 @@
                    </tr>
                </thead>
                <tbody>
-                    {% for location in object_list %}
-                    <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 %}
+                    {% include "_scrobblable_list.html" %}
                </tbody>
            </table>
        </div>
--- a/vrobbler/templates/moods/mood_detail.html
+++ b/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>
--- a/vrobbler/templates/music/album_detail.html
+++ b/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>
--- a/vrobbler/templates/music/artist_detail.html
+++ b/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>
--- a/vrobbler/templates/music/track_detail.html
+++ b/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>
--- a/vrobbler/templates/music/track_list.html
+++ b/vrobbler/templates/music/track_list.html
@ -20,40 +20,7 @@
    <hr />

    <div class="col-md">
-        <div class="table-responsive">
-            <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 class="table-responsive">{% include "_scrobblable_list.html" %}</div>
    </div>
 </div>
 {% endblock %}
--- a/vrobbler/templates/podcasts/podcast_detail.html
+++ b/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 %}
--- a/vrobbler/templates/podcasts/podcast_list.html
+++ b/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 episode in obj.episode_set.all %}
+                    {% for obj in object_list.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 %}
--- a/vrobbler/templates/puzzles/puzzle_detail.html
+++ b/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>
--- a/vrobbler/templates/scrobbles/_last_scrobbles.html
+++ b/vrobbler/templates/scrobbles/_last_scrobbles.html
@ -7,90 +7,142 @@
 </div>
 <div class="row">
    <div class="col-md">
+        <h3><a href="{% url 'music:tracks_list' %}">Tracks</a></h3>
        {% if Track %}
-        <h2>Music</h2>
        {% with scrobbles=Track count=Track_count time=Track_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <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">

+        <h3><a href="{% url 'tasks:task_list' %}">Tasks</a></h3>
        {% if Task %}
-        <h2>Latest tasks</h2>
        {% with scrobbles=Task count=Task_count time=Task_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No tasks today</p>
        {% endif %}

+        <h3><a href="{% url 'videos:video_list' %}">Videos</a></h3>
        {% if Video %}
-        <h2>Videos</h2>
        {% with scrobbles=Video count=Video_count time=Video_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No videos today</p>
        {% endif %}

+        <h3><a href="{% url 'webpages:webpage_list' %}">Web pages</a></h3>
        {% if WebPage %}
-        <h4>Web pages</h4>
        {% with scrobbles=WebPage count=WebPage_count time=WebPage_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else%}
+        <p>No web page read today</p>
        {% endif %}

+        <h3><a href="{% url 'sports:event_list' %}">Sport events</a></h3>
        {% if SportEvent %}
-        <h2>Sports</h2>
        {% with scrobbles=SportEvent count=SportEvent_count time=SportEvent_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No sports today</p>
        {% endif %}

+        <h3><a href="{% url 'podcasts:podcast_list' %}">Podcasts</a></h3>
        {% if PodcastEpisode %}
-        <h2>Latest podcasts</h2>
        {% with scrobbles=PodcastEpisode count=PodcastEpisode_count time=PodcastEpisode_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No podcasts today</p>
        {% endif %}

+        <h3><a href="{% url "videogames:videogame_list" %}">Video games</a></h3>
        {% if VideoGame %}
-        <h4>Video games</h4>
        {% with scrobbles=VideoGame count=VideoGame_count time=VideoGame_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No video games today</p>
        {% endif %}

+        <h3><a href="{% url "boardgames:boardgame_list" %}">Board games</a></h3>
        {% if BoardGame %}
-        <h4>Board games</h4>
        {% with scrobbles=BoardGame count=BoardGame_count time=BoardGame_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <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 %}
+        {% else %}
+        <p>No beer today</p>
        {% endif %}

+        <h3><a href="{% url 'bricksets:brickset_list' %}">Brick sets</a></h3>
        {% if BrickSet %}
-        <h4>Brick sets</h4>
        {% with scrobbles=BrickSet count=BrickSet_count time=BrickSet_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No brick sets today</p>
        {% endif %}

+        <h3><a href="{% url 'puzzles:puzzle_list' %}">Puzzles</a></h3>
        {% if Puzzle %}
-        <h4>Puzzles</h4>
        {% with scrobbles=Puzzle count=Puzzle_count time=Puzzle_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <p>No puzzles today</p>
        {% endif %}

+        <h3><a href="{% url 'books:book_list' %}">Books</a></h3>
        {% if Book %}
-        <h4>Books</h4>
        {% with scrobbles=Book count=Book_count time=Book_time %}
        {% include "scrobbles/_scrobble_table.html" %}
        {% endwith %}
+        {% else %}
+        <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>
--- a/vrobbler/templates/scrobbles/_row.html
+++ b/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 %}
--- a/vrobbler/templates/scrobbles/_scrobble_table.html
+++ b/vrobbler/templates/scrobbles/_scrobble_table.html
@ -4,7 +4,7 @@
 <div class="tab-pane fade show" id="latest-beers" role="tabpanel"
    aria-labelledby="latest-beers-tab">
    <div class="table-responsive">
-        {{count}} scrobble {% if time %}| {{time|natural_duration}}{% endif %}
+        {{count}} scrobble {% if time %}| {{time|natural_duration}}{% endif %}{% if daily_calories %}| {{daily_calories}} calories{% endif %}
        <table class="table table-striped table-sm">
            <thead>
                <tr>
--- a/vrobbler/templates/scrobbles/scrobble_detail.html
+++ b/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>
--- a/vrobbler/templates/scrobbles/scrobble_list.html
+++ b/vrobbler/templates/scrobbles/scrobble_list.html
@ -56,6 +56,14 @@
        <h1 class="h2">{% if date %}{{date|naturaltime}}{% else %}{{title}}{% endif %}</h1>
        <div class="btn-toolbar mb-2 mb-md-0">
            {% if user.is_authenticated %}
+            <div class="btn-group me-2">
+                <form action="/admin/" method="get">
+                    <button type="submit" class="btn btn-sm btn-outline-secondary">
+                        <span data-feather="key"></span>
+                        Admin
+                    </button>
+                </form>
+            </div>
            <div class="btn-group me-2">
                {% if user.profile.lastfm_username and not user.profile.lastfm_auto_import %}
                <form action="{% url 'scrobbles:lastfm-import' %}" method="get">
--- a/vrobbler/templates/sports/sportevent_detail.html
+++ b/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>
--- a/vrobbler/templates/tasks/task_detail.html
+++ b/vrobbler/templates/tasks/task_detail.html
@ -54,7 +54,7 @@
                <thead>
                    <tr>
                        <th scope="col">Date</th>
-                        <th scope="col">Description</th>
+                        <th scope="col">Title</th>
                        <th scope="col">Notes</th>
                        <th scope="col">Source</th>
                    </tr>
@ -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><a href="{{scrobble.get_media_source_url}}">{{scrobble.logdata.description}}</a></td>
+                        <td><a href="{{scrobble.get_media_source_url}}">{{scrobble.logdata.title}}</a></td>
                        <td>{{scrobble.logdata.notes_as_str|safe}}</td>
                        <td>{{scrobble.source}}</td>
                    </tr>
--- a/vrobbler/templates/trails/trail_detail.html
+++ b/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>
--- a/vrobbler/templates/videos/movie_list.html
+++ b/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="table-responsive">
-            <table class="table table-striped table-sm">
-                <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 class="col-md">
+    <div class="table-responsive">{% include "_scrobblable_list.html" %}</div>
+  </div>
 </div>
-{% endblock %}
+{% endblock %}
--- a/vrobbler/templates/videos/series_detail.html
+++ b/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>
--- a/vrobbler/templates/videos/series_list.html
+++ b/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="table-responsive">
-            <table class="table table-striped table-sm">
-                <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 class="col-md">
+    <div class="table-responsive">{% include "_scrobblable_list.html" %}</div>
+  </div>
 </div>
-{% endblock %}
+{% endblock %}
--- a/vrobbler/templates/videos/video_detail.html
+++ b/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>
--- a/vrobbler/templates/videos/video_list.html
+++ b/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 %}
--- a/vrobbler/templates/webpages/webpage_detail.html
+++ b/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>
Author	SHA1	Message	Date
Colin Powell	8c947d35dd	[release] Bump version to 27.0	2025-10-14 11:18:05 -04:00
Colin Powell	61bab1f734	[podcasts] Clean up lookup and creation	2025-10-14 11:17:20 -04:00
Colin Powell	42ce6df9bd	[templates] Small fix to obj title missing	2025-10-14 10:58:54 -04:00
Colin Powell	cbd46df4bc	[scrobbles] Add Food and Geolocation to long play & manual comics	2025-10-14 10:58:31 -04:00
Colin Powell	e7203cdb9b	[podcasts] Add parsing of RSS feed urls	2025-10-14 10:55:09 -04:00
Colin Powell	7246adfeb6	[project] Update and reorganize todos	2025-09-30 09:36:03 -04:00
Colin Powell	a5606951c5	[templates] Fix missing Beer placeholder	2025-09-23 00:43:49 -04:00
Colin Powell	0b4537b7ed	[food] Add calories per day	2025-09-16 15:28:28 -04:00
Colin Powell	6306390f82	[release] 26	2025-09-11 18:58:48 -04:00
Colin Powell	350d3ceb14	[templates] Move moods around	2025-09-11 18:56:34 -04:00
Colin Powell	a1ff82bfec	[templates] Cleaning up templates and datalog forms	2025-09-11 18:55:45 -04:00
Colin Powell	92c0c668b3	[locations] Add locations to dashboard	2025-09-11 18:29:28 -04:00
Colin Powell	3b77feda45	[templates] Add links to scrobbles Ultimately these should probably be templated	2025-09-11 18:03:35 -04:00
Colin Powell	45c402f8c1	[music] Fix bug in generating log data form	2025-09-11 17:57:17 -04:00
Colin Powell	90a1398438	[foods] Adjust fields on food data log	2025-09-11 10:44:48 -04:00
Colin Powell	c7a81802ac	[release] 25.0	2025-09-11 09:45:02 -04:00
Colin Powell	a9a8678ac0	[project] Update toods	2025-09-11 09:43:23 -04:00
Colin Powell	cbf0583871	[foods] Add calories to food model	2025-09-11 09:41:22 -04:00
Colin Powell	5cac1fe109	[templates] Fix food templates and such	2025-09-11 09:41:12 -04:00
Colin Powell	6782ed312d	[templates] Add food to homepage	2025-09-11 09:33:34 -04:00
Colin Powell	fda505ea4e	[scrobbles] Fix calc of elapsed time	2025-09-11 09:33:29 -04:00
Colin Powell	8db111f66f	[food] Fix lookup for food object	2025-09-11 09:27:32 -04:00
Colin Powell	ee1cae496a	[music] Back and forth ... let us not use album name	2025-09-11 09:08:14 -04:00
Colin Powell	9403c68184	[videos] Fix small bug in views	2025-09-11 09:06:07 -04:00
Colin Powell	96030f4a99	[boardgames] Fix expansion checking	2025-09-11 09:05:50 -04:00
Colin Powell	a8c3925af4	[project] Check off another task	2025-08-20 11:40:18 -04:00
Colin Powell	a2f507a976	[videos] Wire up generic video list view	2025-08-20 11:39:27 -04:00
Colin Powell	7a7edc6e47	[templates] Fix some bugs and clean up list views	2025-08-20 11:27:10 -04:00
Colin Powell	af6c39fb85	[templates] Clean up task titles	2025-08-19 12:37:26 -04:00
Colin Powell	36cfdd6f6c	[release] 24.0	2025-08-19 00:57:52 -04:00
Colin Powell	b11d87af75	[logdata] Janky fix to people and platform ids	2025-08-19 00:46:08 -04:00
Colin Powell	1cf50209a4	[bricksets] Add templates	2025-08-18 20:41:16 -04:00
Colin Powell	8a5486fb2c	[templates] Remove sidebar, add dashboard links	2025-08-18 20:28:43 -04:00
Colin Powell	135d6e65fa	[templates] Make vrobbler to go home page	2025-08-17 20:23:02 -04:00
Colin Powell	965f2dd41b	[tasks] Use title, not description	2025-08-17 20:21:08 -04:00