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

Merge remote-tracking branch 'upstream/release-4.11.0' into 4922-delete-orphan-manifest-nodes

Browse Source
This commit is contained in:
Richard Cordovano 2019-04-09 13:01:11 -04:00
commit e92d4aa1bf
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteCaseTask.java
View File

@ -612,9 +612,17 @@ final class DeleteCaseTask implements Runnable {
if (dataSource instanceof Image) { if (dataSource instanceof Image) {
Image image = (Image) dataSource; Image image = (Image) dataSource;
String[] imageFilePaths = image.getPaths(); String[] imageFilePaths = image.getPaths();
/*
* Check for a match between one of the paths for the image
* files and the data source file path in the manifest.
*/
for (String imageFilePath : imageFilePaths) { for (String imageFilePath : imageFilePaths) {
Path candidatePath = Paths.get(imageFilePath); Path candidatePath = Paths.get(imageFilePath);
if (candidatePath.equals(dataSourcePath)) { if (candidatePath.equals(dataSourcePath)) {
/*
* If a match is found, add all of the file paths for
* the image to the set of files to be deleted.
*/
for (String path : imageFilePaths) { for (String path : imageFilePaths) {
filesToDelete.add(Paths.get(path)); filesToDelete.add(Paths.get(path));
} }
@ -622,9 +630,22 @@ final class DeleteCaseTask implements Runnable {
} }
} }
} }
++index;
} }
/*
* At a minimum, the data source at the file path given in the manifest
* should be deleted. If the data source is not a disk image, this will
* be the path of an archive, a logical file, or a logical directory.
* TODO-4933: Currently, the contents extracted from an archive are not
* deleted, nor are any additional files associated with a report data
* source.
*/
filesToDelete.add(dataSourcePath); filesToDelete.add(dataSourcePath);
/*
* Delete the file(s).
*/
boolean allFilesDeleted = true; boolean allFilesDeleted = true;
for (Path path : filesToDelete) { for (Path path : filesToDelete) {
File fileOrDir = path.toFile(); File fileOrDir = path.toFile();