From: E.Smith <31170571+azlm8t@users.noreply.github.com>
Date: Sat, 22 Sep 2018 11:51:35 +0000 (+0100)
Subject: xmltv: Add episode number information to exported xmltv guide. (#4266)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c198e0fffc065038b447a6957832730251dc69e;p=thirdparty%2Ftvheadend.git

xmltv: Add episode number information to exported xmltv guide. (#4266)

This assumes that the imported tv guide has correct populated
the fields, rather than using an arbitrary scheme.

Issue: #4266
---

diff --git a/src/webui/xmltv.c b/src/webui/xmltv.c
index 9117b2382..f3e5ca277 100644
--- a/src/webui/xmltv.c
+++ b/src/webui/xmltv.c
@@ -98,6 +98,17 @@ _http_xmltv_programme_write_string_list(htsbuf_queue_t *hq, const string_list_t*
   }
 }
 
+static void
+_http_xmltv_add_episode_num(htsbuf_queue_t *hq, uint16_t num, uint16_t cnt)
+{
+  /* xmltv numbers are zero-based not one-based, however the xmltv
+   * counts are one-based.
+   */
+  if (num) htsbuf_qprintf(hq, "%d", num - 1);
+  htsbuf_append_str(hq, "/");
+  if (cnt) htsbuf_qprintf(hq, "%d", cnt);
+}
+
 /*
  *
  */
@@ -105,6 +116,7 @@ static void
 http_xmltv_programme_one(htsbuf_queue_t *hq, const char *hostpath,
                          channel_t *ch, epg_broadcast_t *ebc)
 {
+  epg_episode_num_t epnum;
   char start[32], stop[32], ubuf[UUID_HEX_SIZE];
   lang_str_ele_t *lse;
 
@@ -148,6 +160,20 @@ http_xmltv_programme_one(htsbuf_queue_t *hq, const char *hostpath,
   }
   _http_xmltv_programme_write_string_list(hq, ebc->category, "category");
   _http_xmltv_programme_write_string_list(hq, ebc->keyword, "keyword");
+
+  /* We can't use epg_broadcast_epnumber_format since we need a specific
+   * format whereas that can return an arbitrary text string.
+   */
+  epg_broadcast_get_epnum(ebc, &epnum);
+  if (epnum.s_num || epnum.e_num || epnum.p_num) {
+    htsbuf_append_str(hq, "  <episode-num system=\"xmltv-ns\">");
+    _http_xmltv_add_episode_num(hq, epnum.s_num, epnum.s_cnt);
+    htsbuf_append_str(hq," . ");
+    _http_xmltv_add_episode_num(hq, epnum.e_num, epnum.e_cnt);
+    htsbuf_append_str(hq," . ");
+    _http_xmltv_add_episode_num(hq, epnum.p_num, epnum.p_cnt);
+    htsbuf_append_str(hq, "  </episode-num>");
+  }
   htsbuf_append_str(hq, "</programme>\n");
 }