dave
/
streamrecord
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add recorder activity indicator

This commit is contained in:
dave 2014-08-26 16:12:00 -07:00
parent 75e853d0e1
commit 90c4c16913
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.py
View File

@ -106,6 +106,8 @@ if __name__ == '__main__' or 'uwsgi' in __name__:
for stream in streamList:
stream["time"] = db.execute('SELECT * FROM "times" WHERE streamid=?', [stream["id"]])[0]
stream["files"] = self._getFiles(stream["id"])
stream["recorder_status"] = self.REC.streamStatus(stream["id"])
stream["is_running"] = stream["recorder_status"] not in [0, -1] # idle states
return json.dumps(streamList)

14
jstemplates/stream.html
View File

@ -24,7 +24,7 @@
<div class="col-sm-2">
<strong>Time</strong>
</div>
<div class="col-sm-6 day-input clearfix">
<div class="col-sm-4 day-input clearfix">
<div class="dropdown pull-left">
<a class="dropdown-toggle btn btn-default" data-toggle="dropdown" href="#">
Days
@ -51,7 +51,7 @@
</div>
</div>
<div class="col-sm-1">
<strong>Status</strong>
<strong>Schedule</strong>
</div>
<div class="col-sm-3">
<div class="btn-group btn-group-status">
@ -60,6 +60,16 @@
<button type="button" class="btn btn-default btn-status-alarm{{#is status 2 }} active{{/is}}"><span class="glyphicon glyphicon-bell"></span></button>
</div>
</div>
<div class="col-sm-2">
<strong>Now: </strong>
{{#is recorder_status -1 }}Idle{{/is}}
{{#is recorder_status 0 }}Idle{{/is}}
{{#is recorder_status 1 }}Idle{{/is}}
{{#is recorder_status 2 }}Recording{{/is}}
{{#is recorder_status 3 }}Merging{{/is}}
{{#is recorder_status 4 }}Transcoding{{/is}}
{{#is recorder_status 5 }}Cleaning up{{/is}}
</div>
</div>
{{#if message }}
<div class="row-fluid clearfix errorpanel">