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

Merge pull request #1837 from BasisOlivers/bugFix

Browse Source 
Added MIMEType to display
This commit is contained in:
Richard Cordovano 2016-01-27 10:08:14 -05:00
commit f267a6fb62
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
View File

@ -43,7 +43,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
private static final Logger LOGGER = Logger.getLogger(AbstractAbstractFileNode.class.getName()); private static final Logger LOGGER = Logger.getLogger(AbstractAbstractFileNode.class.getName());
/** /**
* @param <T> type of the AbstractFile data to encapsulate * @param <T> type of the AbstractFile data to encapsulate
* @param abstractFile file to encapsulate * @param abstractFile file to encapsulate
*/ */
AbstractAbstractFileNode(T abstractFile) { AbstractAbstractFileNode(T abstractFile) {
@ -52,7 +52,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
int dotIndex = name.lastIndexOf("."); int dotIndex = name.lastIndexOf(".");
if (dotIndex > 0) { if (dotIndex > 0) {
String ext = name.substring(dotIndex).toLowerCase(); String ext = name.substring(dotIndex).toLowerCase();
// If this is an archive file we will listen for ingest events // If this is an archive file we will listen for ingest events
// that will notify us when new content has been identified. // that will notify us when new content has been identified.
for (String s : FileTypeExtensions.getArchiveExtensions()) { for (String s : FileTypeExtensions.getArchiveExtensions()) {
@ -228,6 +228,13 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
public String toString() { public String toString() {
return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.objectId"); return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.objectId");
}
},
MIMETYPE {
@Override
public String toString() {
return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.mimeType");
} }
}, },
} }
@ -235,8 +242,8 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
/** /**
* Fill map with AbstractFile properties * Fill map with AbstractFile properties
* *
* @param map map with preserved ordering, where property names/values * @param map map with preserved ordering, where property names/values are
* are put * put
* @param content to extract properties from * @param content to extract properties from
*/ */
public static void fillPropertyMap(Map<String, Object> map, AbstractFile content) { public static void fillPropertyMap(Map<String, Object> map, AbstractFile content) {
@ -268,6 +275,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
map.put(AbstractFilePropertyType.HASHSETS.toString(), getHashSetHitsForFile(content)); map.put(AbstractFilePropertyType.HASHSETS.toString(), getHashSetHitsForFile(content));
map.put(AbstractFilePropertyType.MD5HASH.toString(), content.getMd5Hash() == null ? "" : content.getMd5Hash()); map.put(AbstractFilePropertyType.MD5HASH.toString(), content.getMd5Hash() == null ? "" : content.getMd5Hash());
map.put(AbstractFilePropertyType.ObjectID.toString(), content.getId()); map.put(AbstractFilePropertyType.ObjectID.toString(), content.getId());
map.put(AbstractFilePropertyType.MIMETYPE.toString(), content.getMIMEType() == null ? "" : content.getMIMEType());
} }
static String getContentDisplayName(AbstractFile file) { static String getContentDisplayName(AbstractFile file) {

1
Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
View File

@ -18,6 +18,7 @@ AbstractAbstractFileNode.typeMetaColLbl=Type(Meta)
AbstractAbstractFileNode.knownColLbl=Known AbstractAbstractFileNode.knownColLbl=Known
AbstractAbstractFileNode.inHashsetsColLbl=In Hashsets AbstractAbstractFileNode.inHashsetsColLbl=In Hashsets
AbstractAbstractFileNode.md5HashColLbl=MD5 Hash AbstractAbstractFileNode.md5HashColLbl=MD5 Hash
AbstractAbstractFileNode.mimeType = MIME Type
AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg=No Node defined for the given SleuthkitItem AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg=No Node defined for the given SleuthkitItem
AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg=No Node defined for the given DisplayableItem AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg=No Node defined for the given DisplayableItem
AbstractContentNode.exception.cannotChangeSysName.msg=Cannot change the system name. AbstractContentNode.exception.cannotChangeSysName.msg=Cannot change the system name.