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

DVR: improve the episode name saving, fixes #2357

Browse source
This commit is contained in:
Jaroslav Kysela 2014-11-19 20:04:32 +01:00
parent c7d08fb316
commit dbd31acc3c
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/dvr/dvr_db.c
View file

@ -364,6 +364,21 @@ dvr_entry_fuzzy_match(dvr_entry_t *de, epg_broadcast_t *e)
return strcmp(title1, title2) == 0;
}
/**
* Set episode name
*/
static char *
dvr_entry_get_episode(epg_broadcast_t *bcast, char *buf, int len)
{
if (!bcast || !bcast->episode)
return NULL;
if (epg_episode_number_format(bcast->episode,
buf, len, NULL,
"Season %d", ".", "Episode %d", "/%d"))
return buf;
return NULL;
}
/**
* Create the event from config
*/
@ -439,7 +454,7 @@ dvr_entry_create_(const char *config_uuid, epg_broadcast_t *e,
dvr_prio_t pri, int retention)
{
dvr_entry_t *de;
char tbuf[64];
char tbuf[64], *s;
struct tm tm;
time_t t;
lang_str_t *l;
@ -467,6 +482,8 @@ dvr_entry_create_(const char *config_uuid, epg_broadcast_t *e,
lang_str_serialize(e->summary, conf, "description");
else if (e->episode && e->episode->summary)
lang_str_serialize(e->episode->summary, conf, "description");
if (e->episode && (s = dvr_entry_get_episode(e, tbuf, sizeof(tbuf))))
htsmsg_add_str(conf, "episode", s);
} else if (title) {
l = lang_str_create();
lang_str_add(l, title, lang, 0);
@ -804,15 +821,11 @@ static dvr_entry_t *_dvr_entry_update
}
/* Episode */
if (de->de_bcast && de->de_bcast->episode) {
if (epg_episode_number_format(de->de_bcast->episode,
buf, sizeof(buf), NULL,
"Season %d", ".", "Episode %d", "/%d")) {
if (strcmp(de->de_episode ?: "", buf)) {
free(de->de_episode);
de->de_episode = strdup(buf);
save = 1;
}
if (dvr_entry_get_episode(de->de_bcast, buf, sizeof(buf))) {
if (strcmp(de->de_episode ?: "", buf)) {
free(de->de_episode);
de->de_episode = strdup(buf);
save = 1;
}
}