From 2f830922f51b6dc7feaf291a5411dcecda023935 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sun, 15 Feb 2015 22:12:36 +0100 Subject: [PATCH] use iso format for date in default timerec title as local date format often conflicts with sorting/playback order also update documentation with pointers to escape-code documentation --- docs/html/dvr_timerec.html | 13 +++++++++---- src/dvr/dvr_timerec.c | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/html/dvr_timerec.html b/docs/html/dvr_timerec.html index 083e76bbe..586df5478 100644 --- a/docs/html/dvr_timerec.html +++ b/docs/html/dvr_timerec.html @@ -56,14 +56,19 @@ When specified, this setting overrides the subdirectory rules specified by the D

Title
-Not sure how this differs from **Name* * +The title is used in the filename that is created for the recording

-The default format string suggests Time-[date]-[time]: +The default format string suggests Time-[date]_[time]:

-%x The local date, formatted according to your locale settings -%R The time in HH;MM format +The escape-codes use strftime format. Examples: +
+%F The date in ISO-format (e.g. 2015-02-28) +
+%R The time in 24h HH:MM format (e.g. 19:45) +
+%x The date, formatted according to your locale settings

Channel
diff --git a/src/dvr/dvr_timerec.c b/src/dvr/dvr_timerec.c index 619c7826f..20c80e7f4 100644 --- a/src/dvr/dvr_timerec.c +++ b/src/dvr/dvr_timerec.c @@ -183,7 +183,7 @@ dvr_timerec_create(const char *uuid, htsmsg_t *conf) return NULL; } - dte->dte_title = strdup("Time-%x-%R"); + dte->dte_title = strdup("Time-%F_%R"); dte->dte_weekdays = 0x7f; dte->dte_pri = DVR_PRIO_NORMAL; dte->dte_start = -1; @@ -557,7 +557,7 @@ const idclass_t dvr_timerec_entry_class = { .id = "title", .name = "Title", .off = offsetof(dvr_timerec_entry_t, dte_title), - .def.s = "Time-%x-%R", + .def.s = "Time-%F_%R", }, { .type = PT_STR, -- 2.47.3