From 9ce8405c3617c434097dd49bf88b2f99523c1d8a Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Sun, 12 Jul 2020 09:29:46 -0400
Subject: [PATCH] Send $Unalloc virtual dir to ingest. Don't send root folder
to ingest.
---
bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
index 0b753b624..c468c9273 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
@@ -20,6 +20,7 @@
import org.apache.commons.lang3.StringUtils;
import java.util.List;
+import java.util.Arrays;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
@@ -352,7 +353,10 @@ private long addBatchedFilesToDb() {
null, TskData.FileKnown.UNKNOWN,
fileInfo.escaped_path, fileInfo.extension,
false, trans);
- newObjIds.add(objId);
+ if (fileInfo.fsObjId != fileInfo.parentObjId) {
+ // Add new file ID to the list to send to ingest unless it is the root folder
+ newObjIds.add(objId);
+ }
// If we're adding the root directory for the file system, cache it
if (fileInfo.parentObjId == fileInfo.fsObjId) {
@@ -546,6 +550,7 @@ long addUnallocFsBlockFilesParent(long fsObjId, String name) {
beginTransaction();
VirtualDirectory dir = caseDb.addVirtualDirectory(fsIdToRootDir.get(fsObjId), name, trans);
commitTransaction();
+ addDataSourceCallbacks.onFilesAdded(Arrays.asList(dir.getId()));
return dir.getId();
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error creating virtual directory " + name + " under file system ID " + fsObjId, ex);
--
GitLab