dvr: Persist programme copyright year to dvr log. (#4441).

Also send to htsp.

diff --git a/src/dvr/dvr.h b/src/dvr/dvr.h
index 26246e630d800b0891552696f9f8cf9ccc7b38b4..f6dd2d0803605841c371bcf7f48d509eb735e0b4 100644 (file)
--- a/src/dvr/dvr.h
+++ b/src/dvr/dvr.h
@@ -210,7 +210,7 @@ typedef struct dvr_entry {
   lang_str_t *de_subtitle;   /* Subtitle in UTF-8 (from EPG) */
   lang_str_t *de_desc;       /* Description in UTF-8 (from EPG) */
   uint32_t de_content_type;  /* Content type (from EPG) (only code) */
-
+  uint16_t de_copyright_year; /* Copyright year (from EPG) */
   uint16_t de_dvb_eid;
 
   int de_pri;

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 7d401e0ffe2f4da8042aa5e511c5834dc7e5c4a5..bbf8a947579b52adf2239ad972658d7c39e5ae4b 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -988,6 +988,8 @@ dvr_entry_create_(int enabled, const char *config_uuid, epg_broadcast_t *e,
       lang_str_serialize(e->episode->summary, conf, "description");
     if (e->episode && (s = dvr_entry_get_episode(e, tbuf, sizeof(tbuf))))
       htsmsg_add_str(conf, "episode", s);
+    if (e->episode && e->episode->copyright_year)
+      htsmsg_add_u32(conf, "copyright_year", e->episode->copyright_year);
   } else if (title) {
     l = lang_str_create();
     lang_str_add(l, title, lang, 0);
@@ -3529,6 +3531,14 @@ const idclass_t dvr_entry_class = {
       .off      = offsetof(dvr_entry_t, de_content_type),
       .opts     = PO_RDONLY | PO_SORTKEY,
     },
+    {
+      .type     = PT_U16,
+      .id       = "copyright_year",
+      .name     = N_("The copyright year of the program."),
+      .desc     = N_("The copyright year of the program."),
+      .off      = offsetof(dvr_entry_t, de_copyright_year),
+      .opts     = PO_RDONLY | PO_EXPERT,
+    },
     {
       .type     = PT_U32,
       .id       = "broadcast",

diff --git a/src/htsp_server.c b/src/htsp_server.c
index ab14cc37d62ed5e28af8788e6c00c853b18713d2..ac68e13b5f63b7638b58cb3cec6e3d03fdda8667 100644 (file)
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -997,6 +997,8 @@ htsp_build_dvrentry(htsp_connection_t *htsp, dvr_entry_t *de, const char *method
       htsmsg_add_str(out, "creator", de->de_creator);
     if(de->de_comment)
       htsmsg_add_str(out, "comment", de->de_comment);
+    if (de->de_copyright_year)
+      htsmsg_add_u32(out, "copyrightYear", de->de_copyright_year);
 
     last = NULL;
     if (!htsmsg_is_empty(de->de_files) && de->de_config) {