Use mimetype instead of extensions for file type wherever it is used

boards/migrations/0059_auto_20170227_1156.py

@@ -0,0 +1,31 b''
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-27 09:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.db.models import Q
+from django.db import models
+from boards.utils import get_file_mimetype
+
+
+class Migration(migrations.Migration):
+
+    def extension_to_mimetype(apps, schema_editor):
+        Attachment = apps.get_model('boards', 'Attachment')
+        for attachment in Attachment.objects.filter(Q(url='') | Q(url=None)):
+            attachment.mimetype = get_file_mimetype(attachment.file)
+            attachment.save(update_fields=['mimetype'])
+            attachment.file.close()
+
+    dependencies = [
+        ('boards', '0058_auto_20170224_2310'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='attachment',
+            name='mimetype',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.RunPython(extension_to_mimetype),
+    ]

boards/models/attachment/__init__.py

@@ -8,7 +8,8 b' from django.db import models'
 from boards import utils
 from boards.models.attachment.viewers import get_viewers, AbstractViewer, \
     FILE_TYPES_IMAGE
-from boards.utils import get_upload_filename, get_extension, cached_result
+from boards.utils import get_upload_filename, get_extension, cached_result, \
+        get_file_mimetype
 
 
 class AttachmentManager(models.Manager):
@@ -16,8 +17,7 b' class AttachmentManager(models.Manager):'
         file_hash = utils.get_file_hash(file)
         attachment = self.get_existing_duplicate(file_hash, file)
         if not attachment:
-            # FIXME Use full mimetype here, need to modify viewers too
-            file_type = get_extension(file.name)
+            file_type = get_file_mimetype(file)
             attachment = self.create(file=file, mimetype=file_type,
                                      hash=file_hash)
 
@@ -106,7 +106,7 b' class Attachment(models.Model):'
         ordering = ('id',)
 
     file = models.FileField(upload_to=get_upload_filename, null=True)
-    mimetype = models.CharField(max_length=50, null=True)
+    mimetype = models.CharField(max_length=200, null=True)
     hash = models.CharField(max_length=36, null=True)
     alias = models.TextField(unique=True, null=True)
     url = models.TextField(blank=True, default='')
@@ -144,11 +144,15 b' class Attachment(models.Model):'
 
     @cached_result()
     def get_preview_size(self):
+        size = 200, 150
         if self.mimetype in FILE_TYPES_IMAGE:
             preview_path = self.file.path.replace('.', '.200x150.')
-            return get_image_dimensions(preview_path)
-        else:
-            return 200, 150
+            try:
+                size = get_image_dimensions(preview_path)
+            except Exception:
+                pass
+
+        return size
 
     def is_internal(self):
         return self.url is None or len(self.url) == 0

boards/models/attachment/viewers.py

@@ -19,30 +19,31 b" FILE_FILEFORMAT = 'images/fileformats/{}"
 
 
 FILE_TYPES_VIDEO = (
-    'webm',
-    'mp4',
-    'mpeg',
-    'ogv',
+    'video/webm',
+    'video/mp4',
+    'video/mpeg',
+    'video/ogv',
 )
-FILE_TYPE_SVG = 'svg'
+FILE_TYPE_SVG = 'image/svg'
 FILE_TYPES_AUDIO = (
-    'ogg',
-    'mp3',
-    'opus',
+    'audio/ogg',
+    'audio/mp3',
+    'audio/opus',
+    'audio/flac',
 )
 FILE_TYPES_IMAGE = (
-    'jpeg',
-    'jpg',
-    'png',
-    'bmp',
-    'gif',
+    'image/jpeg',
+    'image/jpg',
+    'image/png',
+    'image/bmp',
+    'image/gif',
 )
 
 PLAIN_FILE_FORMATS = {
-    'zip': 'archive',
-    'tar': 'archive',
+    'application/zip': 'archive',
+    'application/x-tar': 'archive',
     'gz': 'archive',
-    'mid' : 'midi',
+    'audio/midi' : 'midi',
 }
 
 URL_PROTOCOLS = {