From: E.Smith <31170571+azlm8t@users.noreply.github.com>
Date: Wed, 20 Sep 2017 11:19:42 +0000 (+0100)
Subject: dvr: Persist programme copyright year to dvr log. (#4441).
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab89644cf2c533b49cacac9686f4bff15e33bebd;p=thirdparty%2Ftvheadend.git

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 26246e630..f6dd2d080 100644
--- 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 7d401e0ff..bbf8a9475 100644
--- 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 ab14cc37d..ac68e13b5 100644
--- 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) {