mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-17 18:17:43 +00:00
fix video/supoprted mimetype confusion
This commit is contained in:
parent
8c224393e5
commit
1138ed5f89
@ -44,6 +44,7 @@ public enum FileTypeUtils {
|
|||||||
instance;
|
instance;
|
||||||
|
|
||||||
private static final Set<String> supportedMimeTypes = new HashSet<>();
|
private static final Set<String> supportedMimeTypes = new HashSet<>();
|
||||||
|
private static final Set<String> videoMimeTypes = new HashSet<>();
|
||||||
|
|
||||||
public static Set<String> getAllSupportedMimeTypes() {
|
public static Set<String> getAllSupportedMimeTypes() {
|
||||||
return Collections.unmodifiableSet(supportedMimeTypes);
|
return Collections.unmodifiableSet(supportedMimeTypes);
|
||||||
@ -65,11 +66,13 @@ public enum FileTypeUtils {
|
|||||||
|
|
||||||
supportedExtensions = Sets.union(imageExtensions, videoExtensions);
|
supportedExtensions = Sets.union(imageExtensions, videoExtensions);
|
||||||
|
|
||||||
|
videoMimeTypes.addAll(Arrays.asList("application/x-shockwave-flash"));
|
||||||
|
|
||||||
|
supportedMimeTypes.addAll(videoMimeTypes);
|
||||||
supportedMimeTypes.addAll(Stream.of(ImageIO.getReaderMIMETypes())
|
supportedMimeTypes.addAll(Stream.of(ImageIO.getReaderMIMETypes())
|
||||||
.map(String::toLowerCase)
|
.map(String::toLowerCase)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
supportedMimeTypes.addAll(Arrays.asList("application/x-shockwave-flash"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static FileTypeDetector FILE_TYPE_DETECTOR;
|
private static FileTypeDetector FILE_TYPE_DETECTOR;
|
||||||
@ -108,7 +111,7 @@ public enum FileTypeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* does the given file have drawable/supported mime type
|
||||||
*
|
*
|
||||||
* @param file
|
* @param file
|
||||||
*
|
*
|
||||||
@ -137,7 +140,10 @@ public enum FileTypeUtils {
|
|||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param file
|
/**
|
||||||
|
* is the given file a video
|
||||||
|
*
|
||||||
|
* @param file
|
||||||
*
|
*
|
||||||
* @return true if the given file has a video mime type (video/*,
|
* @return true if the given file has a video mime type (video/*,
|
||||||
* application/x-shockwave-flash, etc) or, if no mimetype is
|
* application/x-shockwave-flash, etc) or, if no mimetype is
|
||||||
@ -150,7 +156,7 @@ public enum FileTypeUtils {
|
|||||||
String mimeType = fileTypeDetector.getFileType(file);
|
String mimeType = fileTypeDetector.getFileType(file);
|
||||||
if (nonNull(mimeType)) {
|
if (nonNull(mimeType)) {
|
||||||
mimeType = mimeType.toLowerCase();
|
mimeType = mimeType.toLowerCase();
|
||||||
return mimeType.startsWith("video/") || supportedMimeTypes.contains(mimeType);
|
return mimeType.startsWith("video/") || videoMimeTypes.contains(mimeType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (TskCoreException ex) {
|
} catch (TskCoreException ex) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user