From 936dcc1f2532afb40977e65d8563681e3cfded1e Mon Sep 17 00:00:00 2001 From: deflax Date: Tue, 12 Oct 2021 17:19:18 +0000 Subject: [PATCH] remove hlsindex from api --- frontend/app/frontend.py | 3 ++- frontend/app/templates/default/main.html.j2 | 2 +- frontend/app/zomstream.py | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/app/frontend.py b/frontend/app/frontend.py index 4fb57ff..582995a 100644 --- a/frontend/app/frontend.py +++ b/frontend/app/frontend.py @@ -21,9 +21,10 @@ def start(): ) return page -@frontend.route("/player//") +@frontend.route("/player//") def show_player(appname, hlsindex): playerTemplate = '%s/player.html.j2' % zomstream.configuration['template_folder'] + hlsindex = streamname.split('_')[0] page = flask.render_template( playerTemplate, appname=appname, diff --git a/frontend/app/templates/default/main.html.j2 b/frontend/app/templates/default/main.html.j2 index 7144f75..18c8401 100644 --- a/frontend/app/templates/default/main.html.j2 +++ b/frontend/app/templates/default/main.html.j2 @@ -16,7 +16,7 @@ There are currently no streams running

{% endif %} -{% for item in items %} +{% for tem in items %}

Stream {{ item[1] }}

diff --git a/frontend/app/zomstream.py b/frontend/app/zomstream.py index 583adee..febd967 100644 --- a/frontend/app/zomstream.py +++ b/frontend/app/zomstream.py @@ -40,10 +40,8 @@ class Zomstream: for stream in streams: name = stream.find('name') rate = stream.find('bw_video') - streamname = name.text - hlsindex = streamname.split('_')[0] if rate.text != "0": - self.streamnames.append( [appname.text, hlsindex, streamname] ) + self.streamnames.append( [appname.text, streamname.text] ) return self.streamnames