From f75e02b739b0c365c3f4540c9c991ab4df1e6080 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 25 Feb 2020 14:49:16 -0500 Subject: [PATCH] 6022 fix for summarization of files when no textextractor is found --- .../org/sleuthkit/autopsy/filequery/FileSearch.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java index ee5c36c8e3..fbf8356e16 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java @@ -291,13 +291,21 @@ class FileSearch { * @return The beginning of text from the specified AbstractFile. */ private static String getFirstLines(AbstractFile file) { - try (Reader reader = TextExtractorFactory.getExtractor(file, null).getReader()) { + TextExtractor extractor; + try { + extractor = TextExtractorFactory.getExtractor(file, null); + } catch (TextExtractorFactory.NoTextExtractorFound ignored) { + //no extractor found, use Strings Extractor + extractor = TextExtractorFactory.getStringsExtractor(file, null); + } + + try (Reader reader = extractor.getReader()) { char[] cbuf = new char[PREVIEW_SIZE]; reader.read(cbuf, 0, PREVIEW_SIZE); return new String(cbuf); } catch (IOException ex) { return Bundle.FileSearch_documentSummary_noBytes(); - } catch (TextExtractorFactory.NoTextExtractorFound | TextExtractor.InitReaderException ex) { + } catch (TextExtractor.InitReaderException ex) { return Bundle.FileSearch_documentSummary_noPreview(); } }