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

Fix image writer error display on local disk panel

Browse Source
This commit is contained in:
Ann Priestman 2017-03-15 08:38:30 -04:00
parent 2c0d051a92
commit a0c2cfa2a0
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
View File

@ -261,7 +261,7 @@ final class LocalDiskPanel extends JPanel {
// set the current directory of the FileChooser if the ImagePath Field is valid // set the current directory of the FileChooser if the ImagePath Field is valid
File currentFile = new File(oldText); File currentFile = new File(oldText);
if ((currentFile.getParentFile() != null) && (currentFile.getParentFile().exists())) { if ((currentFile.getParentFile() != null) && (currentFile.getParentFile().exists())) {
fc.setCurrentDirectory(currentFile.getParentFile()); fc.setSelectedFile(currentFile);
} }
int retval = fc.showOpenDialog(this); int retval = fc.showOpenDialog(this);
@ -335,13 +335,29 @@ final class LocalDiskPanel extends JPanel {
subDirectory.mkdirs(); subDirectory.mkdirs();
} }
String path = disk.getName().replaceAll("[:]", ""); String path = disk.getName();
// Remove all non-ASCII characters
path = path.replaceAll("[^\\p{ASCII}]", ""); //NON-NLS
// Remove all control characters
path = path.replaceAll("[\\p{Cntrl}]", ""); //NON-NLS
// Remove / \ : ? ' "
path = path.replaceAll("[/?:'\"\\\\]", ""); //NON-NLS
path += " " + System.currentTimeMillis(); path += " " + System.currentTimeMillis();
path += ".vhd"; path += ".vhd";
pathTextField.setText(Paths.get(getDefaultImageWriterFolder(), path).toString()); pathTextField.setText(Paths.get(getDefaultImageWriterFolder(), path).toString());
} }
private boolean imageWriterPathIsValid() { private boolean imageWriterPathIsValid() {
if((! copyImageCheckbox.isSelected()) || ! (diskTable.getSelectedRow() >= 0 && diskTable.getSelectedRow() < disks.size())){
imageWriterErrorLabel.setVisible(false);
imageWriterErrorLabel.setText("");
return true;
}
if (pathTextField.getText().isEmpty()) { if (pathTextField.getText().isEmpty()) {
imageWriterErrorLabel.setVisible(true); imageWriterErrorLabel.setVisible(true);
imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterEmptyPathError.text")); imageWriterErrorLabel.setText(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.imageWriterEmptyPathError.text"));
@ -385,8 +401,7 @@ final class LocalDiskPanel extends JPanel {
* @return true if panel is valid * @return true if panel is valid
*/ */
boolean validatePanel() { boolean validatePanel() {
if (copyImageCheckbox.isSelected() if (!imageWriterPathIsValid()) {
&& !imageWriterPathIsValid()) {
return false; return false;
} }
return enableNext; return enableNext;
@ -608,6 +623,10 @@ final class LocalDiskPanel extends JPanel {
diskTable.setEnabled(true); diskTable.setEnabled(true);
diskTable.clearSelection(); diskTable.clearSelection();
} }
pathTextField.setText("");
errorLabel.setText("");
errorLabel.setVisible(false);
fireUpdateEvent();
ready = true; ready = true;
} else { } else {
logger.log(Level.INFO, "Loading local disks was canceled, which should not be possible."); //NON-NLS logger.log(Level.INFO, "Loading local disks was canceled, which should not be possible."); //NON-NLS