stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

config: Fix the autorec entries migration

Browse source
This commit is contained in:
Jaroslav Kysela 2014-09-08 21:27:59 +02:00
parent 4c01042b58
commit c2680b5f0c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/config.c
View file

@ -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

1
src/dvr/dvr_autorec.c
View file

@ -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)