Merge pull request #103 from lazlolazlolazlo/contenttype

Guess the content type of a file
This commit is contained in:
Micah Lee 2014-08-18 11:08:49 -07:00
commit c6a9fa01bd

View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argparse, Queue, inspect, base64 import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argparse, Queue, inspect, base64, mimetypes
from random import randint from random import randint
from functools import wraps from functools import wraps
@ -166,6 +166,10 @@ def download(slug_candidate):
r = Response(generate()) r = Response(generate())
r.headers.add('Content-Length', filesize) r.headers.add('Content-Length', filesize)
r.headers.add('Content-Disposition', 'attachment', filename=basename) r.headers.add('Content-Disposition', 'attachment', filename=basename)
# guess content type
(content_type, _) = mimetypes.guess_type(basename, strict=False)
if content_type is not None:
r.headers.add('Content-Type', content_type)
return r return r
@app.errorhandler(404) @app.errorhandler(404)