Commit 181a7479 authored by Liam Brenner's avatar Liam Brenner Committed by Tim Heap
Browse files

Fixed various formatting issues to comply with Flake8, removed unused imports

parent d5be1142
from __future__ import absolute_import, print_function, unicode_literals
import os
from django.conf import settings
from django.core.exceptions import ValidationError
from django.forms.fields import FileField
......
......@@ -2,13 +2,11 @@ from __future__ import absolute_import, print_function, unicode_literals
from django import forms
from django.forms.models import modelform_factory
from django.forms.widgets import FileInput
from django.utils.translation import ugettext as _
from enumchoicefield.forms import EnumField
from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.forms import (BaseCollectionMemberForm,
collection_member_permission_formset_factory)
from wagtailvideos.fields import WagtailVideoField
from wagtailvideos.models import MediaFormats, Video, VideoQuality
from wagtailvideos.permissions import \
......@@ -18,6 +16,7 @@ from wagtailvideos.permissions import \
class BaseVideoForm(BaseCollectionMemberForm):
permission_policy = video_permission_policy
# Callback to allow us to override the default form field for the image file field
def formfield_for_dbfield(db_field, **kwargs):
# Check if this is the file field
......
......@@ -24,13 +24,11 @@ from django.utils.text import mark_safe
from django.utils.translation import ugettext_lazy as _
from enumchoicefield import ChoiceEnum, EnumChoiceField
from taggit.managers import TaggableManager
from unidecode import unidecode
from wagtail.wagtailadmin.taggable import TagSearchable
from wagtail.wagtailadmin.utils import get_object_usage
from wagtail.wagtailcore.models import CollectionMember
from wagtail.wagtailsearch import index
from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin
from wagtailvideos.utils import ffmpeg_installed
logger = logging.getLogger(__name__)
......@@ -67,6 +65,7 @@ class MediaFormats(ChoiceEnum):
VideoQuality.highest: '9'
}[quality]
class VideoQuerySet(SearchableQuerySetMixin, models.QuerySet):
pass
......@@ -314,7 +313,7 @@ class TranscodingThread(threading.Thread):
elif media_format is MediaFormats.mp4:
subprocess.check_output(args + [
'-codec:v', 'libx264',
'-preset', 'slow', # TODO Checkout other presets
'-preset', 'slow', # TODO Checkout other presets
'-crf', quality_param,
'-codec:a', 'copy',
output_file,
......
......@@ -5,7 +5,6 @@ import mimetypes
from django import template
from django.forms.widgets import flatatt
from django.utils.text import mark_safe
from wagtailvideos.models import MediaFormats, Video
register = template.Library()
# {% video self.intro_video extra_att extra_att %}
......@@ -13,7 +12,7 @@ register = template.Library()
@register.tag(name="video")
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]
extra_attrs = {}
......@@ -28,6 +27,7 @@ def video(parser, token):
extra_attrs[param] = '' # attributes without values e.g. autoplay, controls
return VideoNode(video_expr, extra_attrs)
class VideoNode(template.Node):
def __init__(self, video, attrs={}):
self.video = template.Variable(video)
......@@ -48,7 +48,7 @@ class VideoNode(template.Node):
transcodes = video.transcodes.exclude(processing=True).filter(error_message__exact='')
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>")
return mark_safe(
"<video {0}>{1}</video>".format(flatatt(self.attrs), "\n".join(sources)))
......@@ -8,7 +8,6 @@ from django.views.decorators.http import require_POST
from django.views.decorators.vary import vary_on_headers
from wagtail.wagtailadmin.utils import PermissionPolicyChecker
from wagtail.wagtailsearch.backends import get_search_backends
from wagtailvideos.forms import get_video_form
from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy
......@@ -41,7 +40,6 @@ def add(request):
# no need to show a collections chooser
collections_to_choose = None
if request.method == 'POST':
if not request.is_ajax():
return HttpResponseBadRequest("Cannot POST to this view without AJAX")
......
......@@ -2,8 +2,8 @@ from __future__ import absolute_import, print_function, unicode_literals
import os
from django.core.urlresolvers import NoReverseMatch, reverse
from django.http import HttpResponseNotAllowed, JsonResponse
from django.core.urlresolvers import reverse
from django.http import HttpResponseNotAllowed
from django.shortcuts import get_object_or_404, redirect, render
from django.utils.translation import ugettext as _
from django.views.decorators.vary import vary_on_headers
......@@ -11,9 +11,8 @@ from wagtail.utils.pagination import paginate
from wagtail.wagtailadmin import messages
from wagtail.wagtailadmin.forms import SearchForm
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 wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy
......@@ -21,6 +20,7 @@ from wagtailvideos.utils import ffmpeg_installed
permission_checker = PermissionPolicyChecker(permission_policy)
@permission_checker.require_any('add', 'change', 'delete')
@vary_on_headers('X-Requested-With')
def index(request):
......@@ -125,6 +125,7 @@ def edit(request, video_id):
'user_can_delete': permission_policy.user_has_permission_for_instance(request.user, 'delete', video)
})
def create_transcode(request, video_id):
if request.method != 'POST':
return HttpResponseNotAllowed(['POST'])
......
......@@ -7,7 +7,6 @@ from django.utils.html import format_html, format_html_join
from django.utils.translation import ugettext_lazy as _
from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore import hooks
from wagtailvideos.forms import GroupVideoPermissionFormSet
from . import urls
......@@ -38,10 +37,12 @@ def editor_js():
urlresolvers.reverse('wagtailvideos:chooser')
)
@hooks.register('register_group_permission_panel')
def register_video_permissions_panel():
return GroupVideoPermissionFormSet
@hooks.register('register_admin_menu_item')
def register_images_menu_item():
return MenuItem(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment