global: better mimetype propagation

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

invenio_files_rest/helpers.py

@@ -50,6 +50,8 @@ def send_stream(stream, filename, size, mtime, mimetype=None, restricted=False,
     headers = Headers()
     if as_attachment:
         headers.add('Content-Disposition', 'attachment', filename=filename)
+    else:
+        headers.add('Content-Disposition', 'inline')
     headers['Content-Length'] = size
     headers['Content-MD5'] = content_md5
 

invenio_files_rest/models.py

@@ -493,11 +493,11 @@ def copy_contents(self, fileinstance, progress_callback=None, **kwargs):
             *self.storage(**kwargs).copy(
                 fileinstance, progress_callback=progress_callback))
 
-    def send_file(self, **kwargs):
+    def send_file(self, mimetype=None, **kwargs):
         """Send file to client."""
         if not self.readable:
             raise ValueError('File instance is not readable.')
-        return self.storage(**kwargs).send_file()
+        return self.storage(**kwargs).send_file(mimetype=mimetype)
 
     def set_uri(self, uri, size, checksum, readable=True, writable=False,
                 storage_class=None):

invenio_files_rest/views.py

@@ -26,6 +26,8 @@
 
 from __future__ import absolute_import, print_function
 
+import mimetypes
+
 from flask import Blueprint, abort, current_app, request, url_for
 from flask_login import current_user
 from invenio_db import db
@@ -471,7 +473,8 @@ def send_object(cls, bucket_id, key, version_id=None, expected_chksum=None,
             current_app.logger.warning(
                 'File checksum mismatch detected.', extra=logger_data)
 
-        return obj.file.send_file(mimetype=obj.mimetype)
+        mimetype = obj.mimetype or mimetypes.guess_type(obj.key)[0]
+        return obj.file.send_file(mimetype=mimetype)
 
     @use_kwargs(get_args)
     def get(self, bucket_id, key, version_id=None, **kwargs):