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

Merge pull request #2351 from wishdasher/AUT-2228_keywordsearch_cleanups

Browse Source 
Changed requested code
This commit is contained in:
Richard Cordovano 2016-10-05 12:12:18 -04:00 committed by GitHub
commit 044222ec83
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
View File

@ -111,6 +111,13 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
}; };
private static final Map<Long, Map<Long, IngestStatus>> ingestStatus = new HashMap<>(); //guarded by itself private static final Map<Long, Map<Long, IngestStatus>> ingestStatus = new HashMap<>(); //guarded by itself
/**
* Records the ingest status for a given file for a given ingest job. Used
* for final statistics at the end of the job.
* @param ingestJobId id of ingest job
* @param fileId id of file
* @param status ingest status of the file
*/
private static void putIngestStatus(long ingestJobId, long fileId, IngestStatus status) { private static void putIngestStatus(long ingestJobId, long fileId, IngestStatus status) {
synchronized (ingestStatus) { synchronized (ingestStatus) {
Map<Long, IngestStatus> ingestStatusForJob = ingestStatus.get(ingestJobId); Map<Long, IngestStatus> ingestStatusForJob = ingestStatus.get(ingestJobId);
@ -118,7 +125,6 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
ingestStatusForJob = new HashMap<>(); ingestStatusForJob = new HashMap<>();
ingestStatus.put(ingestJobId, ingestStatusForJob); ingestStatus.put(ingestJobId, ingestStatusForJob);
} }
ingestStatusForJob.put(fileId, status); ingestStatusForJob.put(fileId, status);
ingestStatus.put(ingestJobId, ingestStatusForJob); ingestStatus.put(ingestJobId, ingestStatusForJob);
} }
@ -550,8 +556,12 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
if (context.fileIngestIsCancelled()) { if (context.fileIngestIsCancelled()) {
return; return;
} }
if (fileType.equals("application/octet-stream")) {
extractStringsAndIndex(aFile);
return;
}
if (!extractTextAndIndex(aFile, fileType)) { if (!extractTextAndIndex(aFile, fileType)) {
logger.log(Level.WARNING, "Failed to extract text and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()}); //NON-NLS logger.log(Level.WARNING, "Text extractor not found for file. Extracting strings only. File: ''{0}'' (id:{1}).", new Object[]{aFile.getName(), aFile.getId()}); //NON-NLS
putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT); putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
} else { } else {
putIngestStatus(jobId, aFile.getId(), IngestStatus.TEXT_INGESTED); putIngestStatus(jobId, aFile.getId(), IngestStatus.TEXT_INGESTED);