StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

still working on mime problem

Browse Source
This commit is contained in:
Stephan Richter
2020-11-13 23:48:40 +01:00
parent f544699f49
commit 5c349d8fc2
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>0.11.19</version> <version>0.11.20</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

2
resources/logback.xml
View File

@@ -7,7 +7,7 @@
</appender> </appender>
<logger name="de.srsoftware.web4rail" level="DEBUG"/> <logger name="de.srsoftware.web4rail" level="DEBUG"/>
<logger name="de.srsoftware.web4rail.Application" level="INFO"/> <logger name="de.srsoftware.web4rail.Application" level="DEBUG"/>
<logger name="de.srsoftware.web4rail.Command" level="INFO"/> <logger name="de.srsoftware.web4rail.Command" level="INFO"/>
<logger name="de.srsoftware.web4rail.ControlUnit" level="INFO"/> <logger name="de.srsoftware.web4rail.ControlUnit" level="INFO"/>

23
src/main/java/de/srsoftware/web4rail/Application.java
View File

@@ -8,13 +8,17 @@ import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.net.FileNameMap;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.URI; import java.net.URI;
import java.net.URLConnection;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Vector;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -206,10 +210,9 @@ public class Application extends BaseClass{
File file = new File(System.getProperty("user.dir")+"/resources"+uri); File file = new File(System.getProperty("user.dir")+"/resources"+uri);
LOG.debug("requesting file: {}",file); LOG.debug("requesting file: {}",file);
if (file.exists()) { if (file.exists()) {
LOG.debug("found..."); String mime = mimeOf(file);
String ct = Files.probeContentType(file.toPath()); LOG.debug("Mime type: {}",mime);
LOG.debug("Content-Type: {}",ct); client.getResponseHeaders().add("Content-Type", mime);
client.getResponseHeaders().add("Content-Type", ct);
LOG.debug("Length: {}",file.length()); LOG.debug("Length: {}",file.length());
client.sendResponseHeaders(200, file.length()); client.sendResponseHeaders(200, file.length());
LOG.debug("Sent headers..."); LOG.debug("Sent headers...");
@@ -226,6 +229,18 @@ public class Application extends BaseClass{
sendError(client,404,t("Could not find \"{}\"",uri)); sendError(client,404,t("Could not find \"{}\"",uri));
} }
private static String mimeOf(File file) throws IOException {
String[] parts = file.toString().split("\\.");
switch (parts[parts.length-1].toLowerCase()) {
case "js":
return "application/javascript";
case "css":
return "text/css";
}
LOG.warn("No conten type stored for {}!",file);
return Files.probeContentType(file.toPath());
}
/** /**
* sends a response to a given client * sends a response to a given client
* @param client * @param client