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

Vod refactoring

Browse source
This commit is contained in:
topilski 2019-10-11 06:28:56 -04:00
parent 068392e891
commit 18dcb3cf19
22 changed files with 14 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/common

@ -1 +1 @@
Subproject commit cd20fd187f49fae0e25c2fe75042d3a5eb7a7bef Subproject commit 640242e6bc79f01b553b4fdadf181aad2b34c4b7

2
app/provider/view.py
View file

@ -17,7 +17,7 @@ class ProviderView(FlaskView):
streams = server.get_streams() streams = server.get_streams()
front_streams = [] front_streams = []
for stream in streams: for stream in streams:
front_streams.append(stream.to_front()) front_streams.append(stream.to_dict())
role = server.get_user_role_by_id(current_user.id) role = server.get_user_role_by_id(current_user.id)
return render_template('provider/dashboard.html', streams=front_streams, service=server, return render_template('provider/dashboard.html', streams=front_streams, service=server,
servers=current_user.servers, role=role) servers=current_user.servers, role=role)

8
app/service/service.py
View file

@ -246,7 +246,7 @@ class Service(IStreamHandler):
self._settings.streams.remove(stream) self._settings.streams.remove(stream)
break break
def to_front(self) -> dict: def to_dict(self) -> dict:
return {ServiceFields.ID: str(self.id), ServiceFields.CPU: self._cpu, ServiceFields.GPU: self._gpu, return {ServiceFields.ID: str(self.id), ServiceFields.CPU: self._cpu, ServiceFields.GPU: self._gpu,
ServiceFields.LOAD_AVERAGE: self._load_average, ServiceFields.MEMORY_TOTAL: self._memory_total, ServiceFields.LOAD_AVERAGE: self._load_average, ServiceFields.MEMORY_TOTAL: self._memory_total,
ServiceFields.MEMORY_FREE: self._memory_free, ServiceFields.HDD_TOTAL: self._hdd_total, ServiceFields.MEMORY_FREE: self._memory_free, ServiceFields.HDD_TOTAL: self._hdd_total,
@ -295,7 +295,7 @@ class Service(IStreamHandler):
stream = self.find_stream_by_id(sid) stream = self.find_stream_by_id(sid)
if stream: if stream:
stream.update_runtime_fields(params) stream.update_runtime_fields(params)
self.__notify_front(Service.STREAM_DATA_CHANGED, stream.to_front()) self.__notify_front(Service.STREAM_DATA_CHANGED, stream.to_dict())
def on_stream_sources_changed(self, params: dict): def on_stream_sources_changed(self, params: dict):
pass pass
@ -303,14 +303,14 @@ class Service(IStreamHandler):
def on_service_statistic_received(self, params: dict): def on_service_statistic_received(self, params: dict):
# nid = params['id'] # nid = params['id']
self.__refresh_stats(params) self.__refresh_stats(params)
self.__notify_front(Service.SERVICE_DATA_CHANGED, self.to_front()) self.__notify_front(Service.SERVICE_DATA_CHANGED, self.to_dict())
def on_quit_status_stream(self, params: dict): def on_quit_status_stream(self, params: dict):
sid = params['id'] sid = params['id']
stream = self.find_stream_by_id(sid) stream = self.find_stream_by_id(sid)
if stream: if stream:
stream.reset() stream.reset()
self.__notify_front(Service.STREAM_DATA_CHANGED, stream.to_front()) self.__notify_front(Service.STREAM_DATA_CHANGED, stream.to_dict())
def on_client_state_changed(self, status: ClientStatus): def on_client_state_changed(self, status: ClientStatus):
if status == ClientStatus.ACTIVE: if status == ClientStatus.ACTIVE:

4
app/templates/stream/catchup/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

2
app/templates/stream/cod_encode/add.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/encode/base.html' %} {% extends 'stream/cod_encode/base.html' %}
{% block title %} {% block title %}
Add cod encode stream Add cod encode stream
{% endblock %} {% endblock %}

8
app/templates/stream/cod_encode/base.html
View file

@ -34,16 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

2
app/templates/stream/cod_encode/edit.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/encode/base.html' %} {% extends 'stream/cod_encode/base.html' %}
{% block title %} {% block title %}
Edit cod encode stream Edit cod encode stream
{% endblock %} {% endblock %}

2
app/templates/stream/cod_relay/add.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/relay/base.html' %} {% extends 'stream/cod_relay/base.html' %}
{% block title %} {% block title %}
Add cod relay stream Add cod relay stream
{% endblock %} {% endblock %}

4
app/templates/stream/cod_relay/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

2
app/templates/stream/cod_relay/edit.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/relay/base.html' %} {% extends 'stream/cod_relay/base.html' %}
{% block title %} {% block title %}
Edit cod relay stream Edit cod relay stream
{% endblock %} {% endblock %}

4
app/templates/stream/encode/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

4
app/templates/stream/proxy/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_form(form.output) }} {{ render_bootstrap_form(form.output) }}
<br> <br>
{{ render_bootstrap_form(form.price) }} {{ render_bootstrap_form(form.price) }}

4
app/templates/stream/relay/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

4
app/templates/stream/test_life/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

4
app/templates/stream/timeshift_player/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

4
app/templates/stream/timeshift_recorder/base.html
View file

@ -34,12 +34,8 @@
<br> <br>
{{ render_bootstrap_field(form.tvg_logo) }} {{ render_bootstrap_field(form.tvg_logo) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.avformat) }} {{ render_bootstrap_field(form.avformat) }}
<br> <br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}

2
app/templates/stream/vod_encode/add.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/encode/base.html' %} {% extends 'stream/vod_encode/base.html' %}
{% block title %} {% block title %}
Add vod encode stream Add vod encode stream
{% endblock %} {% endblock %}

4
app/templates/stream/vod_encode/base.html
View file

@ -36,14 +36,10 @@
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }} {{ render_bootstrap_field(form.preview_icon) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }} {{ render_bootstrap_field(form.description) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

2
app/templates/stream/vod_encode/edit.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/encode/base.html' %} {% extends 'stream/vod_encode/base.html' %}
{% block title %} {% block title %}
Edit vod encode stream Edit vod encode stream
{% endblock %} {% endblock %}

2
app/templates/stream/vod_relay/add.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/relay/base.html' %} {% extends 'stream/vod_relay/base.html' %}
{% block title %} {% block title %}
Add vod relay stream Add vod relay stream
{% endblock %} {% endblock %}

4
app/templates/stream/vod_relay/base.html
View file

@ -36,14 +36,10 @@
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }} {{ render_bootstrap_field(form.preview_icon) }}
<br> <br>
{{ render_bootstrap_field(form.preview_icon) }}
<br>
{{ render_bootstrap_field(form.group_title) }} {{ render_bootstrap_field(form.group_title) }}
<br> <br>
{{ render_bootstrap_field(form.description) }} {{ render_bootstrap_field(form.description) }}
<br> <br>
{{ render_bootstrap_field(form.description) }}
<br>
{{ render_bootstrap_field(form.audio_select) }} {{ render_bootstrap_field(form.audio_select) }}
<br> <br>
{{ render_bootstrap_field(form.have_video) }} {{ render_bootstrap_field(form.have_video) }}

2
app/templates/stream/vod_relay/edit.html
View file

@ -1,4 +1,4 @@
{% extends 'stream/relay/base.html' %} {% extends 'stream/vod_relay/base.html' %}
{% block title %} {% block title %}
Edit vod relay stream Edit vod relay stream
{% endblock %} {% endblock %}