service mapper: make it possible to select services to map

Also fixed some bugs that caused the mapping to fail and/or do the wrong
thing.

diff --git a/src/api/api_service.c b/src/api/api_service.c
index 2f60553482713603c7bb321a019c23838df7841f..eca273e7f2c4b6c9130a12f5168fe9667e3bdd51 100644 (file)
--- a/src/api/api_service.c
+++ b/src/api/api_service.c
@@ -31,17 +31,19 @@ api_mapper_start
   ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   service_mapper_conf_t conf = { 0 };
+  htsmsg_t *uuids;
 #define get_u32(x)\
-  conf.x = htsmsg_get_u32_or_default(args, #x, 0)
+  conf.x = htsmsg_get_bool_or_default(args, #x, 0)
   
   /* Get config */
+  uuids = htsmsg_get_list(args, "uuids");
   get_u32(check_availability);
   get_u32(encrypted);
   get_u32(merge_same_name);
   get_u32(provider_tags);
   
   pthread_mutex_lock(&global_lock);
-  service_mapper_start(&conf);
+  service_mapper_start(&conf, uuids);
   pthread_mutex_unlock(&global_lock);
 
   return 0;

diff --git a/src/service_mapper.c b/src/service_mapper.c
index b73aa71da0740a87b08cff07fc31e747c168919e..e52451c361a68f6e1ec0fa12f010afc1d56f35ff 100644 (file)
--- a/src/service_mapper.c
+++ b/src/service_mapper.c
@@ -68,7 +68,7 @@ service_mapper_qlen ( void )
  * Start a new mapping
  */
 void
-service_mapper_start ( const service_mapper_conf_t *conf )
+service_mapper_start ( const service_mapper_conf_t *conf, htsmsg_t *uuids )
 {
   int e, tr, qd = 0;
   service_t *s;
@@ -78,6 +78,16 @@ service_mapper_start ( const service_mapper_conf_t *conf )
 
   /* Check each service */
   TAILQ_FOREACH(s, &service_all, s_all_link) {
+    if (uuids) {
+      htsmsg_field_t *f;
+      const char *str;
+      const char *uuid = idnode_uuid_as_str(&s->s_id);
+      HTSMSG_FOREACH(f, uuids) {
+        if (!(str = htsmsg_field_get_str(f))) continue;
+        if (!strcmp(str, uuid)) break;
+      }
+      if (!f) continue;
+    }
 
     /* Disabled */
     if (!s->s_is_enabled(s)) continue;
@@ -162,8 +172,8 @@ service_mapper_link ( service_t *s, channel_t *c )
   csm = calloc(1, sizeof(channel_service_mapping_t));
   csm->csm_chn = c;
   csm->csm_svc = s;
-  LIST_INSERT_HEAD(&s->s_channels, csm, csm_svc_link);
-  LIST_INSERT_HEAD(&c->ch_services, csm, csm_chn_link);
+  LIST_INSERT_HEAD(&s->s_channels,  csm, csm_chn_link);
+  LIST_INSERT_HEAD(&c->ch_services, csm, csm_svc_link);
   return 1;
 }
 
@@ -202,10 +212,8 @@ service_mapper_process ( service_t *s )
 
   /* Find existing channel */
   num = s->s_channel_number(s);
-#if 0
-  if (service_mapper_conf.merge_same_name)
-    chn = channel_find_by_name(s->s_channel_name(s));
-#endif
+  if (service_mapper_conf.merge_same_name && s->s_channel_name)
+    chn = channel_find_by_name(s->s_channel_name(s) ?: "");
   if (!chn)
     chn = channel_create(NULL, NULL, s->s_channel_name(s));
     

diff --git a/src/service_mapper.h b/src/service_mapper.h
index e30a5be1c0a86a635533ef85945b5b3fb0d3c7ce..3d4941f0ba934978dfbe258cc67fcd03e70ebe2f 100644 (file)
--- a/src/service_mapper.h
+++ b/src/service_mapper.h
@@ -30,7 +30,8 @@ typedef struct service_mapper_conf
 void service_mapper_init   ( void );
 
 // Start new mapping
-void service_mapper_start  ( const service_mapper_conf_t *conf );
+void service_mapper_start  
+  ( const service_mapper_conf_t *conf, htsmsg_t *uuids );
 
 // Stop pending services (remove from Q)
 void service_mapper_stop   ( void );