diff --git a/livestreams.py b/livestreams.py index 38c13e92994ba8c3b3c81866b2a72d4bb8b0c086..02e1cd07e09974251c17147c4f6054b1caab538e 100644 --- a/livestreams.py +++ b/livestreams.py @@ -1,5 +1,4 @@ from server import * -from sorter import schedule_thumbnail def genlive(streams): for stream in streams: @@ -18,5 +17,5 @@ def livestream_thumbnail(): WHERE streams.active AND (? OR streams.visible) ''', ismod()) for v in genlive(livestreams): - schedule_thumbnail(v['lecture_id']) + sorter.schedule_thumbnail(v['lecture_id']) diff --git a/server.py b/server.py index eb36456dd10f0dbbb03d16a5caee166ea24531c2..6e6a01759a9ed9837626a8da0e9c3527ecd6edc6 100644 --- a/server.py +++ b/server.py @@ -321,6 +321,15 @@ def tagid(s): r = r + c return r +def genlive(streams): + for stream in streams: + stream['visible'] = True + stream['downloadable'] = False + stream['path'] = 'pub/hls/%s.m3u8'%stream['livehandle'] + stream['file_size'] = 0 + return streams + + @app.route('/') @register_navbar('Home', icon='home') def index(): @@ -381,8 +390,6 @@ def courses(): groupedby = 'semester' return render_template('courses.html', courses=courses, groupedby=groupedby) -from livestreams import genlive - @app.route('/<handle>') @app.route('/<int:id>') @handle_errors('courses', 'Diese Veranstaltung existiert nicht!', 404, IndexError)