external/fastocloud_admin
1
0
Fork 0
mirror of https://github.com/fastogt/fastocloud_admin.git synced 2025-03-09 23:38:52 +00:00
Code Issues Releases Wiki Activity

Stream quality

Browse source
This commit is contained in:
topilski 2019-09-06 03:29:46 -04:00
parent 14c5a36061
commit a11556546e
3 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,3 +1,7 @@
1.6.1 /
[Alexandr Topilski]
- Stream quality
1.6.0 / September 4, 2019 1.6.0 / September 4, 2019
[Alexandr Topilski] [Alexandr Topilski]
- Balancer - Balancer

2
app/config/public_config.py
View file

@ -4,4 +4,4 @@ PUBLIC_CONFIG = {'site': {'title': 'FastoCloud', 'keywords': 'video,cloud,iptv,s
'contact_address': 'Republic of Belarus, Minsk, Stadionnay str. 5', 'contact_address': 'Republic of Belarus, Minsk, Stadionnay str. 5',
'community_channel': 'https://discord.gg/cnUXsws', 'community_channel': 'https://discord.gg/cnUXsws',
'partners':[{'company': 'Tathya Technologies Pvt Ltd (OPC)', 'website': 'https://tathyatechnologies.com', 'country':'India, Bangladesh'}]}, 'partners':[{'company': 'Tathya Technologies Pvt Ltd (OPC)', 'website': 'https://tathyatechnologies.com', 'country':'India, Bangladesh'}]},
'project': {'version': '1.6.0', 'version_type': 'release'}} 'project': {'version': '1.6.1', 'version_type': 'rc'}}

25
app/templates/provider/dashboard.html
View file

@ -14,13 +14,13 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
width: 18%; width: 18%;
} }
th.stream_type { th.stream_type {
width: 6%; width: 5%;
} }
th.stream_status { th.stream_status {
width: 5%; width: 5%;
} }
th.stream_restarts { th.stream_restarts {
width: 5%; width: 4%;
} }
th.stream_cpu { th.stream_cpu {
width: 5%; width: 5%;
@ -40,11 +40,14 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
th.stream_live_time { th.stream_live_time {
width: 5%; width: 5%;
} }
th.stream_quality {
width: 5%;
}
th.stream_price { th.stream_price {
width: 5%; width: 5%;
} }
th.stream_actions { th.stream_actions {
width: 28%; width: 25%;
} }
</style> </style>
{{super()}} {{super()}}
@ -292,6 +295,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
<th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th> <th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th>
<th class="stream_work_time">{% trans %}TTL (sec){% endtrans %}</th> <th class="stream_work_time">{% trans %}TTL (sec){% endtrans %}</th>
<th class="stream_live_time">{% trans %}RTL (sec){% endtrans %}</th> <th class="stream_live_time">{% trans %}RTL (sec){% endtrans %}</th>
<th class="stream_quality">{% trans %}Quality (%){% endtrans %}</th>
<th class="stream_price">{% trans %}Price ($){% endtrans %}</th> <th class="stream_price">{% trans %}Price ($){% endtrans %}</th>
<th class="stream_actions">{% trans %}Actions{% endtrans %}</th> <th class="stream_actions">{% trans %}Actions{% endtrans %}</th>
</tr> </tr>
@ -325,6 +329,8 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
</td> </td>
<td>{{ (rev.timestamp - rev.start_time)/1000 }}</td> <td>{{ (rev.timestamp - rev.start_time)/1000 }}</td>
<td>{{ (rev.timestamp - rev.loop_start_time)/1000 }}</td> <td>{{ (rev.timestamp - rev.loop_start_time)/1000 }}</td>
<td>{{ rev.quality | round(2, 'floor') }}
</td>
<td>{{ rev.price }}</td> <td>{{ rev.price }}</td>
<td> <td>
<button type="submit" <button type="submit"
@ -443,6 +449,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
<th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th> <th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th>
<th class="stream_work_time">{% trans %}TTL (sec){% endtrans %}</th> <th class="stream_work_time">{% trans %}TTL (sec){% endtrans %}</th>
<th class="stream_live_time">{% trans %}RTL (sec){% endtrans %}</th> <th class="stream_live_time">{% trans %}RTL (sec){% endtrans %}</th>
<th class="stream_quality">{% trans %}Quality (%){% endtrans %}</th>
<th class="stream_price">{% trans %}Price ($){% endtrans %}</th> <th class="stream_price">{% trans %}Price ($){% endtrans %}</th>
<th class="stream_actions">{% trans %}Actions{% endtrans %}</th> <th class="stream_actions">{% trans %}Actions{% endtrans %}</th>
</tr> </tr>
@ -476,6 +483,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
</td> </td>
<td>{{ (vod.timestamp - vod.start_time)/1000 }}</td> <td>{{ (vod.timestamp - vod.start_time)/1000 }}</td>
<td>{{ (vod.timestamp - vod.loop_start_time)/1000 }}</td> <td>{{ (vod.timestamp - vod.loop_start_time)/1000 }}</td>
<td>{{ vod.quality | round(2, 'floor') }}</td>
<td>{{ vod.price }}</td> <td>{{ vod.price }}</td>
<td> <td>
<button type="submit" <button type="submit"
@ -546,6 +554,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
<th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th> <th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th>
<th class="stream_work_time">{% trans %}TTL (sec){% endtrans %}</th> <th class="stream_work_time">{% trans %}TTL (sec){% endtrans %}</th>
<th class="stream_live_time">{% trans %}RTL (sec){% endtrans %}</th> <th class="stream_live_time">{% trans %}RTL (sec){% endtrans %}</th>
<th class="stream_quality">{% trans %}Quality (%){% endtrans %}</th>
<th class="stream_price">{% trans %}Price ($){% endtrans %}</th> <th class="stream_price">{% trans %}Price ($){% endtrans %}</th>
<th class="stream_actions">{% trans %}Actions{% endtrans %}</th> <th class="stream_actions">{% trans %}Actions{% endtrans %}</th>
</tr> </tr>
@ -579,6 +588,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
</td> </td>
<td>{{ (cod.timestamp - cod.start_time)/1000 }}</td> <td>{{ (cod.timestamp - cod.start_time)/1000 }}</td>
<td>{{ (cod.timestamp - cod.loop_start_time)/1000 }}</td> <td>{{ (cod.timestamp - cod.loop_start_time)/1000 }}</td>
<td>{{ cod.quality | round(2, 'floor') }}</td>
<td>{{ cod.price }}</td> <td>{{ cod.price }}</td>
<td> <td>
<button type="submit" <button type="submit"
@ -771,9 +781,12 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
out_bps += stream.output_streams[i].bps; out_bps += stream.output_streams[i].bps;
} }
row.eq(8).text((out_bps / (1024 * 1024 / 8)).toFixed(4)); row.eq(8).text((out_bps / (1024 * 1024 / 8)).toFixed(4));
row.eq(9).text((stream.timestamp - stream.start_time)/1000); max_work_time = (stream.timestamp - stream.start_time)
row.eq(10).text((stream.timestamp - stream.loop_start_time)/1000); row.eq(9).text(max_work_time/1000);
row.eq(11).text(stream.price); loop_work_time = stream.timestamp - stream.loop_start_time
row.eq(10).text(loop_work_time/1000);
row.eq(11).text(stream.quality.toFixed(2));
row.eq(12).text(stream.price);
}); });
socket.on('service_data_changed_{{ service.id }}', function(service) { socket.on('service_data_changed_{{ service.id }}', function(service) {
var service_id = $('#service_id'); var service_id = $('#service_id');