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

Set progress bar to indeterminite while waiting for search to cancel

Browse Source
This commit is contained in:
Dick Fickling 2012-05-17 16:42:02 -04:00
parent c5fd65d14e
commit e5d75acab4
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
View File

@ -28,6 +28,7 @@ import java.util.Map;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import javax.swing.Timer; import javax.swing.Timer;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
@ -74,7 +75,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
private final Object searcherLock = new Object(); private final Object searcherLock = new Object();
private volatile int messageID = 0; private volatile int messageID = 0;
private boolean processedFiles; private boolean processedFiles;
private volatile boolean finalRunComplete = false; private volatile boolean finalSearcherDone = false;
private final String hashDBServiceName = "Hash Lookup"; private final String hashDBServiceName = "Hash Lookup";
private SleuthkitCase caseHandle = null; private SleuthkitCase caseHandle = null;
boolean initialized = false; boolean initialized = false;
@ -166,7 +167,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
currentSearcher = new Searcher(keywords, true); //final currentSearcher run currentSearcher = new Searcher(keywords, true); //final currentSearcher run
currentSearcher.execute(); currentSearcher.execute();
} else { } else {
finalRunComplete = true; finalSearcherDone = true;
managerProxy.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, this, "Completed")); managerProxy.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, this, "Completed"));
} }
@ -227,7 +228,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
} }
processedFiles = false; processedFiles = false;
finalRunComplete = false; finalSearcherDone = false;
searcherDone = true; //make sure to start the initial currentSearcher searcherDone = true; //make sure to start the initial currentSearcher
//keeps track of all results per run not to repeat reporting the same hits //keeps track of all results per run not to repeat reporting the same hits
currentResults = new HashMap<Keyword, List<ContentHit>>(); currentResults = new HashMap<Keyword, List<ContentHit>>();
@ -282,7 +283,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
@Override @Override
public boolean hasBackgroundJobsRunning() { public boolean hasBackgroundJobsRunning() {
if (currentSearcher != null && searcherDone == false) { if (currentSearcher != null && (searcherDone == false || finalSearcherDone == false)) {
return true; return true;
} else { } else {
return false; return false;
@ -524,6 +525,18 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
protected Object doInBackground() throws Exception { protected Object doInBackground() throws Exception {
logger.log(Level.INFO, "Pending start of new searcher"); logger.log(Level.INFO, "Pending start of new searcher");
progress = ProgressHandleFactory.createHandle("Keyword Search" + (finalRun ? " (Final)" : ""), new Cancellable() {
@Override
public boolean cancel() {
logger.log(Level.INFO, "Cancelling the searcher");
return Searcher.this.cancel(true);
}
});
progress.start();
progress.switchToIndeterminate();
//block to ensure previous searcher is completely done with doInBackground() //block to ensure previous searcher is completely done with doInBackground()
//even after previous searcher cancellation, we need to check this //even after previous searcher cancellation, we need to check this
synchronized (searcherLock) { synchronized (searcherLock) {
@ -531,18 +544,8 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
//make sure other searchers are not spawned //make sure other searchers are not spawned
searcherDone = false; searcherDone = false;
progress = ProgressHandleFactory.createHandle("Keyword Search", new Cancellable() {
@Override
public boolean cancel() {
logger.log(Level.INFO, "Cancelling the searcher");
finalRunComplete = true;
return Searcher.this.cancel(true);
}
});
progress.start(keywords.size());
int numSearched = 0; int numSearched = 0;
progress.switchToDeterminate(keywords.size());
for (Keyword keywordQuery : keywords) { for (Keyword keywordQuery : keywords) {
if (this.isCancelled()) { if (this.isCancelled()) {
@ -626,11 +629,6 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
List<ContentHit> contentHitsAll = newResults.get(hitTerm); List<ContentHit> contentHitsAll = newResults.get(hitTerm);
Map<FsContent, Integer> contentHitsFlattened = ContentHit.flattenResults(contentHitsAll); Map<FsContent, Integer> contentHitsFlattened = ContentHit.flattenResults(contentHitsAll);
for (final FsContent hitFile : contentHitsFlattened.keySet()) { for (final FsContent hitFile : contentHitsFlattened.keySet()) {
if (this.isCancelled()) {
finalizeSearcher();
return null;
}
String snippet = null; String snippet = null;
final String snippetQuery = KeywordSearchUtil.escapeLuceneQuery(hitTerm.getQuery(), true, false); final String snippetQuery = KeywordSearchUtil.escapeLuceneQuery(hitTerm.getQuery(), true, false);
int chunkId = contentHitsFlattened.get(hitFile); int chunkId = contentHitsFlattened.get(hitFile);
@ -746,23 +744,24 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
//without relying on done() method that is not guaranteed to run after background threads competes //without relying on done() method that is not guaranteed to run after background threads competes
//NEED to call this method always right before doInBackground() returns //NEED to call this method always right before doInBackground() returns
private void finalizeSearcher() { private void finalizeSearcher() {
logger.log(Level.INFO, "Searcher finalizing");
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
progress.finish();
}
});
searcherDone = true; //next currentSearcher can start searcherDone = true; //next currentSearcher can start
if (finalRun) { if (finalRun) {
logger.log(Level.INFO, "The final searcher in this ingest done."); logger.log(Level.INFO, "The final searcher in this ingest done.");
finalRunComplete = true; finalSearcherDone = true;
//keywords.clear(); //keywords.clear();
//keywordLists.clear(); //keywordLists.clear();
//keywordToList.clear(); //keywordToList.clear();
managerProxy.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, KeywordSearchIngestService.instance, "Completed")); managerProxy.postMessage(IngestMessage.createMessage(++messageID, MessageType.INFO, KeywordSearchIngestService.instance, "Completed"));
} }
} }
@Override
protected void done() {
logger.log(Level.INFO, "Searcher done()");
progress.finish();
}
} }
//check if fscontent already hit, ignore chunks //check if fscontent already hit, ignore chunks