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

Made changes due to FsContent.getFileSystem now throwing TskCoreException.

Browse Source
This commit is contained in:
Tim McIver 2013-01-08 15:22:23 -05:00
parent e62b062aa7
commit a8f6393c8a
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
View File

@ -162,31 +162,25 @@ class ViewContextAction extends AbstractAction {
@Override @Override
public List<Content> visit(Directory drctr) { public List<Content> visit(Directory drctr) {
ret.add(drctr); ret.add(drctr);
if (drctr.isRoot()) { Content parent = null;
return visit(drctr.getFileSystem()); try {
} else { parent = drctr.getParent();
try { } catch (TskCoreException ex) {
return drctr.getParentDirectory().accept(this); logger.log(Level.SEVERE, "Couldn't get parent of Directory: " + drctr, ex);
} catch (TskException ex) {
logger.log(Level.WARNING, "Couldn't get directory's parent directory", ex);
}
} }
return ret; return parent.accept(this);
} }
@Override @Override
public List<Content> visit(File file) { public List<Content> visit(File file) {
ret.add(file); ret.add(file);
if (file.isRoot()) { Content parent = null;
return visit(file.getFileSystem()); try {
} else { parent = file.getParent();
try { } catch (TskCoreException ex) {
return file.getParentDirectory().accept(this); logger.log(Level.SEVERE, "Couldn't get parent of File: " + file, ex);
} catch (TskException ex) {
logger.log(Level.WARNING, "Couldn't get file's parent directory", ex);
}
} }
return ret; return parent.accept(this);
} }
@Override @Override

11
Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
View File

@ -606,7 +606,16 @@ class IngestScheduler {
//skip files in root dir, starting with $, containing : (not default attributes) //skip files in root dir, starting with $, containing : (not default attributes)
//with meta address < 32, i.e. some special large NTFS and FAT files //with meta address < 32, i.e. some special large NTFS and FAT files
final TskData.TSK_FS_TYPE_ENUM fsType = f.getFileSystem().getFsType(); FileSystem fs = null;
try {
fs = f.getFileSystem();
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not get FileSystem for " + f, ex);
}
TskData.TSK_FS_TYPE_ENUM fsType = TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_UNSUPP;
if (fs != null) {
fsType = fs.getFsType();
}
if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) { if ((fsType.getValue() & FAT_NTFS_FLAGS) == 0) {
//not fat or ntfs, accept all files //not fat or ntfs, accept all files