Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
htsp: add dataSize field to the dvrentry msg
  • Loading branch information
perexg committed Apr 30, 2015
1 parent cb6e8ae commit 01406e0
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/htsp_server.c
Expand Up @@ -666,6 +666,7 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
htsmsg_t *out = htsmsg_create_map();
const char *s = NULL, *error = NULL, *subscriptionError = NULL;
const char *p;
int64_t fsize = -1;

htsmsg_add_u32(out, "id", idnode_get_short_uuid(&de->de_id));
if (de->de_channel)
Expand Down Expand Up @@ -701,13 +702,13 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
if ((p = tvh_strbegins(de->de_filename, de->de_config->dvr_storage)))
htsmsg_add_str(out, "path", p);
}

switch(de->de_sched_state) {
case DVR_SCHEDULED:
s = "scheduled";
break;
case DVR_RECORDING:
s = "recording";
fsize = dvr_get_filesize(de);
if (de->de_rec_state == DVR_RS_ERROR ||
(de->de_rec_state == DVR_RS_PENDING && de->de_last_error != SM_CODE_OK))
{
Expand All @@ -717,7 +718,8 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
break;
case DVR_COMPLETED:
s = "completed";
if(dvr_get_filesize(de) == -1)
fsize = dvr_get_filesize(de);
if (fsize < 0)
error = "File missing";
else if(de->de_last_error)
error = streaming_code2txt(de->de_last_error);
Expand All @@ -739,6 +741,8 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
htsmsg_add_u32(out, "streamErrors", de->de_errors);
if (de->de_data_errors)
htsmsg_add_u32(out, "dataErrors", de->de_data_errors);
if (fsize >= 0)
htsmsg_add_s64(out, "dataSize", fsize);
htsmsg_add_str(out, "method", method);
return out;
}
Expand Down

0 comments on commit 01406e0

Please sign in to comment.