From c2680b5f0c671cae981241affcf16ca86fe6cbd6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 8 Sep 2014 21:27:59 +0200 Subject: [PATCH] config: Fix the autorec entries migration --- src/config.c | 15 ++++++++++++--- src/dvr/dvr_autorec.c | 1 - 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index 60bc72ee..f16d5da4 100644 --- a/src/config.c +++ b/src/config.c @@ -745,10 +745,11 @@ config_modify_autorec( htsmsg_t *c, uint32_t id, const char *uuid, void *aux ) uint32_t u32; htsmsg_delete_field(c, "index"); if (!htsmsg_get_u32(c, "approx_time", &u32)) { - if (u32 == 0) - u32 = -1; htsmsg_delete_field(c, "approx_time"); - htsmsg_add_u32(c, "start", u32); + if (u32 != 0) + htsmsg_add_u32(c, "start", u32); + else + htsmsg_add_str(c, "start", ""); } if (!htsmsg_get_u32(c, "contenttype", &u32)) { htsmsg_delete_field(c, "contenttype"); @@ -827,6 +828,14 @@ config_migrate_v9 ( void ) } htsmsg_destroy(c); } + + if ((c = hts_settings_load("autorec")) != NULL) { + HTSMSG_FOREACH(f, c) { + if (!(e = htsmsg_field_get_map(f))) continue; + hts_settings_remove("autorec/%s", f->hmf_name); + hts_settings_save(e, "dvr/autorec/%s", f->hmf_name); + } + } } static void diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c index 3e1e3f49..465df1a4 100644 --- a/src/dvr/dvr_autorec.c +++ b/src/dvr/dvr_autorec.c @@ -398,7 +398,6 @@ dvr_autorec_entry_class_time_set(void *o, const void *v, int *tm) const char *s = v; int t; - printf("time set: '%s'\n", (char *)v); if(s == NULL || s[0] == '\0') t = -1; else if(strchr(s, ':') != NULL)