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

3819 additional clean up and removal of unnecessary fields depth fix

Browse Source
This commit is contained in:
William Schaefer 2018-06-08 12:16:15 -04:00
parent 9980fee6ed
commit 8a035b87e5
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
View File

@ -518,7 +518,7 @@ class SevenZipExtractor {
} }
parentAr = depthMap.get(archiveId); parentAr = depthMap.get(archiveId);
if (parentAr == null) { if (parentAr == null) {
parentAr = new Archive(null, archiveId, 0); parentAr = new Archive(archiveId, 0);
depthMap.put(archiveId, parentAr); depthMap.put(archiveId, parentAr);
} else if (parentAr.getDepth() == MAX_DEPTH) { } else if (parentAr.getDepth() == MAX_DEPTH) {
String msg = NbBundle.getMessage(SevenZipExtractor.class, String msg = NbBundle.getMessage(SevenZipExtractor.class,
@ -668,7 +668,7 @@ class SevenZipExtractor {
continue; continue;
} }
if (isSevenZipExtractionSupported(unpackedFile)) { if (isSevenZipExtractionSupported(unpackedFile)) {
Archive child = new Archive(parentAr, unpackedFile.getId(), parentAr.getDepth() + 1); Archive child = new Archive(unpackedFile.getId(), parentAr.getDepth() + 1);
parentAr.addChild(child); parentAr.addChild(child);
depthMap.put(unpackedFile.getId(), child); depthMap.put(unpackedFile.getId(), child);
} }
@ -1072,7 +1072,7 @@ class SevenZipExtractor {
private String fileName; private String fileName;
private AbstractFile file; private AbstractFile file;
private List<UnpackedNode> children = new ArrayList<>(); private final List<UnpackedNode> children = new ArrayList<>();
private String localRelPath = ""; private String localRelPath = "";
private long size; private long size;
private long ctime, crtime, atime, mtime; private long ctime, crtime, atime, mtime;
@ -1208,11 +1208,9 @@ class SevenZipExtractor {
private final int depth; private final int depth;
private final long objectId; private final long objectId;
private final Archive parent;
private final List<Archive> children; private final List<Archive> children;
Archive(Archive parent, long objectId, int depth) { Archive(long objectId, int depth) {
this.parent = parent;
this.objectId = objectId; this.objectId = objectId;
this.children = new ArrayList<>(); this.children = new ArrayList<>();
this.depth = depth; this.depth = depth;
@ -1228,16 +1226,6 @@ class SevenZipExtractor {
children.add(child); children.add(child);
} }
/**
* Get the object id of the parent of this archive.
*
* @return parent.objectId - the unique objectId of this archives parent
* archive
*/
long getParentObjectId() {
return parent.getObjectId();
}
/** /**
* Get the object id of this archive. * Get the object id of this archive.
* *