From 9989a8967ad4a740018eaa62dc3ee0a68750f556 Mon Sep 17 00:00:00 2001
From: jendib <benjamin.gam@gmail.com>
Date: Sun, 18 Aug 2013 14:48:48 +0200
Subject: [PATCH] Send the correct MIME type from /file/id/data

---
 .../java/com/sismics/docs/rest/resource/FileResource.java  | 7 ++++++-
 docs-web/src/main/webapp/partial/docs/settings.log.html    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
index bdf0c227..dd36e662 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
@@ -41,6 +41,7 @@ import com.sismics.rest.exception.ClientException;
 import com.sismics.rest.exception.ForbiddenClientException;
 import com.sismics.rest.exception.ServerException;
 import com.sismics.rest.util.ValidationUtil;
+import com.sismics.util.mime.MimeType;
 import com.sismics.util.mime.MimeTypeUtil;
 import com.sun.jersey.multipart.FormDataBodyPart;
 import com.sun.jersey.multipart.FormDataParam;
@@ -304,17 +305,21 @@ public class FileResource extends BaseResource {
         
         // Get the stored file
         java.io.File storedfile;
+        String mimeType;
         if (size != null) {
             storedfile = Paths.get(DirectoryUtil.getStorageDirectory().getPath(), fileId + "_" + size).toFile();
+            mimeType = MimeType.IMAGE_JPEG; // Thumbnails are JPEG
             if (!storedfile.exists()) {
                 storedfile = new java.io.File(getClass().getResource("/image/file.png").getFile());
+                mimeType = MimeType.IMAGE_PNG;
             }
         } else {
             storedfile = Paths.get(DirectoryUtil.getStorageDirectory().getPath(), fileId).toFile();
+            mimeType = file.getMimeType();
         }
 
         return Response.ok(storedfile)
-                .header("Content-Type", file.getMimeType())
+                .header("Content-Type", mimeType)
                 .header("Expires", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z").format(new Date().getTime() + 3600000 * 24 * 7))
                 .build();
     }
diff --git a/docs-web/src/main/webapp/partial/docs/settings.log.html b/docs-web/src/main/webapp/partial/docs/settings.log.html
index 624a830b..b66ef248 100644
--- a/docs-web/src/main/webapp/partial/docs/settings.log.html
+++ b/docs-web/src/main/webapp/partial/docs/settings.log.html
@@ -9,7 +9,7 @@
   </thead>
   <tbody>
     <tr ng-repeat="log in logs"
-      ng-class="{ info: log.level == 'INFO' || log.level == 'DEBUG', warn: log.level == 'WARN', error: log.level == 'ERROR' || log.level == 'FATAL' }">
+      ng-class="{ info: log.level == 'INFO' || log.level == 'DEBUG', warning: log.level == 'WARN', error: log.level == 'ERROR' || log.level == 'FATAL' }">
       <td>{{ log.date | date: 'yyyy-MM-dd HH:mm' }}</td>
       <td>{{ log.tag }}</td>
       <td class="cell-message">{{ log.message }}</td>