Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failed MimeType detection (#277)

Browse Source 
* Fix failed MimeType detection

* Fix failed MimeType detection

* Fix formatting
This commit is contained in:
M*C*O
2020-07-07 15:37:15 +02:00
committed by GitHub
parent 63a2b553fa
commit e4be013505
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/sheepit/client/Server.java
View File

@@ -492,8 +492,8 @@ public class Server extends Thread {
this.log.debug(checkpoint, "Server::HTTPSendFile(" + surl + "," + file1 + ")"); this.log.debug(checkpoint, "Server::HTTPSendFile(" + surl + "," + file1 + ")");
try { try {
String fileMimeType = Files.probeContentType(Paths.get(file1)); String fileMimeType = Utils.findMimeType(file1);
MediaType MEDIA_TYPE = MediaType.parse(fileMimeType); // e.g. "image/png" MediaType MEDIA_TYPE = MediaType.parse(fileMimeType); // e.g. "image/png"
RequestBody uploadContent = new MultipartBody.Builder().setType(MultipartBody.FORM) RequestBody uploadContent = new MultipartBody.Builder().setType(MultipartBody.FORM)

16
src/com/sheepit/client/Utils.java
View File

@@ -19,11 +19,14 @@
package com.sheepit.client; package com.sheepit.client;
import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.net.URLConnection;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.DigestInputStream; import java.security.DigestInputStream;
@@ -212,4 +215,17 @@ public class Utils {
return false; return false;
} }
public static String findMimeType(String file) throws IOException {
String mimeType = Files.probeContentType(Paths.get(file));
if (mimeType == null) {
InputStream stream = new BufferedInputStream(new FileInputStream(file));
mimeType = URLConnection.guessContentTypeFromStream(stream);
}
if (mimeType == null) {
mimeType = URLConnection.guessContentTypeFromName(file);
}
return mimeType;
}
} }