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

clear ingest messages in execute() (earlier) if no ingest is running

Browse Source
This commit is contained in:
adam-m 2012-02-28 17:58:38 -05:00
commit 6d25d38b9f
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,8 +130,13 @@ public class IngestManager {
void execute(final Collection<IngestServiceAbstract> services, final Collection<Image> images) { void execute(final Collection<IngestServiceAbstract> services, final Collection<Image> images) {
logger.log(Level.INFO, "Will enqueue number of images: " + images.size()); logger.log(Level.INFO, "Will enqueue number of images: " + images.size());
if (!isIngestRunning()) {
ui.clearMessages();
}
queueWorker = new EnqueueWorker(services, images); queueWorker = new EnqueueWorker(services, images);
queueWorker.execute(); queueWorker.execute();
ui.restoreMessages(); ui.restoreMessages();
//logger.log(Level.INFO, "Queues: " + imageQueue.toString() + " " + fsContentQueue.toString()); //logger.log(Level.INFO, "Queues: " + imageQueue.toString() + " " + fsContentQueue.toString());
} }
@ -164,10 +169,6 @@ public class IngestManager {
logger.log(Level.INFO, "Image queue: " + this.imageQueue.toString()); logger.log(Level.INFO, "Image queue: " + this.imageQueue.toString());
logger.log(Level.INFO, "File queue: " + this.fsContentQueue.toString()); logger.log(Level.INFO, "File queue: " + this.fsContentQueue.toString());
if (! isIngestRunning()) {
ui.clearMessages();
}
//image ingesters //image ingesters
// cycle through each image in the queue // cycle through each image in the queue
while (hasNextImage()) { while (hasNextImage()) {
@ -338,14 +339,13 @@ public class IngestManager {
if (service.getType() == IngestServiceAbstract.ServiceType.FsContent) { if (service.getType() == IngestServiceAbstract.ServiceType.FsContent) {
synchronized (queuesLock) { synchronized (queuesLock) {
if (fsContentQueue.hasServiceEnqueued((IngestServiceFsContent)service) ) { if (fsContentQueue.hasServiceEnqueued((IngestServiceFsContent) service)) {
//has work enqueued, so running //has work enqueued, so running
return true; return true;
} } else {
else { //not in the queue, but could still have bkg work running
//not in the queue, but could still have bkg work running return service.hasBackgroundJobsRunning();
return service.hasBackgroundJobsRunning(); }
}
} }
} else { } else {
@ -568,7 +568,7 @@ public class IngestManager {
*/ */
private static class FsContentPriotity { private static class FsContentPriotity {
enum Priority { enum Priority {
LOW, MEDIUM, HIGH LOW, MEDIUM, HIGH
}; };
@ -713,8 +713,9 @@ public class IngestManager {
break; break;
} }
} }
if (found == true) if (found == true) {
break; break;
}
} }
return found; return found;
} }