diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java index 50b8a3e514..27c9234c3e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java @@ -52,6 +52,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat private static final String DATA_SOURCE_TYPE = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType"); private final LogicalFilesDspPanel configPanel; + private static final String L01_EXTRACTION_DIR = "ModuleOutput\\L01"; /* * TODO: Remove the setDataSourceOptionsCalled flag and the settings fields * when the deprecated method setDataSourceOptions is removed. @@ -144,6 +145,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat } private List extractL01Contents(List l01FilePaths) { + //WJS-TODO -- add ewfexport and any196 other necessary files to software package final String EWFEXPORT_EXE = "C:\\project_libs\\libewf_64bit\\msvscpp\\x64\\Release\\ewfexport.exe"; List extractedPaths = new ArrayList<>(); @@ -153,7 +155,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat command.add("-f"); command.add("files"); command.add("-t"); - File l01Dir = new File(Case.getCurrentCase().getCaseDirectory(), "ModuleOutput\\L01"); + File l01Dir = new File(Case.getCurrentCase().getCaseDirectory(), L01_EXTRACTION_DIR); if (!l01Dir.exists()) { l01Dir.mkdir(); } @@ -166,7 +168,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat ProcessBuilder processBuilder = new ProcessBuilder(command); processBuilder.directory(l01Dir); try { - // + //WJS-TODO redirect stdout and stderr in a method similar to bulk extractor // // redirect BE stdout and stderr to txt files // Path logFileName = Paths.get(outputDirPath.getParent().toString(), outputDirPath.getFileName().toString() + "_out.txt"); // File logFile = new File(logFileName.toString()); @@ -181,6 +183,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor, AutoIngestDat extractedPaths.add(l01Dir.toPath().resolve(dirPath).toString()); } else { //if we failed to extract anything add it as a regular file + //WJS-TODO notify user of that the file was added as a regular file extractedPaths.add(l01Path); } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.form index f8b88e40a3..133dbbca72 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.form +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.form @@ -17,8 +17,6 @@ - - diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.java index af6bfe60fb..5c2a055eb0 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LogicalFilesDspPanel.java @@ -106,7 +106,6 @@ final class LogicalFilesDspPanel extends JPanel { jScrollPane1 = new javax.swing.JScrollPane(); jTextArea1 = new javax.swing.JTextArea(); - fileTypeButtonGroup = new javax.swing.ButtonGroup(); jPanel1 = new javax.swing.JPanel(); jComboBox1 = new javax.swing.JComboBox<>(); @@ -120,7 +119,7 @@ final class LogicalFilesDspPanel extends JPanel { jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 467, Short.MAX_VALUE) + .addGap(0, 466, Short.MAX_VALUE) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -186,7 +185,6 @@ final class LogicalFilesDspPanel extends JPanel { } } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.ButtonGroup fileTypeButtonGroup; private javax.swing.JComboBox jComboBox1; private javax.swing.JPanel jPanel1; private javax.swing.JScrollPane jScrollPane1;