Skip to content

GitLab

Commit e98607a2 authored by Seb's avatar Seb
Browse files

Code review suggestions. Also fixed mixed spaces/tabs in edit.html

parent 790ca0a2
Hide whitespace changes
Inline Side-by-side
wagtailvideos/models.py
View file @ e98607a2
...@@ -44,26 +44,23 @@ class MediaFormats(ChoiceEnum): ...@@ -44,26 +44,23 @@ class MediaFormats(ChoiceEnum):
def get_quality_param(self, quality): def get_quality_param(self, quality):
if self is MediaFormats.webm: if self is MediaFormats.webm:
if quality is VideoQuality.lowest: return {
return '50' VideoQuality.lowest: '50',
elif quality is VideoQuality.highest: VideoQuality.default: '22',
return '4' VideoQuality.highest: '4'
return '22' }[quality]
elif self is MediaFormats.mp4: elif self is MediaFormats.mp4:
if quality is VideoQuality.lowest: return {
return '28' VideoQuality.lowest: '28',
if quality is VideoQuality.highest: VideoQuality.default: '24',
return '18' VideoQuality.highest: '18'
return '24' }[quality]
elif self is MediaFormats.ogg: elif self is MediaFormats.ogg:
if quality is VideoQuality.lowest: return {
return '5' VideoQuality.lowest: '5',
if quality is VideoQuality.highest: VideoQuality.default: '7',
return '9' VideoQuality.highest: '9'
return '7' }[quality]
class VideoQuerySet(SearchableQuerySetMixin, models.QuerySet): class VideoQuerySet(SearchableQuerySetMixin, models.QuerySet):
pass pass
...@@ -236,7 +233,9 @@ class AbstractVideo(CollectionMember, TagSearchable): ...@@ -236,7 +233,9 @@ class AbstractVideo(CollectionMember, TagSearchable):
transcode.processing = True transcode.processing = True
transcode.error_messages = '' transcode.error_messages = ''
transcode.quality = quality transcode.quality = quality
transcode.save(update_fields=['processing', 'error_message']) # Lock the transcode model # Lock the transcode model
transcode.save(update_fields=['processing', 'error_message',
'quality'])
TranscodingThread(transcode).start() TranscodingThread(transcode).start()
else: else:
pass # TODO Queue? pass # TODO Queue?
......
wagtailvideos/templates/wagtailvideos/videos/edit.html
View file @ e98607a2
{% extends "wagtailadmin/base.html" %} {% extends "wagtailadmin/base.html" %} {% load staticfiles i18n wagtailvideos_tags %} {% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %}
{% load staticfiles i18n wagtailvideos_tags %} <link rel="stylesheet" href="{% static 'wagtailvideos/css/edit-video.css' %}" type="text/css" /> {% endblock %} {% block extra_js %} {{ block.super }} {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
{% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} <script>
$(function() {
{% block extra_css %} $('#id_tags').tagit({
<link rel="stylesheet" href="{% static 'wagtailvideos/css/edit-video.css' %}" type="text/css" /> autocomplete: {
source: "{{ autocomplete_url|addslashes }}"
{% endblock %} }
{% block extra_js %}
{{ block.super }}
{% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
<script>
$(function() {
$('#id_tags').tagit({
autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
});
}); });
</script> });
{% endblock %} </script>
{% endblock %} {% block content %} {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" usage_object=video %}
{% block content %}
{% trans "Editing" as editing_str %}
{% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" usage_object=video %}
<div class="row row-flush nice-padding"> <div class="row row-flush nice-padding">
<div class="col5"> <div class="col5">
<form action="{% url 'wagtailvideos:edit' video.id %}" method="POST" enctype="multipart/form-data"> <form action="{% url 'wagtailvideos:edit' video.id %}" method="POST" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<ul class="fields"> <ul class="fields">
{% for field in form %} {% for field in form %} {% if field.name == 'file' %} {% include "wagtailvideos/videos/_file_field_as_li.html" %} {% elif field.is_hidden %} {{ field }} {% else %} {% include "wagtailadmin/shared/field_as_li.html" %} {% endif %} {% endfor %}
{% if field.name == 'file' %} <li>
{% include "wagtailvideos/videos/_file_field_as_li.html" %} <input type="submit" class="button" value="{% trans 'Save' %}" /> {% if user_can_delete %}
{% elif field.is_hidden %} <a href="{% url 'wagtailvideos:delete' video.id %}" class="button button-secondary no">{% trans "Delete video" %}</a> {% endif %}
{{ field }} </li>
{% else %} </ul>
{% include "wagtailadmin/shared/field_as_li.html" %} </form>
{% endif %} </div>
{% endfor %} <div class="col5 divider-after">
<li> <h2 class="label">{% trans "Video preview" %}</h2> {% video video controls style=max-width:100% %}
<input type="submit" class="button" value="{% trans 'Save' %}" /> <h3 class="label">Transcodes</h3>
{% if user_can_delete %} <p>If you wish to generate HTML5 compliant transcodes use the form below. This may take a while depending on the length of the video.</p>
<a href="{% url 'wagtailvideos:delete' video.id %}" class="button button-secondary no">{% trans "Delete video" %}</a> {% if transcodes %}
{% endif %} <h3 class="label">Available Transcodes</h3>
</li> <ul>
</ul> {% for transcode in transcodes %}
</form> <li>
</div> {{ transcode.media_format }} ({{ transcode.quality }} quality) {% if transcode.processing %} <span class='processing'>(Processing... hold tight) </span>{% endif %} {% if transcode.error_message %}
<div class="col5 divider-after"> <span class='transcode-error'>ERROR:</span>
<h2 class="label">{% trans "Video preview" %}</h2> <div class='transcode-error'>
{% video video controls style=max-width:100% %} <pre> {{ transcode.error_message }}</pre>
<h3 class="label">Transcodes</h3> </div>
<p>If you wish to generate HTML5 compliant transcodes use the form below. This may take a while depending in the length of the video.</p> {% endif %}
{% if transcodes %} </li>
<h3 class="label">Available Transcodes</h3> {% endfor %}
<ul> </ul>
{% for transcode in transcodes %} {% endif %}
<li> <h3 class="label">Create transcode</h3>
{{ transcode.media_format }} ({{ transcode.quality }} quality) <form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST">
{% if transcode.processing %} <span class='processing'>(Processing... hold tight) </span>{% endif %} <ul class="fields">
{% if transcode.error_message %} {% csrf_token %} {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.media_format %} {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.quality %}
<span class='transcode-error'>ERROR:</span> <li>
<div class='transcode-error'> <input class="button" type='submit' value="Start" />
<pre> {{ transcode.error_message }}</pre> </li>
</div> </ul>
{% endif %} </form>
</li> </div>
{% endfor %} <div class="col2 ">
</ul> <dl>
{% endif %} <dt>{% trans "Thumbnail" %}</dt>
<h3 class="label">Create transcode</h3> <dd><img src='{{ video.thumbnail.url }}' /></dd>
<form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST"> <dt>{% trans "Filesize" %}</dt>
<ul class="fields"> <dd>{% if filesize %}{{ filesize|filesizeformat }}{% else %}{% trans "File not found" %}{% endif %}</dd>
{% csrf_token %} <dt>{% trans "Duration" %}</dt>
{% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.media_format %} <dd>{{ video.formatted_duration }}</dd>
{% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.quality %} </dl>
<li>
<input class="button" type='submit' value="Start" />
</li>
</ul>
</form>
</div>
<div class="col2 ">
<dl>
<dt>{% trans "Thumbnail" %}</dt>
<dd><img src='{{ video.thumbnail.url }}' /></dd>
<dt>{% trans "Filesize" %}</dt>
<dd>{% if filesize %}{{ filesize|filesizeformat }}{% else %}{% trans "File not found" %}{% endif %}</dd>
<dt>{% trans "Duration" %}</dt>
<dd>{{ video.formatted_duration }}</dd>
</dl>
</div>
</div> </div>
</div>
{% endblock %} {% endblock %}
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