Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
W
website
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
84
Issues
84
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Video AG Infrastruktur
website
Commits
2e220e21
Commit
2e220e21
authored
Feb 07, 2018
by
Andreas Valder
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoaginfra/website
parents
4d5b5d58
5f7eb451
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
server.py
server.py
+1
-1
sorter.py
sorter.py
+1
-0
No files found.
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
Markdown
is supported
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