DVR: add modifier (content type) for filename, fixes #3517

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 53852d64afd965da0917e865d633f8611a5e549c..0662ce3ae6400bbc6baba1e8f556c4725b23e98c 100644 (file)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -331,6 +331,22 @@ dvr_sub_channel(const char *id, const void *aux, char *tmp, size_t tmplen)
   return dvr_do_prefix(id, DVR_CH_NAME((dvr_entry_t *)aux), tmp, tmplen);
 }
 
+static const char *
+dvr_sub_genre(const char *id, const void *aux, char *tmp, size_t tmplen)
+{
+  const dvr_entry_t *de = aux;
+  epg_genre_t *genre;
+  char buf[64];
+
+  if (de->de_bcast == NULL || de->de_bcast->episode == NULL)
+    return "";
+  genre = LIST_FIRST(&de->de_bcast->episode->genre);
+  if (!genre || !genre->code)
+    return "";
+  epg_genre_get_str(genre, 0, 1, buf, sizeof(buf), "en");
+  return dvr_do_prefix(id, buf, tmp, tmplen);
+}
+
 static const char *
 dvr_sub_owner(const char *id, const void *aux, char *tmp, size_t tmplen)
 {
@@ -410,6 +426,13 @@ static htsstr_substitute_t dvr_subs_entry[] = {
   { .id = ".c", .getval = dvr_sub_channel },
   { .id = ",c", .getval = dvr_sub_channel },
   { .id = ";c", .getval = dvr_sub_channel },
+  { .id = "g",  .getval = dvr_sub_genre },
+  { .id = " g", .getval = dvr_sub_genre },
+  { .id = "-g", .getval = dvr_sub_genre },
+  { .id = "_g", .getval = dvr_sub_genre },
+  { .id = ".g", .getval = dvr_sub_genre },
+  { .id = ",g", .getval = dvr_sub_genre },
+  { .id = ";g", .getval = dvr_sub_genre },
   { .id = NULL, .getval = NULL }
 };
 
@@ -1481,7 +1504,7 @@ fin:
 void
 dvr_spawn_postcmd(dvr_entry_t *de, const char *postcmd, const char *filename)
 {
-  char buf1[2048], *buf2;
+  char buf1[MAX(PATH_MAX, 2048)], *buf2;
   char tmp[MAX(PATH_MAX, 512)];
   htsmsg_t *info, *e;
   htsmsg_field_t *f;