Got rid of unused loading of wagtailimages tags, changed how thumbnails are...

Got rid of unused loading of wagtailimages tags, changed how thumbnails are saved, added media_url fix for tests

tests/app/.gitignore

+media/
+static/

tests/app/settings.py

 import os
-import sys
 
 INSTALLED_APPS = [
     'wagtailvideos',
@@ -13,6 +12,7 @@ INSTALLED_APPS = [
     'wagtail.wagtailusers',
     'wagtail.wagtailsites',
     'wagtail.wagtailsnippets',
+    'wagtail.wagtailimages',
 
     'django.contrib.admin',
     'django.contrib.auth',
@@ -73,3 +73,4 @@ STATIC_ROOT = os.path.join(os.path.dirname(__file__), 'static')
 STATIC_URL = '/static/'
 
 MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'media')
+MEDIA_URL = '/media/'

tests/app/urls.py

+import re
+
+from django.conf import settings
 from django.conf.urls import include, url
+from django.views.static import serve
 from wagtail.wagtailadmin import urls as wagtailadmin_urls
 from wagtail.wagtailcore import urls as wagtail_urls
 
 urlpatterns = [
     url(r'^admin/', include(wagtailadmin_urls)),
     url(r'', include(wagtail_urls)),
+    #  For media serving
+    url(r'^%s(?P<path>.*)$' % re.escape(settings.MEDIA_URL.lstrip('/')), serve, kwargs={'document_root': settings.MEDIA_ROOT})
 ]

wagtailvideos/models.py

@@ -17,6 +17,7 @@ from django.db.models.signals import post_save, pre_delete
 from django.dispatch.dispatcher import receiver
 from django.utils.encoding import python_2_unicode_compatible
 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
@@ -25,8 +26,6 @@ from wagtail.wagtailcore.models import CollectionMember
 from wagtail.wagtailsearch import index
 from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin
 
-from enumchoicefield import ChoiceEnum, EnumChoiceField
-
 
 class MediaFormats(ChoiceEnum):
     webm = 'VP8 and Vorbis in WebM'
@@ -133,10 +132,11 @@ class AbstractVideo(CollectionMember, TagSearchable):
             return self.thumbnail
 
         file_path = self.file.path
+        file_name = self.filename(include_ext=False) + '_thumb.jpg'
 
         try:
             output_dir = tempfile.mkdtemp()
-            output_file = os.path.join(output_dir, self.filename(include_ext=False) + '_thumb.jpg')
+            output_file = os.path.join(output_dir, file_name)
             try:
                 FNULL = open(os.devnull, 'r')
                 subprocess.check_call([
@@ -152,7 +152,7 @@ class AbstractVideo(CollectionMember, TagSearchable):
                 ], stdin=FNULL)
             except subprocess.CalledProcessError:
                 return None
-            return ContentFile(open(output_file, 'rb').read(), 'thumb.jpg')
+            return ContentFile(open(output_file, 'rb').read(), file_name)
         finally:
             shutil.rmtree(output_dir, ignore_errors=True)
 
@@ -174,7 +174,7 @@ class AbstractVideo(CollectionMember, TagSearchable):
         return os.path.splitext(self.filename())[1][1:]
 
     def is_editable_by_user(self, user):
-        from wagtail.wagtailimages.permissions import permission_policy
+        from wagtailvideos.permissions import permission_policy
         return permission_policy.user_has_permission_for_instance(user, 'change', self)
 
     @classmethod

wagtailvideos/templates/wagtailvideos/chooser/chooser.html

-{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Choose a video" as choose_str %}
 {% include "wagtailadmin/shared/header.html" with title=choose_str merged=1 tabbed=1 icon="media" %}

wagtailvideos/templates/wagtailvideos/chooser/results.html

-{% load wagtailimages_tags wagtailadmin_tags %}
+{% load wagtailadmin_tags %}
 {% load i18n %}
 {% if videos %}
     {% if is_searching %}

wagtailvideos/templates/wagtailvideos/multiple/add.html

 {% extends "wagtailadmin/base.html" %}
-{% load wagtailimages_tags i18n staticfiles %}
+{% load i18n staticfiles %}
 {% block titletag %}{% trans "Add multiple videos" %}{% endblock %}
 {% block extra_css %}
     {{ block.super }}
@@ -24,9 +24,9 @@
                 {% csrf_token %}
                 {% if collections %}
                     <div class="field">
-                        <label for="id_addimage_collection">{% trans "Add to collection:" %}</label>
+                        <label for="id_addvideo_collection">{% trans "Add to collection:" %}</label>
                         <div class="field-content">
-                            <select id="id_addimage_collection" name="collection">
+                            <select id="id_addvideo_collection" name="collection">
                                 {% for collection in collections %}
                                     <option value="{{ collection.id }}">{{ collection.name }}</option>
                                 {% endfor %}

wagtailvideos/templates/wagtailvideos/widgets/video_chooser.html

 {% extends "wagtailadmin/widgets/chooser.html" %}
-{% load wagtailimages_tags %}
 
 {% block chooser_class %}image-chooser{% endblock %}
 

wagtailvideos/urls.py

@@ -3,6 +3,7 @@ from django.conf.urls import url
 from wagtailvideos.views import chooser, multiple, videos
 
 urlpatterns = [
+
     url(r'^$', videos.index, name='index'),
     url(r'^(\d+)/$', videos.edit, name='edit'),
     url(r'^(\d+)/delete/$', videos.delete, name='delete'),