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

Changed name

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2018-12-07 17:24:49 -05:00
parent fe3927ea86
commit a7e78131c4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java
View File

@ -50,7 +50,7 @@ public class TextExtractorFactory {
* have no corresponding * have no corresponding
* extractor * extractor
*/ */
public static TextExtractor<Content> getReader(Content file, public static TextExtractor<Content> getExtractor(Content file,
ExtractionContext context) throws NoTextExtractorFound { ExtractionContext context) throws NoTextExtractorFound {
if (file instanceof AbstractFile) { if (file instanceof AbstractFile) {
String mimeType = ((AbstractFile) file).getMIMEType(); String mimeType = ((AbstractFile) file).getMIMEType();
@ -91,7 +91,7 @@ public class TextExtractorFactory {
* *
* @return A DefaultExtractor instance * @return A DefaultExtractor instance
*/ */
public static TextExtractor<Content> getDefaultReader(Content source, ExtractionContext context) { public static TextExtractor<Content> getDefaultExtractor(Content source, ExtractionContext context) {
StringsTextExtractor stringsInstance = new StringsTextExtractor(source); StringsTextExtractor stringsInstance = new StringsTextExtractor(source);
stringsInstance.setExtractionSettings(context); stringsInstance.setExtractionSettings(context);
return stringsInstance; return stringsInstance;

4
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
View File

@ -486,7 +486,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
extractionContext.set(ImageFileExtractionConfig.class, imageConfig); extractionContext.set(ImageFileExtractionConfig.class, imageConfig);
try { try {
Reader specializedReader = TextExtractorFactory.getReader(aFile,extractionContext).getReader(); Reader specializedReader = TextExtractorFactory.getExtractor(aFile,extractionContext).getReader();
//divide into chunks and index //divide into chunks and index
return Ingester.getDefault().indexText(specializedReader,aFile.getId(),aFile.getName(), aFile, context); return Ingester.getDefault().indexText(specializedReader,aFile.getId(),aFile.getName(), aFile, context);
} catch (TextExtractorFactory.NoTextExtractorFound | InitReaderException ex) { } catch (TextExtractorFactory.NoTextExtractorFound | InitReaderException ex) {
@ -508,7 +508,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
if (context.fileIngestIsCancelled()) { if (context.fileIngestIsCancelled()) {
return true; return true;
} }
Reader stringsReader = TextExtractorFactory.getDefaultReader(aFile, stringsExtractionContext).getReader(); Reader stringsReader = TextExtractorFactory.getDefaultExtractor(aFile, stringsExtractionContext).getReader();
if (Ingester.getDefault().indexText(stringsReader,aFile.getId(),aFile.getName(), aFile, KeywordSearchIngestModule.this.context)) { if (Ingester.getDefault().indexText(stringsReader,aFile.getId(),aFile.getName(), aFile, KeywordSearchIngestModule.this.context)) {
putIngestStatus(jobId, aFile.getId(), IngestStatus.STRINGS_INGESTED); putIngestStatus(jobId, aFile.getId(), IngestStatus.STRINGS_INGESTED);
return true; return true;

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

@ -117,7 +117,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
} }
try { try {
Reader blackboardReader = TextExtractorFactory Reader blackboardReader = TextExtractorFactory
.getReader(content, null).getReader(); .getExtractor(content, null).getReader();
String sourceName = artifact.getDisplayName() + "_" + artifact.getArtifactID(); String sourceName = artifact.getDisplayName() + "_" + artifact.getArtifactID();
ingester.indexMetaDataOnly(artifact, sourceName); ingester.indexMetaDataOnly(artifact, sourceName);
ingester.indexText(blackboardReader, artifact.getArtifactID(), sourceName, content, null); ingester.indexText(blackboardReader, artifact.getArtifactID(), sourceName, content, null);
@ -127,12 +127,12 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
} else { } else {
try { try {
Reader contentReader = TextExtractorFactory Reader contentReader = TextExtractorFactory
.getReader(content, null).getReader(); .getExtractor(content, null).getReader();
ingester.indexText(contentReader, content.getId(), content.getName(), content, null); ingester.indexText(contentReader, content.getId(), content.getName(), content, null);
} catch (TextExtractorFactory.NoTextExtractorFound | InitReaderException | Ingester.IngesterException ex) { } catch (TextExtractorFactory.NoTextExtractorFound | InitReaderException | Ingester.IngesterException ex) {
try { try {
// Try the StringsTextExtractor if Tika extractions fails. // Try the StringsTextExtractor if Tika extractions fails.
ingester.indexText(TextExtractorFactory.getDefaultReader(content, null).getReader(),content.getId(),content.getName(), content, null); ingester.indexText(TextExtractorFactory.getDefaultExtractor(content, null).getReader(),content.getId(),content.getName(), content, null);
} catch (Ingester.IngesterException | InitReaderException ex1) { } catch (Ingester.IngesterException | InitReaderException ex1) {
throw new TskCoreException(ex.getCause().getMessage(), ex1); throw new TskCoreException(ex.getCause().getMessage(), ex1);
} }
@ -448,7 +448,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
try { try {
String sourceName = artifact.getDisplayName() + "_" + artifact.getArtifactID(); String sourceName = artifact.getDisplayName() + "_" + artifact.getArtifactID();
Reader contentSpecificReader = Reader contentSpecificReader =
TextExtractorFactory.getReader((Content) artifact, null).getReader(); TextExtractorFactory.getExtractor((Content) artifact, null).getReader();
ingester.indexMetaDataOnly(artifact, sourceName); ingester.indexMetaDataOnly(artifact, sourceName);
ingester.indexText(contentSpecificReader, artifact.getId(), sourceName, artifact, null); ingester.indexText(contentSpecificReader, artifact.getId(), sourceName, artifact, null);
} catch (Ingester.IngesterException | TextExtractorFactory.NoTextExtractorFound | InitReaderException ex) { } catch (Ingester.IngesterException | TextExtractorFactory.NoTextExtractorFound | InitReaderException ex) {