From fcc97df55c8cd1490c5b3bf2806707f9e500156a Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Sat, 30 Nov 2013 14:38:19 +0000 Subject: [PATCH] epggrab: fix configuration issues --- src/epggrab/module.c | 7 ++++++- src/epggrab/module/xmltv.c | 2 +- src/webui/static/app/epggrab.js | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/epggrab/module.c b/src/epggrab/module.c index b8f6d526..a1112d73 100644 --- a/src/epggrab/module.c +++ b/src/epggrab/module.c @@ -56,7 +56,12 @@ htsmsg_t *epggrab_module_list ( void ) LIST_FOREACH(m, &epggrab_modules, link) { e = htsmsg_create_map(); htsmsg_add_str(e, "id", m->id); - htsmsg_add_u32(e, "type", m->type); + if (m->type == EPGGRAB_INT) + htsmsg_add_str(e, "type", "internal"); + else if (m->type == EPGGRAB_EXT) + htsmsg_add_str(e, "type", "external"); + else + htsmsg_add_str(e, "type", "ota"); htsmsg_add_u32(e, "enabled", m->enabled); if(m->name) htsmsg_add_str(e, "name", m->name); diff --git a/src/epggrab/module/xmltv.c b/src/epggrab/module/xmltv.c index ed662807..944adb35 100755 --- a/src/epggrab/module/xmltv.c +++ b/src/epggrab/module/xmltv.c @@ -709,7 +709,7 @@ static void _xmltv_load_grabbers ( void ) /* Internal search */ } else if ((tmp = getenv("PATH"))) { - tvhlog(LOG_DEBUG, "epggrab", "using internal grab search"); + tvhdebug("epggrab", "using internal grab search"); char bin[256]; char desc[] = "--description"; char *argv[] = { diff --git a/src/webui/static/app/epggrab.js b/src/webui/static/app/epggrab.js index e8fc3738..ad8f8088 100644 --- a/src/webui/static/app/epggrab.js +++ b/src/webui/static/app/epggrab.js @@ -17,9 +17,9 @@ tvheadend.epggrab = function() { /* * Module lists (I'm sure there is a better way!) */ - var EPGGRAB_MODULE_INTERNAL = 0; - var EPGGRAB_MODULE_EXTERNAL = 1; - var EPGGRAB_MODULE_OTA = 2; + var EPGGRAB_MODULE_INTERNAL = "internal"; + var EPGGRAB_MODULE_EXTERNAL = "external"; + var EPGGRAB_MODULE_OTA = "ota"; var moduleStore = new Ext.data.JsonStore({ root : 'entries',