codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-03 15:59:52 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into tags_filter_refresh_button

Browse Source
This commit is contained in:
jmillman
2015-08-24 09:55:30 -04:00
parent 9ab4e92925 fe5e353b72
commit deab3ce575
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java
+1 -1
View File
@@ -66,7 +66,7 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
private long jobId;
private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
private FileTypeDetector fileTypeDetector;
private final HashSet supportedMimeTypes = new HashSet();
private final HashSet<String> supportedMimeTypes = new HashSet<>();
ExifParserFileIngestModule() {
supportedMimeTypes.add("audio/x-wav");
Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+10 -13
View File
@@ -562,13 +562,6 @@ class ReportHTML implements TableReportModule {
return;
}
AbstractFile file = (AbstractFile) content;
// Don't make a local copy of the file if it is a directory or unallocated space.
if (file.isDir()
|| file.getType() == TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS
|| file.getType() == TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS) {
row.add("");
return;
}
// Add metadata about the file to HTML output
row.add(file.getMtimeAsDate());
@@ -578,14 +571,18 @@ class ReportHTML implements TableReportModule {
row.add(Long.toString(file.getSize()));
row.add(file.getMd5Hash());
// save it in a folder based on the tag name
String localFilePath = saveContent(file, contentTag.getName().getDisplayName());
// Add the hyperlink to the row. A column header for it was created in startTable().
StringBuilder localFileLink = new StringBuilder();
localFileLink.append("<a href=\""); //NON-NLS
localFileLink.append(localFilePath);
localFileLink.append("\">");
// Don't make a local copy of the file if it is a directory or unallocated space.
if (!(file.isDir()
|| file.getType() == TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS
|| file.getType() == TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS)) {
localFileLink.append("<a href=\""); //NON-NLS
// save it in a folder based on the tag name
String localFilePath = saveContent(file, contentTag.getName().getDisplayName());
localFileLink.append(localFilePath);
localFileLink.append("\">");
}
StringBuilder builder = new StringBuilder();
builder.append("\t<tr>\n"); //NON-NLS