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

Reading index metadata file before upgrade

Browse Source
This commit is contained in:
Eugene Livis 2017-02-06 15:53:22 -05:00
parent 398064d85a
commit 1ce9b87a2b
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexMetadata.java
View File

@ -87,6 +87,9 @@ public class IndexMetadata {
*/ */
IndexMetadata(String caseDirectory) throws TextIndexMetadataException { IndexMetadata(String caseDirectory) throws TextIndexMetadataException {
this.metadataFilePath = Paths.get(caseDirectory, metadataFileName); this.metadataFilePath = Paths.get(caseDirectory, metadataFileName);
if (!this.metadataFilePath.toFile().exists()) {
throw new TextIndexMetadataException(String.format("Text index metadata file doesn't exist: %s", metadataFilePath));
}
readFromFile(); readFromFile();
} }

33
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
View File

@ -23,6 +23,7 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress; import java.net.InetAddress;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.logging.Level; import java.util.logging.Level;
@ -173,6 +174,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
*/ */
@Override @Override
@NbBundle.Messages({ @NbBundle.Messages({
"SolrSearch.readingIndexes.msg=Reading text index metadata file",
"SolrSearch.findingIndexes.msg=Looking for existing text index directories", "SolrSearch.findingIndexes.msg=Looking for existing text index directories",
"SolrSearch.creatingNewIndex.msg=Creating new text index", "SolrSearch.creatingNewIndex.msg=Creating new text index",
"SolrSearch.indentifyingIndex.msg=Identifying text index for upgrade", "SolrSearch.indentifyingIndex.msg=Identifying text index for upgrade",
@ -181,13 +183,27 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
"SolrSearch.complete.msg=Text index successfully opened"}) "SolrSearch.complete.msg=Text index successfully opened"})
public void openCaseResources(CaseContext context) throws AutopsyServiceException { public void openCaseResources(CaseContext context) throws AutopsyServiceException {
ProgressIndicator progress = context.getProgressIndicator(); ProgressIndicator progress = context.getProgressIndicator();
int totalNumProgressUnits = 7; int totalNumProgressUnits = 8;
int progressUnitsCompleted = 1; int progressUnitsCompleted = 1;
List<Index> indexes = new ArrayList<>();
try {
// if index metadata file exists, get list of excisting Solr cores for this case
progress.start(Bundle.SolrSearch_readingIndexes_msg(), totalNumProgressUnits);
IndexMetadata indexMetadata = new IndexMetadata(context.getCase().getCaseDirectory());
indexes = indexMetadata.getIndexes();
} catch (IndexMetadata.TextIndexMetadataException ex) {
logger.log(Level.WARNING, String.format("Unable to read text index metadata file"), ex);
}
// do a case subdirectory search to check for the existence and upgrade status of KWS indexes if (indexes.isEmpty()) {
progress.start(Bundle.SolrSearch_findingIndexes_msg(), totalNumProgressUnits); // do a case subdirectory search to check for the existence of "old" KWS indexes that can be upgraded
IndexFinder indexFinder = new IndexFinder(); progressUnitsCompleted++;
List<Index> indexes = indexFinder.findAllIndexDirs(context.getCase()); progress.progress(Bundle.SolrSearch_findingIndexes_msg(), progressUnitsCompleted);
IndexFinder indexFinder = new IndexFinder();
indexes = indexFinder.findAllIndexDirs(context.getCase());
}
if (context.cancelRequested()) { if (context.cancelRequested()) {
return; return;
} }
@ -312,13 +328,10 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
} }
try { try {
// store the new core name // update text index metadata file
IndexMetadata indexMetadata = new IndexMetadata(context.getCase().getCaseDirectory(), indexes); IndexMetadata indexMetadata = new IndexMetadata(context.getCase().getCaseDirectory(), indexes);
// ELTODO remove
IndexMetadata ind = new IndexMetadata(context.getCase().getCaseDirectory());
} catch (IndexMetadata.TextIndexMetadataException ex) { } catch (IndexMetadata.TextIndexMetadataException ex) {
throw new AutopsyServiceException("Failed to save core name in case metadata file", ex); throw new AutopsyServiceException("Failed to save Solr core info in text index metadata file", ex);
} }
progress.progress(Bundle.SolrSearch_complete_msg(), totalNumProgressUnits); progress.progress(Bundle.SolrSearch_complete_msg(), totalNumProgressUnits);