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

1917-fixed re-opening project, and queries only returning files

Browse Source
This commit is contained in:
William Schaefer 2016-11-23 11:04:41 -05:00
parent bf62c2175d
commit 8f0b9c057c
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java
View File

@ -152,6 +152,8 @@ public interface DisplayableItemNodeVisitor<T> {
T visit(FileTypesByMimeType.MediaSubTypeNode ftByMimeTypeMediaSubType); T visit(FileTypesByMimeType.MediaSubTypeNode ftByMimeTypeMediaSubType);
T visit(FileTypesByMimeType.EmptyNode.MessageNode aThis);
/** /**
* Visitor with an implementable default behavior for all types. Override * Visitor with an implementable default behavior for all types. Override
@ -230,6 +232,11 @@ public interface DisplayableItemNodeVisitor<T> {
return defaultVisit(ftByMimeTypeMediaTypeNode); return defaultVisit(ftByMimeTypeMediaTypeNode);
} }
@Override
public T visit(FileTypesByMimeType.EmptyNode.MessageNode ftByMimeTypeEmptyNode) {
return defaultVisit(ftByMimeTypeEmptyNode);
}
@Override @Override
public T visit(DeletedContentNode dcn) { public T visit(DeletedContentNode dcn) {
return defaultVisit(dcn); return defaultVisit(dcn);

33
Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java
View File

@ -119,7 +119,11 @@ public class FileTypesByMimeType extends Observable implements AutopsyVisitableI
private void populateHashMap() { private void populateHashMap() {
StringBuilder allDistinctMimeTypesQuery = new StringBuilder(); StringBuilder allDistinctMimeTypesQuery = new StringBuilder();
allDistinctMimeTypesQuery.append("SELECT DISTINCT mime_type from tsk_files where mime_type NOT null"); //NON-NLS allDistinctMimeTypesQuery.append("SELECT DISTINCT mime_type from tsk_files where mime_type NOT null"); //NON-NLS
allDistinctMimeTypesQuery.append(" AND dir_type = ").append(TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue()).append(";"); //NON-NLS allDistinctMimeTypesQuery.append(" AND dir_type = ").append(TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue()); //NON-NLS
allDistinctMimeTypesQuery.append(" AND (type IN (").append(TskData.TSK_DB_FILES_TYPE_ENUM.FS.ordinal()).append(","); //NON-NLS
allDistinctMimeTypesQuery.append(TskData.TSK_DB_FILES_TYPE_ENUM.CARVED.ordinal()).append(",");
allDistinctMimeTypesQuery.append(TskData.TSK_DB_FILES_TYPE_ENUM.DERIVED.ordinal()).append(",");
allDistinctMimeTypesQuery.append(TskData.TSK_DB_FILES_TYPE_ENUM.LOCAL.ordinal()).append("))");
synchronized (existingMimeTypes) { synchronized (existingMimeTypes) {
existingMimeTypes.clear(); existingMimeTypes.clear();
} }
@ -155,6 +159,7 @@ public class FileTypesByMimeType extends Observable implements AutopsyVisitableI
IngestManager.getInstance().addIngestJobEventListener(pcl); IngestManager.getInstance().addIngestJobEventListener(pcl);
IngestManager.getInstance().addIngestModuleEventListener(pcl); IngestManager.getInstance().addIngestModuleEventListener(pcl);
FileTypesByMimeType.skCase = skCase; FileTypesByMimeType.skCase = skCase;
populateHashMap();
} }
/** /**
@ -417,6 +422,10 @@ public class FileTypesByMimeType extends Observable implements AutopsyVisitableI
private static String createQuery(String mime_type) { private static String createQuery(String mime_type) {
StringBuilder query = new StringBuilder(); StringBuilder query = new StringBuilder();
query.append("(dir_type = ").append(TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue()).append(")"); //NON-NLS query.append("(dir_type = ").append(TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue()).append(")"); //NON-NLS
query.append(" AND (type IN (").append(TskData.TSK_DB_FILES_TYPE_ENUM.FS.ordinal()).append(","); //NON-NLS
query.append(TskData.TSK_DB_FILES_TYPE_ENUM.CARVED.ordinal()).append(",");
query.append(TskData.TSK_DB_FILES_TYPE_ENUM.DERIVED.ordinal()).append(",");
query.append(TskData.TSK_DB_FILES_TYPE_ENUM.LOCAL.ordinal()).append("))");
if (UserPreferences.hideKnownFilesInViewsTree()) { if (UserPreferences.hideKnownFilesInViewsTree()) {
query.append(" AND (known IS NULL OR known != ").append(TskData.FileKnown.KNOWN.getFileKnownValue()).append(")"); //NON-NLS query.append(" AND (known IS NULL OR known != ").append(TskData.FileKnown.KNOWN.getFileKnownValue()).append(")"); //NON-NLS
} }
@ -499,7 +508,12 @@ public class FileTypesByMimeType extends Observable implements AutopsyVisitableI
} }
static class MessageNode extends AbstractNode { /**
* MessageNode is is the info message that displays in the table view,
* by also extending a DisplayableItemNode type, rather than an
* AbstractNode type it doesn't throw an error when right clicked.
*/
static class MessageNode extends DisplayableItemNode {
MessageNode(String name) { MessageNode(String name) {
super(Children.LEAF); super(Children.LEAF);
@ -507,6 +521,21 @@ public class FileTypesByMimeType extends Observable implements AutopsyVisitableI
setName(name); setName(name);
setDisplayName(name); setDisplayName(name);
} }
@Override
public boolean isLeafTypeNode() {
return true;
}
@Override
public <T> T accept(DisplayableItemNodeVisitor<T> v) {
return v.visit(this);
}
@Override
public String getItemType() {
return getClass().getName();
}
} }
} }