Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-video-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-video-pipeline
Commits
75944682
Commit
75944682
authored
Nov 24, 2017
by
Mushtaq Ali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update/modify 3PlayMedia turnaround levels -
EDUCATOR-1809
parent
dc99e5c7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
11 deletions
+33
-11
VEDA_OS01/migrations/0005_auto_20171127_0856.py
+20
-0
VEDA_OS01/models.py
+12
-10
control/tests/test_deliver_3play.py
+1
-1
No files found.
VEDA_OS01/migrations/0005_auto_20171127_0856.py
0 → 100644
View file @
75944682
# -*- coding: utf-8 -*-
# Generated by Django 1.9 on 2017-11-27 08:56
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'VEDA_OS01'
,
'0004_auto_20171108_0714'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'video'
,
name
=
'three_play_turnaround'
,
field
=
models
.
CharField
(
blank
=
True
,
choices
=
[(
b
'extended'
,
b
'10-Day/Extended'
),
(
b
'standard'
,
b
'4-Day/Standard'
),
(
b
'expedited'
,
b
'2-Day/Expedited'
),
(
b
'rush'
,
b
'24 hour/Rush'
),
(
b
'same_day'
,
b
'Same Day'
),
(
b
'two_hour'
,
b
'2 Hour'
)],
max_length
=
20
,
null
=
True
,
verbose_name
=
b
'3PlayMedia Turnaround'
),
),
]
VEDA_OS01/models.py
View file @
75944682
...
@@ -85,18 +85,20 @@ class ThreePlayTurnaround(object):
...
@@ -85,18 +85,20 @@ class ThreePlayTurnaround(object):
Turnaround Enumeration.
Turnaround Enumeration.
Its the time taken by 3PlayMedia transcription process.
Its the time taken by 3PlayMedia transcription process.
"""
"""
EXTENDED_SERVICE
=
'extended_service'
EXTENDED
=
'extended'
DEFAULT
=
'default'
STANDARD
=
'standard'
EXPEDITED_SERVICE
=
'expedited_service'
EXPEDITED
=
'expedited'
RUSH_SERVICE
=
'rush_service'
RUSH
=
'rush'
SAME_DAY_SERVICE
=
'same_day_service'
SAME_DAY
=
'same_day'
TWO_HOUR
=
'two_hour'
CHOICES
=
(
CHOICES
=
(
(
EXTENDED_SERVICE
,
'10-Day/Extended'
),
(
EXTENDED
,
'10-Day/Extended'
),
(
DEFAULT
,
'4-Day/Default'
),
(
STANDARD
,
'4-Day/Standard'
),
(
EXPEDITED_SERVICE
,
'2-Day/Expedited'
),
(
EXPEDITED
,
'2-Day/Expedited'
),
(
RUSH_SERVICE
,
'24 hour/Rush'
),
(
RUSH
,
'24 hour/Rush'
),
(
SAME_DAY_SERVICE
,
'Same Day'
),
(
SAME_DAY
,
'Same Day'
),
(
TWO_HOUR
,
'2 Hour'
),
)
)
...
...
control/tests/test_deliver_3play.py
View file @
75944682
...
@@ -53,7 +53,7 @@ class ThreePlayMediaClientTests(TestCase):
...
@@ -53,7 +53,7 @@ class ThreePlayMediaClientTests(TestCase):
'media_url'
:
u'https://s3.amazonaws.com/bkt/video.mp4'
,
'media_url'
:
u'https://s3.amazonaws.com/bkt/video.mp4'
,
'api_key'
:
u'insecure_api_key'
,
'api_key'
:
u'insecure_api_key'
,
'api_secret'
:
u'insecure_api_secret'
,
'api_secret'
:
u'insecure_api_secret'
,
'turnaround_level'
:
ThreePlayTurnaround
.
DEFAULT
,
'turnaround_level'
:
ThreePlayTurnaround
.
STANDARD
,
'callback_url'
:
build_url
(
'callback_url'
:
build_url
(
u'https://veda.edx.org/3playmedia/transcripts/handle/123123'
,
u'https://veda.edx.org/3playmedia/transcripts/handle/123123'
,
org
=
u'MAx'
,
org
=
u'MAx'
,
...
...
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