Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
DVR: Fix sorting for lists (like channel, config profile etc..)
  • Loading branch information
@perexg
perexg committed Sep 21, 2014
1 parent dff536a commit 616e774
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 18 deletions.
31 changes: 31 additions & 0 deletions src/dvr/dvr_autorec.c
View file
Expand Up @@ -390,6 +390,15 @@ dvr_autorec_entry_class_channel_get(void *o)
return &ret;
}

static char *
dvr_autorec_entry_class_channel_rend(void *o)
{
dvr_autorec_entry_t *dae = (dvr_autorec_entry_t *)o;
if (dae->dae_channel)
return strdup(channel_get_name(dae->dae_channel));
return NULL;
}

static int
dvr_autorec_entry_class_title_set(void *o, const void *v)
{
Expand Down Expand Up @@ -442,6 +451,15 @@ dvr_autorec_entry_class_tag_get(void *o)
return &ret;
}

static char *
dvr_autorec_entry_class_tag_rend(void *o)
{
dvr_autorec_entry_t *dae = (dvr_autorec_entry_t *)o;
if (dae->dae_channel_tag)
return strdup(dae->dae_channel_tag->ct_name);
return NULL;
}

static int
dvr_autorec_entry_class_time_set(void *o, const void *v, int *tm)
{
Expand Down Expand Up @@ -556,6 +574,15 @@ dvr_autorec_entry_class_config_name_get(void *o)
return &ret;
}

static char *
dvr_autorec_entry_class_config_name_rend(void *o)
{
dvr_autorec_entry_t *dae = (dvr_autorec_entry_t *)o;
if (dae->dae_config)
return strdup(dae->dae_config->dvr_config_name);
return NULL;
}

static int
dvr_autorec_entry_class_weekdays_set(void *o, const void *v)
{
Expand Down Expand Up @@ -793,6 +820,7 @@ const idclass_t dvr_autorec_entry_class = {
.name = "Channel",
.set = dvr_autorec_entry_class_channel_set,
.get = dvr_autorec_entry_class_channel_get,
.rend = dvr_autorec_entry_class_channel_rend,
.list = channel_class_get_list,
},
{
Expand All @@ -801,6 +829,7 @@ const idclass_t dvr_autorec_entry_class = {
.name = "Channel Tag",
.set = dvr_autorec_entry_class_tag_set,
.get = dvr_autorec_entry_class_tag_get,
.rend = dvr_autorec_entry_class_tag_rend,
.list = channel_tag_class_get_list,
},
{
Expand All @@ -810,6 +839,7 @@ const idclass_t dvr_autorec_entry_class = {
.set = dvr_autorec_entry_class_start_set,
.get = dvr_autorec_entry_class_start_get,
.list = dvr_autorec_entry_class_time_list_,
.opts = PO_SORTKEY
},
{
.type = PT_TIME,
Expand Down Expand Up @@ -877,6 +907,7 @@ const idclass_t dvr_autorec_entry_class = {
.name = "DVR Configuration",
.set = dvr_autorec_entry_class_config_name_set,
.get = dvr_autorec_entry_class_config_name_get,
.rend = dvr_autorec_entry_class_config_name_rend,
.list = dvr_entry_class_config_name_list,
},
{
Expand Down
57 changes: 39 additions & 18 deletions src/dvr/dvr_db.c
View file
Expand Up @@ -1176,6 +1176,29 @@ dvr_entry_class_config_name_get(void *o)
return &ret;
}

htsmsg_t *
dvr_entry_class_config_name_list(void *o)
{
htsmsg_t *m = htsmsg_create_map();
htsmsg_t *p = htsmsg_create_map();
htsmsg_add_str(m, "type", "api");
htsmsg_add_str(m, "uri", "idnode/load");
htsmsg_add_str(m, "event", "dvrconfig");
htsmsg_add_u32(p, "enum", 1);
htsmsg_add_str(p, "class", dvr_config_class.ic_class);
htsmsg_add_msg(m, "params", p);
return m;
}

static char *
dvr_entry_class_config_name_rend(void *o)
{
dvr_entry_t *de = (dvr_entry_t *)o;
if (de->de_config)
return strdup(de->de_config->dvr_config_name);
return NULL;
}

static int
dvr_entry_class_channel_set(void *o, const void *v)
{
Expand Down Expand Up @@ -1217,6 +1240,15 @@ dvr_entry_class_channel_get(void *o)
return &ret;
}

static char *
dvr_entry_class_channel_rend(void *o)
{
dvr_entry_t *de = (dvr_entry_t *)o;
if (de->de_channel)
return strdup(channel_get_name(de->de_channel));
return NULL;
}

static int
dvr_entry_class_channel_name_set(void *o, const void *v)
{
Expand Down Expand Up @@ -1298,21 +1330,6 @@ dvr_entry_class_mc_list ( void *o )
return strtab2htsmsg(tab);
}

htsmsg_t *
dvr_entry_class_config_name_list(void *o)
{
htsmsg_t *m = htsmsg_create_map();
htsmsg_t *p = htsmsg_create_map();
htsmsg_add_str(m, "type", "api");
htsmsg_add_str(m, "uri", "idnode/load");
htsmsg_add_str(m, "event", "dvrconfig");
htsmsg_add_u32(p, "enum", 1);
htsmsg_add_str(p, "class", dvr_config_class.ic_class);
htsmsg_add_msg(m, "params", p);
return m;
}


static int
dvr_entry_class_autorec_set(void *o, const void *v)
{
Expand Down Expand Up @@ -1652,7 +1669,7 @@ const idclass_t dvr_entry_class = {
.set = dvr_entry_class_start_extra_set,
.list = dvr_entry_class_extra_list,
.get_opts = dvr_entry_class_start_extra_opts,
.opts = PO_DURATION,
.opts = PO_DURATION | PO_SORTKEY,
},
{
.type = PT_TIME,
Expand All @@ -1674,7 +1691,7 @@ const idclass_t dvr_entry_class = {
.name = "Extra Stop Time",
.off = offsetof(dvr_entry_t, de_stop_extra),
.list = dvr_entry_class_extra_list,
.opts = PO_DURATION,
.opts = PO_DURATION | PO_SORTKEY,
},
{
.type = PT_TIME,
Expand All @@ -1696,6 +1713,7 @@ const idclass_t dvr_entry_class = {
.name = "Channel",
.set = dvr_entry_class_channel_set,
.get = dvr_entry_class_channel_get,
.rend = dvr_entry_class_channel_rend,
.list = channel_class_get_list,
.get_opts = dvr_entry_class_start_opts,
},
Expand Down Expand Up @@ -1751,6 +1769,7 @@ const idclass_t dvr_entry_class = {
.def.i = DVR_PRIO_NORMAL,
.set = dvr_entry_class_pri_set,
.list = dvr_entry_class_pri_list,
.opts = PO_SORTKEY,
},
{
.type = PT_INT,
Expand All @@ -1767,6 +1786,7 @@ const idclass_t dvr_entry_class = {
.def.i = MC_MATROSKA,
.set = dvr_entry_class_mc_set,
.list = dvr_entry_class_mc_list,
.opts = PO_SORTKEY
},
{
.type = PT_STR,
Expand All @@ -1775,6 +1795,7 @@ const idclass_t dvr_entry_class = {
.set = dvr_entry_class_config_name_set,
.get = dvr_entry_class_config_name_get,
.list = dvr_entry_class_config_name_list,
.rend = dvr_entry_class_config_name_rend,
.get_opts = dvr_entry_class_start_opts,
},
{
Expand Down Expand Up @@ -1841,7 +1862,7 @@ const idclass_t dvr_entry_class = {
.name = "Content Type",
.list = dvr_entry_class_content_type_list,
.off = offsetof(dvr_entry_t, de_content_type),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_SORTKEY,
},
{
.type = PT_U32,
Expand Down
23 changes: 23 additions & 0 deletions src/dvr/dvr_timerec.c
View file
Expand Up @@ -306,6 +306,15 @@ dvr_timerec_entry_class_channel_get(void *o)
return &ret;
}

static char *
dvr_timerec_entry_class_channel_rend(void *o)
{
dvr_timerec_entry_t *dte = (dvr_timerec_entry_t *)o;
if (dte->dte_channel)
return strdup(channel_get_name(dte->dte_channel));
return NULL;
}

static int
dvr_timerec_entry_class_time_set(void *o, const void *v, int *tm)
{
Expand Down Expand Up @@ -408,6 +417,15 @@ dvr_timerec_entry_class_config_name_get(void *o)
return &buf;
}

static char *
dvr_timerec_entry_class_config_name_rend(void *o)
{
dvr_timerec_entry_t *dte = (dvr_timerec_entry_t *)o;
if (dte->dte_config)
return strdup(dte->dte_config->dvr_config_name);
return NULL;
}

static int
dvr_timerec_entry_class_weekdays_set(void *o, const void *v)
{
Expand Down Expand Up @@ -479,6 +497,7 @@ const idclass_t dvr_timerec_entry_class = {
.name = "Channel",
.set = dvr_timerec_entry_class_channel_set,
.get = dvr_timerec_entry_class_channel_get,
.rend = dvr_timerec_entry_class_channel_rend,
.list = channel_class_get_list,
},
{
Expand All @@ -489,6 +508,7 @@ const idclass_t dvr_timerec_entry_class = {
.get = dvr_timerec_entry_class_start_get,
.list = dvr_timerec_entry_class_time_list,
.def.s = "12:00",
.opts = PO_SORTKEY,
},
{
.type = PT_STR,
Expand All @@ -498,6 +518,7 @@ const idclass_t dvr_timerec_entry_class = {
.get = dvr_timerec_entry_class_stop_get,
.list = dvr_timerec_entry_class_time_list,
.def.s = "12:00",
.opts = PO_SORTKEY,
},
{
.type = PT_U32,
Expand All @@ -517,6 +538,7 @@ const idclass_t dvr_timerec_entry_class = {
.list = dvr_entry_class_pri_list,
.def.i = DVR_PRIO_NORMAL,
.off = offsetof(dvr_timerec_entry_t, dte_pri),
.opts = PO_SORTKEY,
},
{
.type = PT_INT,
Expand All @@ -530,6 +552,7 @@ const idclass_t dvr_timerec_entry_class = {
.name = "DVR Configuration",
.set = dvr_timerec_entry_class_config_name_set,
.get = dvr_timerec_entry_class_config_name_get,
.rend = dvr_timerec_entry_class_config_name_rend,
.list = dvr_entry_class_config_name_list,
},
{
Expand Down

0 comments on commit 616e774

Please sign in to comment.