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

work to do on Score DAO

Browse Source
This commit is contained in:
Greg DiCristofaro 2023-07-04 20:52:43 -04:00
parent 80b280d2dd
commit 6b683a5813
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Core/src/org/sleuthkit/autopsy/mainui/datamodel/ScoreDAO.java
View File

@ -223,6 +223,8 @@ public class ScoreDAO extends AbstractDAO {
+ "INNER JOIN (\n" + "INNER JOIN (\n"
+ " SELECT obj_id, data_source_obj_id, 'f' AS type FROM tsk_files\n" + " SELECT obj_id, data_source_obj_id, 'f' AS type FROM tsk_files\n"
+ " UNION SELECT artifact_obj_id AS obj_id, data_source_obj_id, 'a' AS type FROM blackboard_artifacts\n" + " UNION SELECT artifact_obj_id AS obj_id, data_source_obj_id, 'a' AS type FROM blackboard_artifacts\n"
+ " WHERE blackboard_artifacts.artifact_type_id IN "
+ " (SELECT artifact_type_id FROM blackboard_artifact_types WHERE category_type = " + Category.DATA_ARTIFACT.getID() + ")\n"
+ ") art_files ON aggr_score.obj_id = art_files.obj_id\n" + ") art_files ON aggr_score.obj_id = art_files.obj_id\n"
+ "WHERE (" + scoreWhereClause + ")\n" + "WHERE (" + scoreWhereClause + ")\n"
+ ((dataSourceId != null && dataSourceId > 0) ? "AND art_files.data_source_obj_id = " + dataSourceId + "\n" : "") + ((dataSourceId != null && dataSourceId > 0) ? "AND art_files.data_source_obj_id = " + dataSourceId + "\n" : "")
@ -284,7 +286,7 @@ public class ScoreDAO extends AbstractDAO {
sqlEx); sqlEx);
} }
List<RowDTO> fileRows = new ArrayList<>(); List<RowDTO> dataRows = new ArrayList<>();
if (!fileIds.isEmpty()) { if (!fileIds.isEmpty()) {
String joinedFileIds = fileIds.stream() String joinedFileIds = fileIds.stream()
@ -293,20 +295,20 @@ public class ScoreDAO extends AbstractDAO {
List<AbstractFile> files = getCase().findAllFilesWhere("obj_id IN (" + joinedFileIds + ")"); List<AbstractFile> files = getCase().findAllFilesWhere("obj_id IN (" + joinedFileIds + ")");
for (AbstractFile file : files) { // for (AbstractFile file : files) {
//
List<Object> cellValues = FileSystemColumnUtils.getCellValuesForAbstractFile(file); // List<Object> cellValues = FileSystemColumnUtils.getCellValuesForAbstractFile(file);
//
fileRows.add(new FileRowDTO( // dataRows.add(new FileRowDTO(
file, // file,
file.getId(), // file.getId(),
file.getName(), // file.getName(),
file.getNameExtension(), // file.getNameExtension(),
MediaTypeUtils.getExtensionMediaType(file.getNameExtension()), // MediaTypeUtils.getExtensionMediaType(file.getNameExtension()),
file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.ALLOC), // file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.ALLOC),
file.getType(), // file.getType(),
cellValues)); // cellValues));
} // }
} }
if (!artifactIds.isEmpty()) { if (!artifactIds.isEmpty()) {
@ -315,11 +317,14 @@ public class ScoreDAO extends AbstractDAO {
.collect(Collectors.joining(", ")); .collect(Collectors.joining(", "));
List<DataArtifact> dataArtifacts = getCase().getBlackboard().getDataArtifactsWhere("obj_id IN (" + joinedArtifactIds + ")"); List<DataArtifact> dataArtifacts = getCase().getBlackboard().getDataArtifactsWhere("obj_id IN (" + joinedArtifactIds + ")");
// for (DataArtifact dataArt: dataArtifacts) {
// MainDAO.getInstance().getDataArtifactsDAO().create
// dataRows.add(new DataArtifactRowDTO(dataArt, srcContent, linkedFile, isTimelineSupported, cellValues, id));
// }
} }
// //
// return new BaseSearchResultsDTO(FILE_VIEW_EXT_TYPE_ID, displayName, FileSystemColumnUtils.getColumnKeysForAbstractfile(), fileRows, AbstractFile.class.getName(), startItem, totalResultsCount); return new BaseSearchResultsDTO(FILE_VIEW_EXT_TYPE_ID, displayName, FileSystemColumnUtils.getColumnKeysForAbstractfile(), fileRows, AbstractFile.class.getName(), startItem, totalResultsCount);
} }
private TreeItemDTO<?> createTreeItem(DAOEvent daoEvent, TreeDisplayCount count) { private TreeItemDTO<?> createTreeItem(DAOEvent daoEvent, TreeDisplayCount count) {