From: Adam Sutton <dev@adamsutton.me.uk>
Date: Thu, 15 Nov 2012 17:01:44 +0000 (+0000)
Subject: htsp: Provide recording path relative to dvr storage path.
X-Git-Tag: v3.5~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02e95bcd25b62e4dc16268baf0945fd7b4d61e9c;p=thirdparty%2Ftvheadend.git

htsp: Provide recording path relative to dvr storage path.

This can be useful clients to build recording (folder) hierarchy such
as supported by XBMC.
---

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 70418b4a8..34f94d78c 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -510,6 +510,8 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
 {
   htsmsg_t *out = htsmsg_create_map();
   const char *s = NULL, *error = NULL;
+  const char *p;
+  dvr_config_t *cfg;
 
   htsmsg_add_u32(out, "id", de->de_id);
   htsmsg_add_u32(out, "channel", de->de_channel->ch_id);
@@ -522,6 +524,13 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
   if( de->de_desc && (s = lang_str_get(de->de_desc, NULL)))
     htsmsg_add_str(out, "description", s);
 
+  if( de->de_filename && de->de_config_name ) {
+    if ((cfg = dvr_config_find_by_name_default(de->de_config_name))) {
+      if ((p = tvh_strbegins(de->de_filename, cfg->dvr_storage)))
+        htsmsg_add_str(out, "path", p);
+    }
+  }
+
   switch(de->de_sched_state) {
   case DVR_SCHEDULED:
     s = "scheduled";