allow videos to be uploaded in the marketplace (bug 735057)

Author: Andy McKay

apps/addons/models.py

@@ -1612,17 +1612,30 @@ def _image_url(self, url_template):
             modified = int(time.mktime(self.modified.timetuple()))
         else:
             modified = 0
-        return url_template % (self.id / 1000, self.id, modified)
+        args = [self.id / 1000, self.id, modified]
+        if '.png' not in url_template:
+            args.insert(2, self.file_extension)
+        return url_template % tuple(args)
 
     def _image_path(self, url_template):
-        return url_template % (self.id / 1000, self.id)
+        args = [self.id / 1000, self.id]
+        if '.png' not in url_template:
+            args.append(self.file_extension)
+        return url_template % tuple(args)
 
     def as_dict(self, src=None):
         d = {'full': urlparams(self.image_url, src=src),
              'thumbnail': urlparams(self.thumbnail_url, src=src),
              'caption': unicode(self.caption)}
         return d
 
+    @property
+    def file_extension(self):
+        # Assume that blank is an image.
+        if not self.filetype:
+            return 'png'
+        return self.filetype.split('/')[1]
+
     @property
     def thumbnail_url(self):
         return self._image_url(settings.PREVIEW_THUMBNAIL_URL)

apps/addons/tests/test_models.py

@@ -1418,6 +1418,19 @@ def test_as_dict(self):
         reality = sorted(Preview.objects.all()[0].as_dict().keys())
         eq_(expect, reality)
 
+    def test_filename(self):
+        preview = Preview.objects.get(pk=24)
+        eq_(preview.file_extension, 'png')
+        preview.update(filetype='')
+        eq_(preview.file_extension, 'png')
+        preview.update(filetype='video/webm')
+        eq_(preview.file_extension, 'webm')
+
+    def test_filename_in_url(self):
+        preview = Preview.objects.get(pk=24)
+        preview.update(filetype='video/webm')
+        assert 'webm' in preview.thumbnail_path
+
 
 class TestAddonRecommendations(amo.tests.TestCase):
     fixtures = ['base/addon-recs']
@@ -1479,7 +1492,7 @@ def setUp(self):
         settings.PREVIEW_THUMBNAIL_URL = (settings.STATIC_URL +
             '/img/uploads/previews/thumbs/%s/%d.png?modified=%d')
         settings.PREVIEW_FULL_URL = (settings.STATIC_URL +
-            '/img/uploads/previews/full/%s/%d.png?modified=%d')
+            '/img/uploads/previews/full/%s/%d.%s?modified=%d')
         _connect()
 
     def tearDown(self):

apps/amo/fixtures/base/previews.json

@@ -165,7 +165,7 @@
         "model": "addons.preview",
         "fields": {
             "caption": 32680,
-            "filetype": "image/jpeg",
+            "filetype": "image/png",
             "created": "2007-03-05 09:54:15",
             "modified": null,
             "thumbtype": "image/png",

apps/constants/base.py

@@ -212,6 +212,7 @@
 
 # Accepted image MIME-types
 IMG_TYPES = ('image/png', 'image/jpeg', 'image/jpg')
+VIDEO_TYPES = ('video/webm',)
 
 # These types don't maintain app compatibility in the db.  Instead, we look at
 # APP.types and APP_TYPE_SUPPORT to figure out where they are compatible.

lib/settings_base.py

@@ -906,7 +906,7 @@ def JINJA_CONFIG():
 ADDON_ICONS_DEFAULT_PATH = os.path.join(MEDIA_ROOT, 'img/addon-icons')
 
 PREVIEW_THUMBNAIL_PATH = (PREVIEWS_PATH + '/thumbs/%s/%d.png')
-PREVIEW_FULL_PATH = (PREVIEWS_PATH + '/full/%s/%d.png')
+PREVIEW_FULL_PATH = (PREVIEWS_PATH + '/full/%s/%d.%s')
 
 # URL paths
 # paths for images, e.g. mozcdn.com/amo or '/static'
@@ -918,7 +918,7 @@ def JINJA_CONFIG():
 PREVIEW_THUMBNAIL_URL = (STATIC_URL +
         '/img/uploads/previews/thumbs/%s/%d.png?modified=%d')
 PREVIEW_FULL_URL = (STATIC_URL +
-        '/img/uploads/previews/full/%s/%d.png?modified=%d')
+        '/img/uploads/previews/full/%s/%d.%s?modified=%d')
 USERPICS_URL = STATIC_URL + '/img/uploads/userpics/%s/%s/%s.png?modified=%d'
 # paths for uploaded extensions
 COLLECTION_ICON_URL = (STATIC_URL +
@@ -1168,6 +1168,7 @@ def read_only_mode(env):
 
 # Uploaded file limits
 MAX_ICON_UPLOAD_SIZE = 4 * 1024 * 1024
+MAX_VIDEO_UPLOAD_SIZE = 4 * 1024 * 1024
 MAX_PHOTO_UPLOAD_SIZE = MAX_ICON_UPLOAD_SIZE
 MAX_PERSONA_UPLOAD_SIZE = 300 * 1024
 MAX_WEBAPP_UPLOAD_SIZE = 2 * 1024 * 1024

lib/video/ffmpeg.py

@@ -124,7 +124,7 @@ def is_valid(self):
         assert self.meta is not None
         self.errors = []
         if 'webm' not in self.meta.get('formats', ''):
-            self.errors.append('Must be a valid webm video')
+            self.errors.append('Videos must be WEBM.')
 
         #TODO(andym): More checks on duration, file size, bit rate?
         return not self.errors

lib/video/tasks.py

@@ -7,13 +7,14 @@
 import amo
 from amo.decorators import set_modified_on
 from lib.video.ffmpeg import Video
+import waffle
 
 log = logging.getLogger('z.devhub.task')
 
 
 @task
 @set_modified_on
-def resize_video(src, instance, *kw):
+def resize_video(src, instance, **kw):
     """
     Given a preview object and a file somewhere: encode into the full
     preview size and generate a thumbnail.
@@ -29,26 +30,40 @@ def resize_video(src, instance, *kw):
         log.info('Video is not valid for %s' % instance.pk)
         return
 
-    # Do the video first, this can take a bit.
-    try:
-        video_file = video.get_encoded(amo.ADDON_PREVIEW_SIZES[1])
-    except Exception:
-        log.info('Error encoding video for %s' % instance.pk)
-        return
+    if waffle.switch_is_active('video-encode'):
+        # Do the video encoding.
+        try:
+            video_file = video.get_encoded(amo.ADDON_PREVIEW_SIZES[1])
+        except Exception:
+            log.info('Error encoding video for %s' % instance.pk)
+            return
 
     # Do the thumbnail next, this will be the signal that the
     # encoding has finished.
     try:
         thumbnail_file = video.get_screenshot(amo.ADDON_PREVIEW_SIZES[0])
     except Exception:
         # We'll have this file floating around because the video
-        # encoded successfully.
-        os.remove(video_file)
+        # encoded successfully, or something has gone wrong in which case
+        # we don't want the file around anyway.
+        if waffle.switch_is_active('video-encode'):
+            os.remove(video_file)
         log.info('Error making thumbnail for %s' % instance.pk)
         return
 
+    for path in (instance.thumbnail_path, instance.image_path):
+        dirs = os.path.dirname(path)
+        if not os.path.exists(dirs):
+            os.makedirs(dirs)
+
     shutil.move(thumbnail_file, instance.thumbnail_path)
-    shutil.move(video_file, instance.image_path)
+    if waffle.switch_is_active('video-encode'):
+        # Move the file over, removing the temp file.
+        shutil.move(video_file, instance.image_path)
+    else:
+        # We didn't re-encode the file.
+        shutil.copyfile(src, instance.image_path)
+
     instance.sizes = {'thumbnail': amo.ADDON_PREVIEW_SIZES[0],
                       'image': amo.ADDON_PREVIEW_SIZES[1]}
     instance.save()

lib/video/tests.py

@@ -2,11 +2,13 @@
 import stat
 import tempfile
 
-from mock import Mock
+from mock import Mock, patch
 
 from nose import SkipTest
 from nose.tools import eq_
 
+import waffle
+
 import amo
 import amo.tests
 from amo.tests.test_helpers import get_image_path
@@ -83,13 +85,22 @@ def test_encoded(self):
 class TestTask(amo.tests.TestCase):
 
     def setUp(self):
+        waffle.models.Switch.objects.create(name='video-encode', active=True)
         self.mock = Mock()
         self.mock.thumbnail_path = tempfile.mkstemp()[1]
         self.mock.image_path = tempfile.mkstemp()[1]
         self.mock.pk = 1
         if not ffmpeg.Video('').encoder_available():
             raise SkipTest
 
+    @patch('lib.video.ffmpeg.Video.get_encoded')
+    def test_resize_video_no_encode(self, get_encoded):
+        waffle.models.Switch.objects.update(name='video-encode', active=False)
+        resize_video(files['good'], self.mock)
+        assert not get_encoded.called
+        assert isinstance(self.mock.sizes, dict)
+        assert self.mock.save.called
+
     def test_resize_video(self):
         resize_video(files['good'], self.mock)
         assert isinstance(self.mock.sizes, dict)

media/js/common/upload-image.js

@@ -94,12 +94,14 @@ $.fn.objectUrl = function(offset) {
             instance_id++;
             outstanding_uploads++;
 
-            // Make sure it's images only.
-            if(file.type != 'image/jpeg' && file.type != 'image/png') {
+            if($upload_field.attr('data-allowed-types').split('|').indexOf(file.type) < 0) {
                 var errors;
                 if (typeof $upload_field.attr('multiple') !== 'undefined') {
                     // If we have a `multiple` attribute, assume not an icon.
                     errors = [gettext("Images must be either PNG or JPG.")];
+                    if ($upload_field.attr('data-allowed-types').indexOf('video') > -1) {
+                       errors.push([gettext("Videos must be WEBM.")]);
+                    }
                 } else {
                     errors = [gettext("Icons must be either PNG or JPG.")];
                 }

migrations/353-waffle-video-encode.sql

@@ -0,0 +1,6 @@
+INSERT INTO waffle_switch_amo (name, active, note)
+    VALUES ('video-encode', 0,
+            'Encode videos when they get uploaded.');
+INSERT INTO waffle_switch_mkt (name, active, note)
+    VALUES ('video-encode', 0,
+            'Encode videos when they get uploaded.');