aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schadt <kingdread@gmx.de>2026-01-03 19:42:28 +0100
committerDaniel Schadt <kingdread@gmx.de>2026-01-03 19:42:28 +0100
commite68ecfbb694c714674ddcd72cb727f5662315b5e (patch)
tree4b3520a0025c952b7720c450e5c0a4da88ec8288
parent8268e4e5b4b11471f627a95c09e40e9bb70c4ef6 (diff)
downloadfietsboek-e68ecfbb694c714674ddcd72cb727f5662315b5e.tar.gz
fietsboek-e68ecfbb694c714674ddcd72cb727f5662315b5e.tar.bz2
fietsboek-e68ecfbb694c714674ddcd72cb727f5662315b5e.zip
include journeys in admin storage breakdown
-rw-r--r--fietsboek/locale/de/LC_MESSAGES/messages.mobin20225 -> 20324 bytes
-rw-r--r--fietsboek/locale/de/LC_MESSAGES/messages.po20
-rw-r--r--fietsboek/locale/en/LC_MESSAGES/messages.mobin19048 -> 19139 bytes
-rw-r--r--fietsboek/locale/en/LC_MESSAGES/messages.po20
-rw-r--r--fietsboek/locale/fietslog.pot22
-rw-r--r--fietsboek/templates/admin_overview.jinja26
-rw-r--r--fietsboek/views/admin.py12
7 files changed, 50 insertions, 30 deletions
diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.mo b/fietsboek/locale/de/LC_MESSAGES/messages.mo
index 1514b42..356be25 100644
--- a/fietsboek/locale/de/LC_MESSAGES/messages.mo
+++ b/fietsboek/locale/de/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.po b/fietsboek/locale/de/LC_MESSAGES/messages.po
index 3a05496..9367d28 100644
--- a/fietsboek/locale/de/LC_MESSAGES/messages.po
+++ b/fietsboek/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-12-30 21:16+0100\n"
+"POT-Creation-Date: 2026-01-03 19:25+0100\n"
"PO-Revision-Date: 2022-07-02 17:35+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@@ -220,14 +220,18 @@ msgid "admin.overview.storage_graph.label.images"
msgstr "Bilder"
#: fietsboek/templates/admin_overview.jinja2:58
-msgid "admin.overview.storage_graph.label.previews"
-msgstr "Vorschaubilder"
+msgid "admin.overview.storage_graph.label.track_previews"
+msgstr "Streckenvoransichten"
#: fietsboek/templates/admin_overview.jinja2:59
+msgid "admin.overview.storage_graph.label.journey_previews"
+msgstr "Reisenvoransichten"
+
+#: fietsboek/templates/admin_overview.jinja2:60
msgid "admin.overview.storage_graph.label.user_maps"
msgstr "Nutzerkarten"
-#: fietsboek/templates/admin_overview.jinja2:86
+#: fietsboek/templates/admin_overview.jinja2:88
msgid "admin.overview.storage_graph.title"
msgstr "Speicherübersicht"
@@ -1174,15 +1178,15 @@ msgstr "Ungültige E-Mail-Adresse"
msgid "flash.a_confirmation_link_has_been_sent"
msgstr "Ein Bestätigungslink wurde versandt"
-#: fietsboek/views/admin.py:183
+#: fietsboek/views/admin.py:189
msgid "flash.badge_added"
msgstr "Wappen hinzugefügt"
-#: fietsboek/views/admin.py:207
+#: fietsboek/views/admin.py:213
msgid "flash.badge_modified"
msgstr "Wappen bearbeitet"
-#: fietsboek/views/admin.py:227
+#: fietsboek/views/admin.py:233
msgid "flash.badge_deleted"
msgstr "Wappen gelöscht"
@@ -1250,7 +1254,7 @@ msgstr "Strecke gelöscht"
msgid "flash.invalid_file"
msgstr "Ungültige GPX-Datei gesendet"
-#: fietsboek/views/journey.py:212
+#: fietsboek/views/journey.py:251
msgid "flash.journey_deleted"
msgstr "Reise gelöscht"
diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.mo b/fietsboek/locale/en/LC_MESSAGES/messages.mo
index 64e9925..f4b7bbf 100644
--- a/fietsboek/locale/en/LC_MESSAGES/messages.mo
+++ b/fietsboek/locale/en/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.po b/fietsboek/locale/en/LC_MESSAGES/messages.po
index 314fc4f..d52960b 100644
--- a/fietsboek/locale/en/LC_MESSAGES/messages.po
+++ b/fietsboek/locale/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-12-30 21:16+0100\n"
+"POT-Creation-Date: 2026-01-03 19:25+0100\n"
"PO-Revision-Date: 2023-04-03 20:42+0200\n"
"Last-Translator: \n"
"Language: en\n"
@@ -220,14 +220,18 @@ msgid "admin.overview.storage_graph.label.images"
msgstr "Images"
#: fietsboek/templates/admin_overview.jinja2:58
-msgid "admin.overview.storage_graph.label.previews"
-msgstr "Preview images"
+msgid "admin.overview.storage_graph.label.track_previews"
+msgstr "Track previews"
#: fietsboek/templates/admin_overview.jinja2:59
+msgid "admin.overview.storage_graph.label.journey_previews"
+msgstr "Journey previews"
+
+#: fietsboek/templates/admin_overview.jinja2:60
msgid "admin.overview.storage_graph.label.user_maps"
msgstr "User maps"
-#: fietsboek/templates/admin_overview.jinja2:86
+#: fietsboek/templates/admin_overview.jinja2:88
msgid "admin.overview.storage_graph.title"
msgstr "Storage breakdown"
@@ -1164,15 +1168,15 @@ msgstr "Invalid email"
msgid "flash.a_confirmation_link_has_been_sent"
msgstr "A confirmation link has been sent"
-#: fietsboek/views/admin.py:183
+#: fietsboek/views/admin.py:189
msgid "flash.badge_added"
msgstr "Badge has been added"
-#: fietsboek/views/admin.py:207
+#: fietsboek/views/admin.py:213
msgid "flash.badge_modified"
msgstr "Badge has been modified"
-#: fietsboek/views/admin.py:227
+#: fietsboek/views/admin.py:233
msgid "flash.badge_deleted"
msgstr "Badge has been deleted"
@@ -1239,7 +1243,7 @@ msgstr "Track has been deleted"
msgid "flash.invalid_file"
msgstr "Invalid GPX file selected"
-#: fietsboek/views/journey.py:212
+#: fietsboek/views/journey.py:251
msgid "flash.journey_deleted"
msgstr "Journey has been deleted"
diff --git a/fietsboek/locale/fietslog.pot b/fietsboek/locale/fietslog.pot
index 174a7ea..50a43a0 100644
--- a/fietsboek/locale/fietslog.pot
+++ b/fietsboek/locale/fietslog.pot
@@ -1,14 +1,14 @@
# Translations template for PROJECT.
-# Copyright (C) 2025 ORGANIZATION
+# Copyright (C) 2026 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2026.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-12-30 21:16+0100\n"
+"POT-Creation-Date: 2026-01-03 19:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -214,14 +214,18 @@ msgid "admin.overview.storage_graph.label.images"
msgstr ""
#: fietsboek/templates/admin_overview.jinja2:58
-msgid "admin.overview.storage_graph.label.previews"
+msgid "admin.overview.storage_graph.label.track_previews"
msgstr ""
#: fietsboek/templates/admin_overview.jinja2:59
+msgid "admin.overview.storage_graph.label.journey_previews"
+msgstr ""
+
+#: fietsboek/templates/admin_overview.jinja2:60
msgid "admin.overview.storage_graph.label.user_maps"
msgstr ""
-#: fietsboek/templates/admin_overview.jinja2:86
+#: fietsboek/templates/admin_overview.jinja2:88
msgid "admin.overview.storage_graph.title"
msgstr ""
@@ -1150,15 +1154,15 @@ msgstr ""
msgid "flash.a_confirmation_link_has_been_sent"
msgstr ""
-#: fietsboek/views/admin.py:183
+#: fietsboek/views/admin.py:189
msgid "flash.badge_added"
msgstr ""
-#: fietsboek/views/admin.py:207
+#: fietsboek/views/admin.py:213
msgid "flash.badge_modified"
msgstr ""
-#: fietsboek/views/admin.py:227
+#: fietsboek/views/admin.py:233
msgid "flash.badge_deleted"
msgstr ""
@@ -1222,7 +1226,7 @@ msgstr ""
msgid "flash.invalid_file"
msgstr ""
-#: fietsboek/views/journey.py:212
+#: fietsboek/views/journey.py:251
msgid "flash.journey_deleted"
msgstr ""
diff --git a/fietsboek/templates/admin_overview.jinja2 b/fietsboek/templates/admin_overview.jinja2
index e93e997..fbb626b 100644
--- a/fietsboek/templates/admin_overview.jinja2
+++ b/fietsboek/templates/admin_overview.jinja2
@@ -55,7 +55,8 @@
{{ _("admin.overview.storage_graph.label.track_data") | tojson }},
{{ _("admin.overview.storage_graph.label.backups") | tojson }},
{{ _("admin.overview.storage_graph.label.images") | tojson }},
- {{ _("admin.overview.storage_graph.label.previews") | tojson }},
+ {{ _("admin.overview.storage_graph.label.track_previews") | tojson }},
+ {{ _("admin.overview.storage_graph.label.journey_previews") | tojson }},
{{ _("admin.overview.storage_graph.label.user_maps") | tojson }}
],
datasets: [
@@ -65,7 +66,8 @@
{{ (size_breakdown.track_data / 1024 / 1024) | tojson }},
{{ (size_breakdown.backups / 1024 / 1024) | tojson }},
{{ (size_breakdown.image_files / 1024 / 1024) | tojson }},
- {{ (size_breakdown.preview_files / 1024 / 1024) | tojson }},
+ {{ (size_breakdown.track_previews / 1024 / 1024) | tojson }},
+ {{ (size_breakdown.journey_previews / 1024 / 1024) | tojson }},
{{ (size_breakdown.user_maps / 1024 / 1024) | tojson }}
]
}
diff --git a/fietsboek/views/admin.py b/fietsboek/views/admin.py
index 0442a32..f0aa271 100644
--- a/fietsboek/views/admin.py
+++ b/fietsboek/views/admin.py
@@ -13,6 +13,7 @@ from pyramid.view import view_config
from sqlalchemy import func, select, text
from .. import models, util
+from ..data import DataManager
GOOD_CRON_THRESHOLD = datetime.timedelta(hours=1)
@@ -36,11 +37,12 @@ class SizeBreakdown:
track_data: int = 0
backups: int = 0
image_files: int = 0
- preview_files: int = 0
+ track_previews: int = 0
+ journey_previews: int = 0
user_maps: int = 0
-def _get_size_breakdown(dbsession, data_manager):
+def _get_size_breakdown(dbsession, data_manager: DataManager):
breakdown = SizeBreakdown()
dialect = dbsession.bind.dialect.name
@@ -56,7 +58,7 @@ def _get_size_breakdown(dbsession, data_manager):
for track_id in data_manager.list_tracks():
track = data_manager.open(track_id)
breakdown.backups += _safe_size(track.backup_path())
- breakdown.preview_files += _safe_size(track.preview_path())
+ breakdown.track_previews += _safe_size(track.preview_path())
for image_id in track.images():
breakdown.image_files += _safe_size(track.image_path(image_id))
@@ -65,6 +67,10 @@ def _get_size_breakdown(dbsession, data_manager):
breakdown.user_maps += _safe_size(user.heatmap_path())
breakdown.user_maps += _safe_size(user.tilehunt_path())
+ for journey_id in data_manager.list_journeys():
+ journey = data_manager.open_journey(journey_id)
+ breakdown.journey_previews += _safe_size(journey.preview_path())
+
return breakdown