Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-01-22 18:28:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Updated "Recordings""

Browse source 
This reverts commit 820e39dbc7.
This commit is contained in:
Dispatcharr 2025-09-13 08:55:00 -05:00
parent 820e39dbc7
commit c2d135a6db
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/channels/tasks.py
View file

@ -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"

8
core/migrations/0015_dvr_templates.py
View file

@ -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"),
]

4
core/models.py
View file

@ -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):

8
frontend/src/pages/Settings.jsx
View file

@ -484,7 +484,7 @@ const SettingsPage = () => {
<TextInput
label="TV Path Template"
description="Supports {show}, {season}, {episode}, {sub_title}, {channel}, {year}, {start}, {end}. Use format specifiers like {season:02d}. Relative paths are under your library dir."
placeholder="recordings/TV_Shows/{show}/S{season:02d}E{episode:02d}.mkv"
placeholder="Recordings/TV_Shows/{show}/S{season:02d}E{episode:02d}.mkv"
{...form.getInputProps('dvr-tv-template')}
key={form.key('dvr-tv-template')}
id={
@ -497,7 +497,7 @@ const SettingsPage = () => {
<TextInput
label="TV Fallback Template"
description="Template used when an episode has no season/episode. Supports {show}, {start}, {end}, {channel}, {year}."
placeholder="recordings/TV_Shows/{show}/{start}.mkv"
placeholder="Recordings/TV_Shows/{show}/{start}.mkv"
{...form.getInputProps('dvr-tv-fallback-template')}
key={form.key('dvr-tv-fallback-template')}
id={
@ -512,7 +512,7 @@ const SettingsPage = () => {
<TextInput
label="Movie Path Template"
description="Supports {title}, {year}, {channel}, {start}, {end}. Relative paths are under your library dir."
placeholder="recordings/Movies/{title} ({year}).mkv"
placeholder="Recordings/Movies/{title} ({year}).mkv"
{...form.getInputProps('dvr-movie-template')}
key={form.key('dvr-movie-template')}
id={
@ -527,7 +527,7 @@ const SettingsPage = () => {
<TextInput
label="Movie Fallback Template"
description="Template used when movie metadata is incomplete. Supports {start}, {end}, {channel}."
placeholder="recordings/Movies/{start}.mkv"
placeholder="Recordings/Movies/{start}.mkv"
{...form.getInputProps('dvr-movie-fallback-template')}
key={form.key('dvr-movie-fallback-template')}
id={