Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Video AG Infrastruktur
website
Commits
2e220e21
Commit
2e220e21
authored
Feb 07, 2018
by
Andreas Valder
Browse files
Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoaginfra/website
parents
4d5b5d58
5f7eb451
Changes
2
Hide whitespace changes
Inline
Side-by-side
server.py
View file @
2e220e21
...
...
@@ -483,8 +483,8 @@ import stats
if
'ICAL_URL'
in
config
:
import
meetings
import
l2pauth
from
encoding
import
schedule_remux
import
sorter
import
encoding
import
timetable
import
chapters
import
icalexport
...
...
sorter.py
View file @
2e220e21
...
...
@@ -84,6 +84,7 @@ def insert_transcoded_video(jobid, jobtype, data, state, status):
data
[
'lecture_id'
],
visible
,
data
[
'output'
][
'path'
],
data
[
'format_id'
],
datetime
.
now
(),
datetime
.
now
(),
datetime
.
now
(),
-
1
,
status
[
'hash'
],
status
[
'filesize'
],
data
[
'source_id'
],
status
[
'duration'
])
schedule_remux
(
data
[
'lecture_id'
],
video_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
]
lecture
=
query
(
'SELECT * FROM lectures WHERE id = ?'
,
data
[
'lecture_id'
])[
0
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment