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

fix for file node sheet and TODO

Browse Source
This commit is contained in:
Greg DiCristofaro 2021-10-08 15:35:37 -04:00
parent 9a8324a6a5
commit 9a153d5beb
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/mainui/datamodel/FileTypeExtensionsSearchParam.java
View File

@ -29,6 +29,7 @@ public class FileTypeExtensionsSearchParam {
private final Long dataSourceId; private final Long dataSourceId;
private final boolean knownShown; private final boolean knownShown;
// TODO: This should ideally take in some kind of ENUM once we redo the tree.
// this assumes that filters implicitly or explicitly implement hashCode and equals to work // this assumes that filters implicitly or explicitly implement hashCode and equals to work
public FileTypeExtensionsSearchParam(FileExtSearchFilter filter, Long dataSourceId, boolean showKnown) { public FileTypeExtensionsSearchParam(FileExtSearchFilter filter, Long dataSourceId, boolean showKnown) {
this.filter = filter; this.filter = filter;

32
Core/src/org/sleuthkit/autopsy/mainui/datamodel/ThreePanelViewsDAO.java
View File

@ -89,20 +89,21 @@ public class ThreePanelViewsDAO {
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_sizeColLbl()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_sizeColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_flagsDirColLbl()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_flagsDirColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_flagsMetaColLbl()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_flagsMetaColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_modeColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_modeColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_useridColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_useridColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_groupidColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_groupidColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_metaAddrColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_metaAddrColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_attrAddrColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_attrAddrColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_typeDirColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_typeDirColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_typeMetaColLbl()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_typeMetaColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_knownColLbl()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_knownColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_md5HashColLbl()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_md5HashColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_sha256HashColLbl()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_sha256HashColLbl()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_objectId()), // getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_objectId()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_mimeType()), getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_mimeType()),
getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_extensionColLbl())); getFileColumnKey(Bundle.ThreePanelViewsDAO_fileColumns_extensionColLbl()));
private static ThreePanelViewsDAO instance = null; private static ThreePanelViewsDAO instance = null;
synchronized static ThreePanelViewsDAO getInstance() { synchronized static ThreePanelViewsDAO getInstance() {
@ -215,10 +216,12 @@ public class ThreePanelViewsDAO {
List<Object> cellValues = Arrays.asList( List<Object> cellValues = Arrays.asList(
file.getName(), // GVDTODO handle . and .. from getContentDisplayName() file.getName(), // GVDTODO handle . and .. from getContentDisplayName()
// GVDTODO translation column // GVDTODO translation column
null,
//GVDTDO replace nulls with SCO //GVDTDO replace nulls with SCO
null, null,
null, null,
null, null,
file.getUniquePath(),
TimeZoneUtils.getFormattedTime(file.getMtime()), TimeZoneUtils.getFormattedTime(file.getMtime()),
TimeZoneUtils.getFormattedTime(file.getCtime()), TimeZoneUtils.getFormattedTime(file.getCtime()),
TimeZoneUtils.getFormattedTime(file.getAtime()), TimeZoneUtils.getFormattedTime(file.getAtime()),
@ -226,10 +229,21 @@ public class ThreePanelViewsDAO {
file.getSize(), file.getSize(),
file.getDirFlagAsString(), file.getDirFlagAsString(),
file.getMetaFlagsAsString(), file.getMetaFlagsAsString(),
// mode,
// userid,
// groupid,
// metaAddr,
// attrAddr,
// typeDir,
// typeMeta,
file.getKnown().getName(), file.getKnown().getName(),
file.getUniquePath(),
StringUtils.defaultString(file.getMd5Hash()), StringUtils.defaultString(file.getMd5Hash()),
StringUtils.defaultString(file.getSha256Hash()), StringUtils.defaultString(file.getSha256Hash()),
// objectId,
StringUtils.defaultString(file.getMIMEType()), StringUtils.defaultString(file.getMIMEType()),
file.getNameExtension() file.getNameExtension()
); );