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

Ingest progress snapshot fix for file ingest modules

Browse Source
This commit is contained in:
Richard Cordovano 2021-03-19 15:19:52 -04:00
parent 33ae5b4f3f
commit e43bb45e77
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/org/sleuthkit/autopsy/ingest/FileIngestPipeline.java
View File

@ -61,10 +61,17 @@ final class FileIngestPipeline extends IngestTaskPipeline<FileIngestTask> {
@Override
void completeTask(FileIngestTask task) throws IngestTaskPipelineException {
ingestManager.setIngestTaskProgress(task, "Saving Files"); //NON-NLS
AbstractFile file = null;
try {
file = task.getFile();
} catch (TskCoreException ex) {
/*
* In practice, the file should have already been lazily looked up
* and cached in the file task when the task was enqueued by the
* ingest tasks scheduler. Therefore there is no case database query
* here and there should be no TskCoreException.
*/
throw new IngestTaskPipelineException(String.format("Failed to get file (file objId = %d)", task.getFileId()), ex); //NON-NLS
}
try {
@ -118,7 +125,6 @@ final class FileIngestPipeline extends IngestTaskPipeline<FileIngestTask> {
ingestManager.setIngestTaskProgress(task, getDisplayName());
ingestJobPipeline.setCurrentFileIngestModule(getDisplayName(), file.getName());
ProcessResult result = module.process(file);
ingestManager.setIngestTaskProgress(task, getDisplayName());
if (result == ProcessResult.ERROR) {
throw new IngestModuleException(String.format("%s experienced an error analyzing %s (file objId = %d)", getDisplayName(), file.getName(), file.getId())); //NON-NLS
}

36
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -769,24 +769,33 @@ public class IngestManager implements IngestProgressSnapshotProvider {
}
/**
* Updates the ingest progress snapshot for an ingest job when a data source
* level ingest module starts processing a data source from a data source
* ingest task.
* Updates the ingest progress snapshot for data source ingest task. This
* method should be called every time a new ingest module starts working on
* the task.
*
* @param task The data source ingest task.
* @param currentModuleName The display name of the current data source
* level ingest module.
* @param currentModuleName The display name of the currently processing
* module.
*/
void setIngestTaskProgress(DataSourceIngestTask task, String currentModuleName) {
ingestThreadActivitySnapshots.put(task.getThreadId(), new IngestThreadActivitySnapshot(task.getThreadId(), task.getIngestJobPipeline().getId(), currentModuleName, task.getDataSource()));
IngestThreadActivitySnapshot prevSnap = ingestThreadActivitySnapshots.get(task.getThreadId());
IngestThreadActivitySnapshot newSnap = new IngestThreadActivitySnapshot(task.getThreadId(), task.getIngestJobPipeline().getId(), currentModuleName, task.getDataSource());
ingestThreadActivitySnapshots.put(task.getThreadId(), newSnap);
/*
* Update the total run time for the PREVIOUS ingest module, which has
* now finished its processing for the task.
*/
incrementModuleRunTime(prevSnap.getActivity(), newSnap.getStartTime().getTime() - prevSnap.getStartTime().getTime());
}
/**
* Updates the ingest progress snapshot for an ingest job when a file ingest
* module starts or finishes processing a file from a file ingest task.
* Updates the ingest progress snapshot for data source ingest task. This
* method should be called every time a new ingest module starts working on
* the task.
*
* @param task The file ingest task.
* @param currentModuleName The display name of the current file ingest
* @param currentModuleName The display name of the currently processing
* module.
*/
void setIngestTaskProgress(FileIngestTask task, String currentModuleName) {
@ -805,6 +814,11 @@ public class IngestManager implements IngestProgressSnapshotProvider {
newSnap = new IngestThreadActivitySnapshot(task.getThreadId(), task.getIngestJobPipeline().getId(), currentModuleName, task.getDataSource());
}
ingestThreadActivitySnapshots.put(task.getThreadId(), newSnap);
/*
* Update the total run time for the PREVIOUS ingest module, which has
* now finished its processing for the task.
*/
incrementModuleRunTime(prevSnap.getActivity(), newSnap.getStartTime().getTime() - prevSnap.getStartTime().getTime());
}
@ -812,7 +826,7 @@ public class IngestManager implements IngestProgressSnapshotProvider {
* Updates the ingest progress snapshot for an ingest job when a data source
* level ingest task is completed.
*
* @param task The data source level ingest job task that was completed.
* @param task The ingest task.
*/
void setIngestTaskProgressCompleted(DataSourceIngestTask task) {
ingestThreadActivitySnapshots.put(task.getThreadId(), new IngestThreadActivitySnapshot(task.getThreadId()));
@ -822,7 +836,7 @@ public class IngestManager implements IngestProgressSnapshotProvider {
* Updates the ingest progress snapshot for an ingest job when a file ingest
* task is completed.
*
* @param task The file ingest task.
* @param task The ingest task.
*/
void setIngestTaskProgressCompleted(FileIngestTask task) {
ingestThreadActivitySnapshots.put(task.getThreadId(), new IngestThreadActivitySnapshot(task.getThreadId()));