From c2d135a6dbb9c1544d95271d234de342d71f49ba Mon Sep 17 00:00:00 2001 From: Dispatcharr Date: Sat, 13 Sep 2025 08:55:00 -0500 Subject: [PATCH] Revert "Updated "Recordings"" This reverts commit 820e39dbc7de22be84a4ad1c9fa40fde5a6a041f. --- apps/channels/tasks.py | 2 +- core/migrations/0015_dvr_templates.py | 8 ++++---- core/models.py | 4 ++-- frontend/src/pages/Settings.jsx | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/channels/tasks.py b/apps/channels/tasks.py index 32b945f9..21ac455c 100755 --- a/apps/channels/tasks.py +++ b/apps/channels/tasks.py @@ -631,7 +631,7 @@ def _build_output_paths(channel, program, start_time, end_time): # As a last resort for TV if not is_movie and not rel_path: rel_path = f"TV_Shows/{show}/S{season:02d}E{episode:02d}.mkv" - # Keep any leading folder like 'recordings/' from the template so users can + # Keep any leading folder like 'Recordings/' from the template so users can # structure their library under /data as desired. if not rel_path.lower().endswith('.mkv'): rel_path = f"{rel_path}.mkv" diff --git a/core/migrations/0015_dvr_templates.py b/core/migrations/0015_dvr_templates.py index 45cc2d72..130a80d4 100644 --- a/core/migrations/0015_dvr_templates.py +++ b/core/migrations/0015_dvr_templates.py @@ -8,10 +8,10 @@ def add_dvr_defaults(apps, schema_editor): CoreSettings = apps.get_model("core", "CoreSettings") defaults = [ - (slugify("DVR TV Template"), "DVR TV Template", "recordings/TV_Shows/{show}/S{season:02d}E{episode:02d}.mkv"), - (slugify("DVR Movie Template"), "DVR Movie Template", "recordings/Movies/{title} ({year}).mkv"), - (slugify("DVR TV Fallback Template"), "DVR TV Fallback Template", "recordings/TV_Shows/{show}/{start}.mkv"), - (slugify("DVR Movie Fallback Template"), "DVR Movie Fallback Template", "recordings/Movies/{start}.mkv"), + (slugify("DVR TV Template"), "DVR TV Template", "Recordings/TV_Shows/{show}/S{season:02d}E{episode:02d}.mkv"), + (slugify("DVR Movie Template"), "DVR Movie Template", "Recordings/Movies/{title} ({year}).mkv"), + (slugify("DVR TV Fallback Template"), "DVR TV Fallback Template", "Recordings/TV_Shows/{show}/{start}.mkv"), + (slugify("DVR Movie Fallback Template"), "DVR Movie Fallback Template", "Recordings/Movies/{start}.mkv"), (slugify("DVR Comskip Enabled"), "DVR Comskip Enabled", "false"), ] diff --git a/core/models.py b/core/models.py index 4c237f1c..f9d49f7b 100644 --- a/core/models.py +++ b/core/models.py @@ -255,7 +255,7 @@ class CoreSettings(models.Model): return cls.objects.get(key=DVR_TV_FALLBACK_TEMPLATE_KEY).value except cls.DoesNotExist: # default requested by user - return "recordings/TV_Shows/{show}/{start}.mkv" + return "Recordings/TV_Shows/{show}/{start}.mkv" @classmethod def get_dvr_movie_fallback_template(cls): @@ -263,7 +263,7 @@ class CoreSettings(models.Model): try: return cls.objects.get(key=DVR_MOVIE_FALLBACK_TEMPLATE_KEY).value except cls.DoesNotExist: - return "recordings/Movies/{start}.mkv" + return "Recordings/Movies/{start}.mkv" @classmethod def get_dvr_comskip_enabled(cls): diff --git a/frontend/src/pages/Settings.jsx b/frontend/src/pages/Settings.jsx index 951f311f..1768c640 100644 --- a/frontend/src/pages/Settings.jsx +++ b/frontend/src/pages/Settings.jsx @@ -484,7 +484,7 @@ const SettingsPage = () => { { { {