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

Merge pull request #4803 from sleuthkit/translation_viewer_logging

Browse Source 
log exceptions.  Don't limit text sizes
This commit is contained in:
Richard Cordovano 2019-05-17 15:21:54 -04:00 committed by GitHub
commit 5ca1da542c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslatedTextViewer.java
View File

@ -52,6 +52,8 @@ import org.sleuthkit.autopsy.texttranslation.NoServiceProviderException;
import org.sleuthkit.autopsy.texttranslation.TranslationException; import org.sleuthkit.autopsy.texttranslation.TranslationException;
import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Content;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.coreutils.PlatformUtil;
import org.sleuthkit.autopsy.texttranslation.ui.TranslationContentPanel.DisplayDropdownOptions; import org.sleuthkit.autopsy.texttranslation.ui.TranslationContentPanel.DisplayDropdownOptions;
@ -61,6 +63,8 @@ import org.sleuthkit.autopsy.texttranslation.ui.TranslationContentPanel.DisplayD
@ServiceProvider(service = TextViewer.class, position = 4) @ServiceProvider(service = TextViewer.class, position = 4)
public final class TranslatedTextViewer implements TextViewer { public final class TranslatedTextViewer implements TextViewer {
private static final Logger logger = Logger.getLogger(TranslatedTextViewer.class.getName());
private static final boolean OCR_ENABLED = true; private static final boolean OCR_ENABLED = true;
private static final boolean OCR_DISABLED = false; private static final boolean OCR_DISABLED = false;
private static final int MAX_SIZE_1MB = 1024000; private static final int MAX_SIZE_1MB = 1024000;
@ -169,16 +173,20 @@ public final class TranslatedTextViewer implements TextViewer {
try { try {
return getFileText(node); return getFileText(node);
} catch (IOException ex) { } catch (IOException ex) {
logger.log(Level.WARNING, "Error getting text", ex);
return Bundle.TranslatedContentViewer_errorMsg(); return Bundle.TranslatedContentViewer_errorMsg();
} catch (TextExtractor.InitReaderException ex) { } catch (TextExtractor.InitReaderException ex) {
logger.log(Level.WARNING, "Error getting text", ex);
return Bundle.TranslatedContentViewer_errorExtractingText(); return Bundle.TranslatedContentViewer_errorExtractingText();
} }
} else { } else {
try { try {
return translate(getFileText(node)); return translate(getFileText(node));
} catch (IOException ex) { } catch (IOException ex) {
logger.log(Level.WARNING, "Error translating text", ex);
return Bundle.TranslatedContentViewer_errorMsg(); return Bundle.TranslatedContentViewer_errorMsg();
} catch (TextExtractor.InitReaderException ex) { } catch (TextExtractor.InitReaderException ex) {
logger.log(Level.WARNING, "Error translating text", ex);
return Bundle.TranslatedContentViewer_errorExtractingText(); return Bundle.TranslatedContentViewer_errorExtractingText();
} }
} }
@ -247,7 +255,8 @@ public final class TranslatedTextViewer implements TextViewer {
} catch (NoServiceProviderException ex) { } catch (NoServiceProviderException ex) {
return Bundle.TranslatedContentViewer_noServiceProvider(); return Bundle.TranslatedContentViewer_noServiceProvider();
} catch (TranslationException ex) { } catch (TranslationException ex) {
return Bundle.TranslatedContentViewer_translationException(); logger.log(Level.WARNING, "Error translating text", ex);
return Bundle.TranslatedContentViewer_translationException() + " (" + ex.getMessage() + ")";
} }
} }
@ -287,7 +296,7 @@ public final class TranslatedTextViewer implements TextViewer {
//Correct for UTF-8 //Correct for UTF-8
byte[] resultInUTF8Bytes = result.getBytes("UTF8"); byte[] resultInUTF8Bytes = result.getBytes("UTF8");
byte[] trimTo1MB = Arrays.copyOfRange(resultInUTF8Bytes, 0, MAX_SIZE_1MB / 1000); byte[] trimTo1MB = Arrays.copyOfRange(resultInUTF8Bytes, 0, MAX_SIZE_1MB );
return new String(trimTo1MB, "UTF-8"); return new String(trimTo1MB, "UTF-8");
} }
@ -333,7 +342,8 @@ public final class TranslatedTextViewer implements TextViewer {
bytesRead += read; bytesRead += read;
} }
return textBuilder.toString(); // The trim is on here because HTML files were observed with nearly 1MB of white space at the end
return textBuilder.toString().trim();
} }
/** /**