From 238f111e4c7035a43e6fc599adbcb41626be85ee Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Wed, 26 Jul 2017 00:37:50 +0200
Subject: [PATCH] fixed genlive import (i hope...)
---
livestreams.py | 3 +--
server.py | 11 +++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/livestreams.py b/livestreams.py
index 38c13e9..02e1cd0 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 eb36456..6e6a017 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)
--
GitLab