api: include access to the service mapper

Makefile

@@ -112,6 +112,7 @@ SRCS =  src/version.c \
 SRCS += \
 	src/api.c \
 	src/api/api_idnode.c \
+	src/api/api_service.c \
 	src/api/api_mpegts.c \
 
 SRCS += \

src/api.c

@@ -117,4 +117,5 @@ void api_init ( void )
   /* Subsystems */
   api_idnode_init();
   api_mpegts_init();
+  api_service_init();
 }

src/api.h

@@ -55,9 +55,10 @@ int  api_exec ( const char *subsystem, htsmsg_t *args, htsmsg_t **resp );
 /*
  * Initialise
  */
-void api_init        ( void );
-void api_idnode_init ( void );
-void api_mpegts_init ( void );
+void api_init         ( void );
+void api_idnode_init  ( void );
+void api_mpegts_init  ( void );
+void api_service_init ( void );
 
 /*
  * IDnode

src/api/api_service.c

@@ -0,0 +1,89 @@
+/*
+ *  API - service related calls
+ *
+ *  Copyright (C) 2013 Adam Sutton
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TVH_API_SERVICE_H__
+#define __TVH_API_SERVICE_H__
+
+#include "tvheadend.h"
+#include "service_mapper.h"
+#include "access.h"
+#include "api.h"
+
+static int
+api_mapper_start
+  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  service_mapper_conf_t conf = { 0 };
+#define get_u32(x)\
+  conf.x = htsmsg_get_u32_or_default(args, #x, 0)
+  
+  /* Get config */
+  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);
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+static int
+api_mapper_stop
+  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  pthread_mutex_lock(&global_lock);
+  service_mapper_stop();
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+static int
+api_mapper_status
+  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  int num;
+
+  pthread_mutex_lock(&global_lock);
+  num = service_mapper_qlen();
+  pthread_mutex_unlock(&global_lock);
+  
+  *resp = htsmsg_create_map();
+  htsmsg_add_u32(*resp, "remain", num);
+  
+  return 0;
+}
+
+void api_service_init ( void )
+{
+  static api_hook_t ah[] = {
+    { "service/mapper/start",   ACCESS_ADMIN, api_mapper_start,  NULL },
+    { "service/mapper/stop",    ACCESS_ADMIN, api_mapper_stop,   NULL },
+    { "service/mapper/status",  ACCESS_ADMIN, api_mapper_status, NULL },
+    { NULL },
+  };
+
+  api_register_all(ah);
+}
+
+
+#endif /* __TVH_API_IDNODE_H__ */

src/webui/static/app/chconf.js

@@ -90,8 +90,7 @@ tvheadend.mapServices = function()
     tooltip : 'Begin mapping',
     handler : function () {
       panel.getForm().submit({
-        url         : 'api/service_mapping',
-        params      : { op: 'start' },
+        url         : 'api/service/mapper/start',
         waitMessage : 'Mapping services...'
       });
     }