Skip to content
Snippets Groups Projects
Commit 2e220e21 authored by Andreas Valder's avatar Andreas Valder
Browse files

Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoaginfra/website

parents 4d5b5d58 5f7eb451
No related branches found
No related tags found
No related merge requests found
...@@ -483,8 +483,8 @@ import stats ...@@ -483,8 +483,8 @@ import stats
if 'ICAL_URL' in config: if 'ICAL_URL' in config:
import meetings import meetings
import l2pauth import l2pauth
from encoding import schedule_remux
import sorter import sorter
import encoding
import timetable import timetable
import chapters import chapters
import icalexport import icalexport
......
...@@ -84,6 +84,7 @@ def insert_transcoded_video(jobid, jobtype, data, state, status): ...@@ -84,6 +84,7 @@ def insert_transcoded_video(jobid, jobtype, data, state, status):
data['lecture_id'], visible, data['output']['path'], data['format_id'], data['lecture_id'], visible, data['output']['path'], data['format_id'],
datetime.now(), datetime.now(), datetime.now(), -1, status['hash'], datetime.now(), datetime.now(), datetime.now(), -1, status['hash'],
status['filesize'], data['source_id'], status['duration']) status['filesize'], data['source_id'], status['duration'])
schedule_remux(data['lecture_id'], video_id)
schedule_thumbnail(data['lecture_id']) schedule_thumbnail(data['lecture_id'])
video = query('SELECT videos.*, "format" AS sep, formats.* FROM videos JOIN formats ON formats.id = videos.video_format WHERE videos.id = ?', video_id)[0] video = query('SELECT videos.*, "format" AS sep, formats.* FROM videos JOIN formats ON formats.id = videos.video_format WHERE videos.id = ?', video_id)[0]
lecture = query('SELECT * FROM lectures WHERE id = ?', data['lecture_id'])[0] lecture = query('SELECT * FROM lectures WHERE id = ?', data['lecture_id'])[0]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment