Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

wip(utils): mime type fix
All checks were successful
Deploy Production Server / if_merged (pull_request) Successful in 7m2s
Details

Browse Source
This commit is contained in:
Thibaut Valentin
2025-02-04 17:05:56 +01:00
parent 1ccbd92c34
commit f5dbe0b6af
2 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/fr/titionfire/ffsaf/utils/Utils.java
View File

@@ -5,10 +5,7 @@ import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jodd.net.MimeTypes;
import net.sf.jmimemagic.Magic;
import net.sf.jmimemagic.MagicException;
import net.sf.jmimemagic.MagicMatchNotFoundException;
import net.sf.jmimemagic.MagicParseException;
import org.apache.tika.Tika;
import org.jboss.logging.Logger;
import java.io.*;
@@ -82,8 +79,9 @@ public class Utils {
try (InputStream is = new BufferedInputStream(new ByteArrayInputStream(input))) {
String mimeType;
try {
mimeType = Magic.getMagicMatch(input, false).getMimeType();
} catch (MagicParseException | MagicMatchNotFoundException | MagicException e) {
Tika tika = new Tika();
mimeType = tika.detect(is);// Magic.getMagicMatch(input, false).getMimeType();
} catch (IOException e) {
mimeType = URLConnection.guessContentTypeFromStream(is);
}
String[] detectedExtensions = MimeTypes.findExtensionsByMimeTypes(mimeType, false);