2 files changed, 6 insertions, 3 deletions

diff --git a/main.py b/main.py
index 033d8b6..1a99ad4 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,7 @@
 import os
 import hashlib
 import hmac
+import mimetypes as mtype
 
 from libmat2 import parser_factory
 
@@ -60,7 +61,9 @@ def upload_file():
 
     mimetypes = set()
     for parser in parser_factory._get_parsers():
-        mimetypes = mimetypes | parser.mimetypes
+        mimetypes |= set(map(mtype.guess_extension, parser.mimetypes))
+    # since `guess_extension` might return `None`, we need to filter it out
+    mimetypes = sorted(filter(None, mimetypes))
 
     if request.method == 'POST':
         if 'file' not in request.files: # check if the post request has the file part
diff --git a/tests.py b/tests.py
index 0289755..4c85a74 100644
--- a/tests.py
+++ b/tests.py
@@ -21,8 +21,8 @@ class FlaskrTestCase(unittest.TestCase):
 
     def test_check_mimetypes(self):
         rv = self.app.get('/')
-        self.assertIn(b'application/zip', rv.data)
-        self.assertIn(b'audio/x-flac', rv.data)
+        self.assertIn(b'.torrent', rv.data)
+        self.assertIn(b'.ods', rv.data)
 
     def test_get_download_dangerous_file(self):
         rv = self.app.get('/download/1337/\..\filename')