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

config: fix problems with config migration (fixes #2035, #2023)

Browse source
This commit is contained in:
Adam Sutton 2014-04-07 16:36:53 +01:00
parent 89e1b97a92
commit bba7572d19
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/config.c
View file

@ -480,19 +480,52 @@ static void
config_migrate_v3 ( void )
{
char src[1024], dst[1024];
hts_settings_buildpath(src, sizeof(src), "input/linuxdvb/networks");
/* Due to having to potentially run this twice! */
hts_settings_buildpath(dst, sizeof(dst), "input/dvb/networks");
if (!access(dst, R_OK | W_OK))
return;
hts_settings_makedirs(dst);
hts_settings_buildpath(src, sizeof(src), "input/linuxdvb/networks");
rename(src, dst);
}
/*
* v3 -> v4 : fix broken DVB network / mux files
*/
static void
config_migrate_v5 ( void )
{
htsmsg_t *c, *e;
htsmsg_field_t *f;
const char *str;
/* Remove linux prefix from class */
if ((c = hts_settings_load_r(1, "input/dvb/networks"))) {
HTSMSG_FOREACH(f, c) {
if (!(e = htsmsg_field_get_map(f))) continue;
if (!(e = htsmsg_get_map(e, "config"))) continue;
if (!(str = htsmsg_get_str(e, "class"))) continue;
if (!strncmp(str, "linux", 5)) {
str = strdupa(str+5);
htsmsg_delete_field(e, "class");
htsmsg_add_str(e, "class", str);
hts_settings_save(e, "input/dvb/networks/%s/config", f->hmf_name);
}
}
}
}
/*
* Migration table
*/
static const config_migrate_t config_migrate_table[] = {
config_migrate_v1,
config_migrate_v2,
config_migrate_v3
config_migrate_v3,
config_migrate_v3, // Re-run due to bug in previous version of function
config_migrate_v5
};
/*