codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Fix progress reporting with multiple services running

Browse Source
This commit is contained in:
adam-m
2012-01-27 14:38:35 -05:00
parent 80f3973371
commit 6e886bbd11
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@@ -547,20 +547,20 @@ public class IngestManager {
try {
service.process(unit.content);
//check if new files enqueued
int newImages = getNumImages();
if (newImages > numImages) {
numImages = newImages + processedImages + 1;
progress.switchToIndeterminate();
progress.switchToDeterminate(numImages);
}
progress.progress("Images (" + service.getName() + ")", ++processedImages);
--numImages;
} catch (Exception e) {
logger.log(Level.INFO, "Exception from service: " + service.getName(), e);
stats.addError(service);
}
//check if new files enqueued
int newImages = getNumImages();
if (newImages > numImages) {
numImages = newImages + processedImages + 1;
progress.switchToIndeterminate();
progress.switchToDeterminate(numImages);
}
progress.progress("Images (" + service.getName() + ")", ++processedImages);
--numImages;
}
}
@@ -578,21 +578,21 @@ public class IngestManager {
}
try {
service.process(unit.content);
int newFsContents = getNumFsContents();
if (newFsContents > numFsContents) {
//update progress bar if new enqueued
numFsContents = newFsContents + processedFiles + 1;
progress.switchToIndeterminate();
progress.switchToDeterminate(numFsContents);
}
progress.progress("Files (" + service.getName() + ")", ++processedFiles);
--numFsContents;
} catch (Exception e) {
logger.log(Level.INFO, "Exception from service: " + service.getName(), e);
stats.addError(service);
}
}
int newFsContents = getNumFsContents();
if (newFsContents > numFsContents) {
//update progress bar if new enqueued
numFsContents = newFsContents + processedFiles + 1;
progress.switchToIndeterminate();
progress.switchToDeterminate(numFsContents);
}
progress.progress("Files", ++processedFiles);
--numFsContents;
}
logger.log(Level.INFO, "Done background processing");
return null;