Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Websites UFRPE
Wagtail Videos
Commits
181a7479
Commit
181a7479
authored
Sep 26, 2016
by
Liam Brenner
Committed by
Tim Heap
Sep 28, 2016
Browse files
Fixed various formatting issues to comply with Flake8, removed unused imports
parent
d5be1142
Changes
7
Hide whitespace changes
Inline
Side-by-side
wagtailvideos/fields.py
View file @
181a7479
from
__future__
import
absolute_import
,
print_function
,
unicode_literals
from
__future__
import
absolute_import
,
print_function
,
unicode_literals
import
os
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.exceptions
import
ValidationError
from
django.core.exceptions
import
ValidationError
from
django.forms.fields
import
FileField
from
django.forms.fields
import
FileField
...
...
wagtailvideos/forms.py
View file @
181a7479
...
@@ -2,13 +2,11 @@ from __future__ import absolute_import, print_function, unicode_literals
...
@@ -2,13 +2,11 @@ from __future__ import absolute_import, print_function, unicode_literals
from
django
import
forms
from
django
import
forms
from
django.forms.models
import
modelform_factory
from
django.forms.models
import
modelform_factory
from
django.forms.widgets
import
FileInput
from
django.utils.translation
import
ugettext
as
_
from
django.utils.translation
import
ugettext
as
_
from
enumchoicefield.forms
import
EnumField
from
enumchoicefield.forms
import
EnumField
from
wagtail.wagtailadmin
import
widgets
from
wagtail.wagtailadmin
import
widgets
from
wagtail.wagtailadmin.forms
import
(
BaseCollectionMemberForm
,
from
wagtail.wagtailadmin.forms
import
(
BaseCollectionMemberForm
,
collection_member_permission_formset_factory
)
collection_member_permission_formset_factory
)
from
wagtailvideos.fields
import
WagtailVideoField
from
wagtailvideos.fields
import
WagtailVideoField
from
wagtailvideos.models
import
MediaFormats
,
Video
,
VideoQuality
from
wagtailvideos.models
import
MediaFormats
,
Video
,
VideoQuality
from
wagtailvideos.permissions
import
\
from
wagtailvideos.permissions
import
\
...
@@ -18,6 +16,7 @@ from wagtailvideos.permissions import \
...
@@ -18,6 +16,7 @@ from wagtailvideos.permissions import \
class
BaseVideoForm
(
BaseCollectionMemberForm
):
class
BaseVideoForm
(
BaseCollectionMemberForm
):
permission_policy
=
video_permission_policy
permission_policy
=
video_permission_policy
# Callback to allow us to override the default form field for the image file field
# Callback to allow us to override the default form field for the image file field
def
formfield_for_dbfield
(
db_field
,
**
kwargs
):
def
formfield_for_dbfield
(
db_field
,
**
kwargs
):
# Check if this is the file field
# Check if this is the file field
...
...
wagtailvideos/models.py
View file @
181a7479
...
@@ -24,13 +24,11 @@ from django.utils.text import mark_safe
...
@@ -24,13 +24,11 @@ from django.utils.text import mark_safe
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
enumchoicefield
import
ChoiceEnum
,
EnumChoiceField
from
enumchoicefield
import
ChoiceEnum
,
EnumChoiceField
from
taggit.managers
import
TaggableManager
from
taggit.managers
import
TaggableManager
from
unidecode
import
unidecode
from
wagtail.wagtailadmin.taggable
import
TagSearchable
from
wagtail.wagtailadmin.taggable
import
TagSearchable
from
wagtail.wagtailadmin.utils
import
get_object_usage
from
wagtail.wagtailadmin.utils
import
get_object_usage
from
wagtail.wagtailcore.models
import
CollectionMember
from
wagtail.wagtailcore.models
import
CollectionMember
from
wagtail.wagtailsearch
import
index
from
wagtail.wagtailsearch
import
index
from
wagtail.wagtailsearch.queryset
import
SearchableQuerySetMixin
from
wagtail.wagtailsearch.queryset
import
SearchableQuerySetMixin
from
wagtailvideos.utils
import
ffmpeg_installed
from
wagtailvideos.utils
import
ffmpeg_installed
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -67,6 +65,7 @@ class MediaFormats(ChoiceEnum):
...
@@ -67,6 +65,7 @@ class MediaFormats(ChoiceEnum):
VideoQuality
.
highest
:
'9'
VideoQuality
.
highest
:
'9'
}[
quality
]
}[
quality
]
class
VideoQuerySet
(
SearchableQuerySetMixin
,
models
.
QuerySet
):
class
VideoQuerySet
(
SearchableQuerySetMixin
,
models
.
QuerySet
):
pass
pass
...
@@ -314,7 +313,7 @@ class TranscodingThread(threading.Thread):
...
@@ -314,7 +313,7 @@ class TranscodingThread(threading.Thread):
elif
media_format
is
MediaFormats
.
mp4
:
elif
media_format
is
MediaFormats
.
mp4
:
subprocess
.
check_output
(
args
+
[
subprocess
.
check_output
(
args
+
[
'-codec:v'
,
'libx264'
,
'-codec:v'
,
'libx264'
,
'-preset'
,
'slow'
,
# TODO Checkout other presets
'-preset'
,
'slow'
,
# TODO Checkout other presets
'-crf'
,
quality_param
,
'-crf'
,
quality_param
,
'-codec:a'
,
'copy'
,
'-codec:a'
,
'copy'
,
output_file
,
output_file
,
...
...
wagtailvideos/templatetags/wagtailvideos_tags.py
View file @
181a7479
...
@@ -5,7 +5,6 @@ import mimetypes
...
@@ -5,7 +5,6 @@ import mimetypes
from
django
import
template
from
django
import
template
from
django.forms.widgets
import
flatatt
from
django.forms.widgets
import
flatatt
from
django.utils.text
import
mark_safe
from
django.utils.text
import
mark_safe
from
wagtailvideos.models
import
MediaFormats
,
Video
register
=
template
.
Library
()
register
=
template
.
Library
()
# {% video self.intro_video extra_att extra_att %}
# {% video self.intro_video extra_att extra_att %}
...
@@ -13,7 +12,7 @@ register = template.Library()
...
@@ -13,7 +12,7 @@ register = template.Library()
@
register
.
tag
(
name
=
"video"
)
@
register
.
tag
(
name
=
"video"
)
def
video
(
parser
,
token
):
def
video
(
parser
,
token
):
template_params
=
token
.
split_contents
()[
1
:]
# Everything after 'video'
template_params
=
token
.
split_contents
()[
1
:]
# Everything after 'video'
video_expr
=
template_params
[
0
]
video_expr
=
template_params
[
0
]
extra_attrs
=
{}
extra_attrs
=
{}
...
@@ -28,6 +27,7 @@ def video(parser, token):
...
@@ -28,6 +27,7 @@ def video(parser, token):
extra_attrs
[
param
]
=
''
# attributes without values e.g. autoplay, controls
extra_attrs
[
param
]
=
''
# attributes without values e.g. autoplay, controls
return
VideoNode
(
video_expr
,
extra_attrs
)
return
VideoNode
(
video_expr
,
extra_attrs
)
class
VideoNode
(
template
.
Node
):
class
VideoNode
(
template
.
Node
):
def
__init__
(
self
,
video
,
attrs
=
{}):
def
__init__
(
self
,
video
,
attrs
=
{}):
self
.
video
=
template
.
Variable
(
video
)
self
.
video
=
template
.
Variable
(
video
)
...
@@ -48,7 +48,7 @@ class VideoNode(template.Node):
...
@@ -48,7 +48,7 @@ class VideoNode(template.Node):
transcodes
=
video
.
transcodes
.
exclude
(
processing
=
True
).
filter
(
error_message__exact
=
''
)
transcodes
=
video
.
transcodes
.
exclude
(
processing
=
True
).
filter
(
error_message__exact
=
''
)
for
transcode
in
transcodes
:
for
transcode
in
transcodes
:
sources
.
append
(
"<source src='{0}' type='video/{1}' >"
.
format
(
transcode
.
url
,
transcode
.
media_format
.
name
))
sources
.
append
(
"<source src='{0}' type='video/{1}' >"
.
format
(
transcode
.
url
,
transcode
.
media_format
.
name
))
sources
.
append
(
"<p>Sorry, your browser doesn't support playback for this video</p>"
)
sources
.
append
(
"<p>Sorry, your browser doesn't support playback for this video</p>"
)
return
mark_safe
(
return
mark_safe
(
"<video {0}>{1}</video>"
.
format
(
flatatt
(
self
.
attrs
),
"
\n
"
.
join
(
sources
)))
"<video {0}>{1}</video>"
.
format
(
flatatt
(
self
.
attrs
),
"
\n
"
.
join
(
sources
)))
wagtailvideos/views/multiple.py
View file @
181a7479
...
@@ -8,7 +8,6 @@ from django.views.decorators.http import require_POST
...
@@ -8,7 +8,6 @@ from django.views.decorators.http import require_POST
from
django.views.decorators.vary
import
vary_on_headers
from
django.views.decorators.vary
import
vary_on_headers
from
wagtail.wagtailadmin.utils
import
PermissionPolicyChecker
from
wagtail.wagtailadmin.utils
import
PermissionPolicyChecker
from
wagtail.wagtailsearch.backends
import
get_search_backends
from
wagtail.wagtailsearch.backends
import
get_search_backends
from
wagtailvideos.forms
import
get_video_form
from
wagtailvideos.forms
import
get_video_form
from
wagtailvideos.models
import
Video
from
wagtailvideos.models
import
Video
from
wagtailvideos.permissions
import
permission_policy
from
wagtailvideos.permissions
import
permission_policy
...
@@ -41,7 +40,6 @@ def add(request):
...
@@ -41,7 +40,6 @@ def add(request):
# no need to show a collections chooser
# no need to show a collections chooser
collections_to_choose
=
None
collections_to_choose
=
None
if
request
.
method
==
'POST'
:
if
request
.
method
==
'POST'
:
if
not
request
.
is_ajax
():
if
not
request
.
is_ajax
():
return
HttpResponseBadRequest
(
"Cannot POST to this view without AJAX"
)
return
HttpResponseBadRequest
(
"Cannot POST to this view without AJAX"
)
...
...
wagtailvideos/views/videos.py
View file @
181a7479
...
@@ -2,8 +2,8 @@ from __future__ import absolute_import, print_function, unicode_literals
...
@@ -2,8 +2,8 @@ from __future__ import absolute_import, print_function, unicode_literals
import
os
import
os
from
django.core.urlresolvers
import
NoReverseMatch
,
reverse
from
django.core.urlresolvers
import
reverse
from
django.http
import
HttpResponseNotAllowed
,
JsonResponse
from
django.http
import
HttpResponseNotAllowed
from
django.shortcuts
import
get_object_or_404
,
redirect
,
render
from
django.shortcuts
import
get_object_or_404
,
redirect
,
render
from
django.utils.translation
import
ugettext
as
_
from
django.utils.translation
import
ugettext
as
_
from
django.views.decorators.vary
import
vary_on_headers
from
django.views.decorators.vary
import
vary_on_headers
...
@@ -11,9 +11,8 @@ from wagtail.utils.pagination import paginate
...
@@ -11,9 +11,8 @@ from wagtail.utils.pagination import paginate
from
wagtail.wagtailadmin
import
messages
from
wagtail.wagtailadmin
import
messages
from
wagtail.wagtailadmin.forms
import
SearchForm
from
wagtail.wagtailadmin.forms
import
SearchForm
from
wagtail.wagtailadmin.utils
import
PermissionPolicyChecker
from
wagtail.wagtailadmin.utils
import
PermissionPolicyChecker
from
wagtail.wagtailcore.models
import
Collection
,
Site
from
wagtail.wagtailcore.models
import
Collection
from
wagtail.wagtailsearch.backends
import
get_search_backends
from
wagtail.wagtailsearch.backends
import
get_search_backends
from
wagtailvideos.forms
import
VideoTranscodeAdminForm
,
get_video_form
from
wagtailvideos.forms
import
VideoTranscodeAdminForm
,
get_video_form
from
wagtailvideos.models
import
Video
from
wagtailvideos.models
import
Video
from
wagtailvideos.permissions
import
permission_policy
from
wagtailvideos.permissions
import
permission_policy
...
@@ -21,6 +20,7 @@ from wagtailvideos.utils import ffmpeg_installed
...
@@ -21,6 +20,7 @@ from wagtailvideos.utils import ffmpeg_installed
permission_checker
=
PermissionPolicyChecker
(
permission_policy
)
permission_checker
=
PermissionPolicyChecker
(
permission_policy
)
@
permission_checker
.
require_any
(
'add'
,
'change'
,
'delete'
)
@
permission_checker
.
require_any
(
'add'
,
'change'
,
'delete'
)
@
vary_on_headers
(
'X-Requested-With'
)
@
vary_on_headers
(
'X-Requested-With'
)
def
index
(
request
):
def
index
(
request
):
...
@@ -125,6 +125,7 @@ def edit(request, video_id):
...
@@ -125,6 +125,7 @@ def edit(request, video_id):
'user_can_delete'
:
permission_policy
.
user_has_permission_for_instance
(
request
.
user
,
'delete'
,
video
)
'user_can_delete'
:
permission_policy
.
user_has_permission_for_instance
(
request
.
user
,
'delete'
,
video
)
})
})
def
create_transcode
(
request
,
video_id
):
def
create_transcode
(
request
,
video_id
):
if
request
.
method
!=
'POST'
:
if
request
.
method
!=
'POST'
:
return
HttpResponseNotAllowed
([
'POST'
])
return
HttpResponseNotAllowed
([
'POST'
])
...
...
wagtailvideos/wagtail_hooks.py
View file @
181a7479
...
@@ -7,7 +7,6 @@ from django.utils.html import format_html, format_html_join
...
@@ -7,7 +7,6 @@ from django.utils.html import format_html, format_html_join
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
wagtail.wagtailadmin.menu
import
MenuItem
from
wagtail.wagtailadmin.menu
import
MenuItem
from
wagtail.wagtailcore
import
hooks
from
wagtail.wagtailcore
import
hooks
from
wagtailvideos.forms
import
GroupVideoPermissionFormSet
from
wagtailvideos.forms
import
GroupVideoPermissionFormSet
from
.
import
urls
from
.
import
urls
...
@@ -38,10 +37,12 @@ def editor_js():
...
@@ -38,10 +37,12 @@ def editor_js():
urlresolvers
.
reverse
(
'wagtailvideos:chooser'
)
urlresolvers
.
reverse
(
'wagtailvideos:chooser'
)
)
)
@
hooks
.
register
(
'register_group_permission_panel'
)
@
hooks
.
register
(
'register_group_permission_panel'
)
def
register_video_permissions_panel
():
def
register_video_permissions_panel
():
return
GroupVideoPermissionFormSet
return
GroupVideoPermissionFormSet
@
hooks
.
register
(
'register_admin_menu_item'
)
@
hooks
.
register
(
'register_admin_menu_item'
)
def
register_images_menu_item
():
def
register_images_menu_item
():
return
MenuItem
(
return
MenuItem
(
...
...
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