config: Fix the autorec entries migration

tvheadend · Sep 8, 2014 · c2680b5 · c2680b5 · ksooo · Sep 8, 2014
1 parent 4c01042
commit c2680b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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)