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

Removed support for filtering on tags.

Browse Source
This commit is contained in:
Jeff Wallace 2013-10-01 17:01:40 -04:00
parent 1634b7c7b7
commit e3d4d407ab
2 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
View File

@ -201,7 +201,7 @@ public class ReportGenerator {
* @param enabledInfo the Information that should be included about each file * @param enabledInfo the Information that should be included about each file
* in the report. * in the report.
*/ */
public void generateFileListReports(Map<FILE_REPORT_INFO, Boolean> enabledInfo, Map<String, Boolean> tagSelections) { public void generateFileListReports(Map<FILE_REPORT_INFO, Boolean> enabledInfo) {
if (!fileProgress.isEmpty() && null != enabledInfo) { if (!fileProgress.isEmpty() && null != enabledInfo) {
List<FILE_REPORT_INFO> enabled = new ArrayList<>(); List<FILE_REPORT_INFO> enabled = new ArrayList<>();
for (Entry<FILE_REPORT_INFO, Boolean> e : enabledInfo.entrySet()) { for (Entry<FILE_REPORT_INFO, Boolean> e : enabledInfo.entrySet()) {
@ -209,13 +209,7 @@ public class ReportGenerator {
enabled.add(e.getKey()); enabled.add(e.getKey());
} }
} }
List<String> tagsEnabled = new ArrayList<>(); FileReportsWorker worker = new FileReportsWorker(enabled);
for (Entry<String, Boolean> e : tagSelections.entrySet()) {
if(e.getValue()) {
tagsEnabled.add(e.getKey());
}
}
FileReportsWorker worker = new FileReportsWorker(enabled, tagsEnabled);
worker.execute(); worker.execute();
} }
} }
@ -244,11 +238,9 @@ public class ReportGenerator {
private class FileReportsWorker extends SwingWorker<Integer, Integer> { private class FileReportsWorker extends SwingWorker<Integer, Integer> {
private List<FILE_REPORT_INFO> enabledInfo = Arrays.asList(FILE_REPORT_INFO.values()); private List<FILE_REPORT_INFO> enabledInfo = Arrays.asList(FILE_REPORT_INFO.values());
private List<FileReportModule> fileModules = new ArrayList<>(); private List<FileReportModule> fileModules = new ArrayList<>();
private List<String> tags = new ArrayList<>();
FileReportsWorker(List<FILE_REPORT_INFO> enabled, List<String> tagsEnabled) { FileReportsWorker(List<FILE_REPORT_INFO> enabled) {
enabledInfo = enabled; enabledInfo = enabled;
tags = tagsEnabled;
for (Entry<FileReportModule, ReportProgressPanel> entry : fileProgress.entrySet()) { for (Entry<FileReportModule, ReportProgressPanel> entry : fileProgress.entrySet()) {
fileModules.add(entry.getKey()); fileModules.add(entry.getKey());
} }
@ -264,7 +256,7 @@ public class ReportGenerator {
} }
} }
List<AbstractFile> files = getFiles(tags); List<AbstractFile> files = getFiles();
int numFiles = files.size(); int numFiles = files.size();
for (FileReportModule module : fileModules) { for (FileReportModule module : fileModules) {
module.startReport(reportPath); module.startReport(reportPath);
@ -318,40 +310,6 @@ public class ReportGenerator {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
} }
/**
* Get Files tagged with the given TagName.
* @param tagNames
* @return
*/
private List<AbstractFile> getFiles(List<String> tagNames) {
if(tags.isEmpty()) {
return getFiles();
}
List<AbstractFile> absFiles = new ArrayList<>();
List<BlackboardArtifact> artifacts = new ArrayList<>();
SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
for (String tagName : tagNames) {
try {
artifacts.addAll(skCase.getBlackboardArtifacts(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TAG_NAME, tagName));
} catch (TskCoreException ex) {
return Collections.EMPTY_LIST;
}
}
for (BlackboardArtifact artifact : artifacts) {
try {
// TODO: Is this safe to call? Will it always give an AbstractFile?
absFiles.add(skCase.getAbstractFileById(artifact.getObjectID()));
} catch (TskCoreException ex) {
return Collections.EMPTY_LIST;
}
}
if(!absFiles.isEmpty()) {
System.out.println(absFiles.size());
}
return absFiles;
}
} }
/** /**

2
Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
View File

@ -72,7 +72,7 @@ public final class ReportWizardAction extends CallableSystemAction implements P
(Map<GeneralReportModule, Boolean>)wiz.getProperty("generalModuleStates"), (Map<GeneralReportModule, Boolean>)wiz.getProperty("generalModuleStates"),
(Map<FileReportModule, Boolean>)wiz.getProperty("fileListModuleStates")); (Map<FileReportModule, Boolean>)wiz.getProperty("fileListModuleStates"));
generator.generateArtifactTableReports((Map<ARTIFACT_TYPE, Boolean>)wiz.getProperty("artifactStates"), (Map<String, Boolean>)wiz.getProperty("tagStates")); generator.generateArtifactTableReports((Map<ARTIFACT_TYPE, Boolean>)wiz.getProperty("artifactStates"), (Map<String, Boolean>)wiz.getProperty("tagStates"));
generator.generateFileListReports((Map<FILE_REPORT_INFO, Boolean>)wiz.getProperty("fileReportOptions"), (Map<String, Boolean>)wiz.getProperty("tagStates")); generator.generateFileListReports((Map<FILE_REPORT_INFO, Boolean>)wiz.getProperty("fileReportOptions"));
generator.generateGeneralReports(); generator.generateGeneralReports();
generator.displayProgressPanels(); generator.displayProgressPanels();
} }