Add automatic content type detection.

Author: null-dev

.idea/workspace.xml

@@ -36,11 +36,12 @@ server.ip = The IP which the server will bind to. Defaults to: 0.0.0.0
 master.serverListFile = The location of the server list. Defaults to: WLSServers.json in the working directory
 master.listDirectories = Whether or not the master server will list directories (the slaves still will). Defaults to: true
 slave.rootDir = The location of the directory from where the files will be served from. Defaults to the working directory
+slave.useSlowTypeDetection = Whether or not to use slow file type detection (true/false). Will also increase memory usage. Defaults to: false
 ```
 
 ## Server List File ##
 The server list is stored in the file specified by: `master.serverListFile`
-It is in JSON format (in a weird way), here is an example:
+It is in JSON format, here is an example:
 ```
 {
   "servers": [

README.md

@@ -6,6 +6,7 @@
 import spark.Response;
 import spark.Route;
 import xyz.nulldev.wls.server.SlaveServerImpl;
+import xyz.nulldev.wls.utils.TypeDetector;
 
 import javax.servlet.ServletOutputStream;
 import java.io.BufferedInputStream;
@@ -20,6 +21,7 @@
  * Author: nulldev
  */
 public class GetFileRoute implements Route {
+    private TypeDetector typeDetector = new TypeDetector();
 
     private Logger logger = LoggerFactory.getLogger(GetFileRoute.class);
 
@@ -83,12 +85,17 @@ public Object handle(Request request, Response response) throws Exception {
         response.status(statusCode);
         response.header("Content-Length", String.valueOf(fileEnd - fileStart + 1));
         response.header("Content-Range", "bytes " + fileStart + "-" + fileEnd + "/" + length);
+
         //Allow download forcing
         if(request.queryParams().contains("force-download")
                 && Objects.equals(request.queryParams("force-download").toUpperCase(), "TRUE")) {
             response.type("application/force-download");
             response.header("Content-Transfer-Encoding", "binary");
             response.header("Content-Disposition","attachment; filename=\"" + resolvedFile.getName() + "\"");
+        } else {
+            String detectedType = typeDetector.detectType(resolvedFile);
+            if(detectedType != null)
+                response.type(detectedType);
         }
         try (BufferedInputStream stream
                      = new BufferedInputStream(new FileInputStream(resolvedFile));

src/main/java/xyz/nulldev/wls/routes/slave/GetFileRoute.java

@@ -0,0 +1,79 @@
+package xyz.nulldev.wls.utils;
+
+import org.apache.tika.detect.DefaultDetector;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.io.TikaInputStream;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import xyz.nulldev.wls.WebLinkedServer;
+
+import java.io.*;
+
+public class TypeDetector {
+    private Detector detector;
+    private boolean useSlowDetection = false;
+
+    private Logger logger = LoggerFactory.getLogger(TypeDetector.class);
+
+    public TypeDetector() {
+        String useSlowDetectionString
+                = WebLinkedServer
+                    .getCONFIGURATION()
+                    .getConfig()
+                    .getProperty("slave.useSlowTypeDetection", "false")
+                    .trim();
+        detector = new DefaultDetector();
+        if(useSlowDetectionString.equalsIgnoreCase("true")
+                || useSlowDetectionString.equalsIgnoreCase("yes")) {
+            useSlowDetection = true;
+        }
+    }
+
+    public boolean isUseSlowDetection() {
+        return useSlowDetection;
+    }
+
+    public void setUseSlowDetection(boolean useSlowDetection) {
+        this.useSlowDetection = useSlowDetection;
+    }
+
+    public String detectType(File file) {
+        InputStream stream = null;
+        Metadata metadata = null;
+
+        //Use TikaInputStream if we want slow detection
+        if(useSlowDetection) {
+            metadata = new Metadata();
+            try {
+                stream = TikaInputStream.get(file.toPath(), metadata);
+            } catch (IOException e) {
+                logger.warn("Cannot load slow detection engine, using fast detection!", e);
+                metadata = null;
+            }
+        }
+
+        if(stream == null) {
+            try {
+                stream = new BufferedInputStream(new FileInputStream(file));
+            } catch (FileNotFoundException e) {
+                logger.warn("File was removed while detecting it's type!", e);
+                return null;
+            }
+        }
+        if(metadata == null) {
+            metadata = new Metadata();
+            metadata.set(Metadata.RESOURCE_NAME_KEY, file.getName());
+        }
+
+        MediaType type;
+        try(InputStream theStream = stream) {
+            type = detector.detect(theStream, metadata);
+        } catch (IOException e) {
+            logger.warn("Could not detect type of '" + file.getName() + "'!", e);
+            return null;
+        }
+        return type.toString();
+    }
+}

src/main/java/xyz/nulldev/wls/utils/TypeDetector.java

@@ -1,3 +1,3 @@
 #-=[WebLinkedServer Configuration]=-
-#Mon Jan 30 14:01:43 EST 2017
+#Mon Jan 30 15:22:20 EST 2017
 server.role=MASTER

test/master/WebLinkedServer.config

@@ -1,4 +1,4 @@
 #-=[WebLinkedServer Configuration]=-
-#Mon Jan 30 13:57:08 EST 2017
+#Mon Jan 30 15:22:22 EST 2017
 server.port=1918
 server.role=SLAVE

test/slave/WebLinkedServer.config

@@ -1,4 +1,4 @@
 #-=[WebLinkedServer Configuration]=-
-#Mon Jan 30 13:57:06 EST 2017
+#Mon Jan 30 15:09:25 EST 2017
 server.port=1917
 server.role=SLAVE