mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 08:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't load file if not needed

Browse Source
This commit is contained in:
apriestman 2021-06-22 10:02:49 -04:00
parent a9ac434e88
commit e36417be26
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetector.java
View File

@ -51,7 +51,7 @@ public class FileTypeDetector {
private final List<FileType> userDefinedFileTypes; private final List<FileType> userDefinedFileTypes;
private final List<FileType> autopsyDefinedFileTypes; private final List<FileType> autopsyDefinedFileTypes;
private static SortedSet<String> tikaDetectedTypes; private static SortedSet<String> tikaDetectedTypes;
private final int defaultBufferSize = 2048; // Number of bytes to initially read from the file. Should cover most signatures. private final int defaultBufferSize = 600; // Number of bytes to initially read from the file. Should cover most signatures.
private static final Object timingLock = new Object(); private static final Object timingLock = new Object();
private long totalFiles = 0; private long totalFiles = 0;
@ -219,7 +219,7 @@ public class FileTypeDetector {
// Proceed for now - the error will likely get logged next time the file is read. // Proceed for now - the error will likely get logged next time the file is read.
bufLen = 0; bufLen = 0;
} }
/* /*
* If the file is a regular file, give precedence to user-defined custom * If the file is a regular file, give precedence to user-defined custom
* file types. * file types.
@ -314,7 +314,7 @@ public class FileTypeDetector {
*/ */
file.setMIMEType(mimeType); file.setMIMEType(mimeType);
long endTime = java.lang.System.currentTimeMillis(); long endTime = java.lang.System.currentTimeMillis();
long elapsed = endTime - startTime; long elapsed = endTime - startTime;
synchronized(timingLock) { synchronized(timingLock) {
totalFiles++; totalFiles++;

5
Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
View File

@ -128,6 +128,11 @@ public class FileTypeIdIngestModule implements FileIngestModule {
* of CustomFileTypesManager. * of CustomFileTypesManager.
*/ */
private FileType detectUserDefinedFileType(AbstractFile file) throws CustomFileTypesManager.CustomFileTypesException { private FileType detectUserDefinedFileType(AbstractFile file) throws CustomFileTypesManager.CustomFileTypesException {
if (CustomFileTypesManager.getInstance().getUserDefinedFileTypes().isEmpty()) {
return null;
}
/* /*
* Read in the beginning of the file once. * Read in the beginning of the file once.
*/ */