From 7b68cf9f21742e5211d6d4f16d33d16573c3cc7a Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Wed, 26 Jul 2017 00:55:10 +0200
Subject: [PATCH] another try
---
livestreams.py | 10 +++++-----
sorter.py | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/livestreams.py b/livestreams.py
index 9449173..60028f8 100644
--- a/livestreams.py
+++ b/livestreams.py
@@ -2,12 +2,12 @@ from server import *
@sched_func(30)
def livestream_thumbnail():
- livestreams = query('''SELECT streams.handle AS livehandle, streams.lecture_id, "formats" AS sep, formats.*
+ livestreams = query('''SELECT streams.lecture_id
FROM streams
JOIN lectures ON lectures.id = streams.lecture_id
- JOIN formats ON formats.keywords = "hls"
- WHERE streams.active AND (? OR streams.visible)
- ''', ismod())
+ WHERE streams.active)
+ ''')
+
for v in genlive(livestreams):
- sorter.schedule_thumbnail(v['lecture_id'])
+ sorter.schedule_thumbnail(v['lecture_id'], v['path'])
diff --git a/sorter.py b/sorter.py
index 472955b..c880aba 100644
--- a/sorter.py
+++ b/sorter.py
@@ -35,7 +35,7 @@ def insert_video(lectureid,dbfilepath,filepath,fileformatid):
query('INSERT INTO sortlog (lecture_id,video_id,path,`when`) VALUES (?,?,?,?)', lectureid, video_id, dbfilepath, datetime.now())
schedule_thumbnail(lectureid)
-def schedule_thumbnail(lectureid):
+def schedule_thumbnail(lectureid, filePath=None):
videos = query('''
SELECT videos.path
FROM videos
@@ -44,6 +44,8 @@ def schedule_thumbnail(lectureid):
ORDER BY formats.prio DESC''', lectureid )
if videos:
path = videos[0]['path']
+ elif filePath:
+ path = filePath
else:
return
data = '{"lectureid": "'+str(lectureid)+'", "path": "'+path+'"}'
--
GitLab