Skip to content
Snippets Groups Projects
Commit 9ce8405c authored by apriestman's avatar apriestman
Browse files

Send $Unalloc virtual dir to ingest.

Don't send root folder to ingest.
parent 6a6547bd
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;
import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
...@@ -352,7 +353,10 @@ private long addBatchedFilesToDb() { ...@@ -352,7 +353,10 @@ private long addBatchedFilesToDb() {
null, TskData.FileKnown.UNKNOWN, null, TskData.FileKnown.UNKNOWN,
fileInfo.escaped_path, fileInfo.extension, fileInfo.escaped_path, fileInfo.extension,
false, trans); 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 we're adding the root directory for the file system, cache it
if (fileInfo.parentObjId == fileInfo.fsObjId) { if (fileInfo.parentObjId == fileInfo.fsObjId) {
...@@ -546,6 +550,7 @@ long addUnallocFsBlockFilesParent(long fsObjId, String name) { ...@@ -546,6 +550,7 @@ long addUnallocFsBlockFilesParent(long fsObjId, String name) {
beginTransaction(); beginTransaction();
VirtualDirectory dir = caseDb.addVirtualDirectory(fsIdToRootDir.get(fsObjId), name, trans); VirtualDirectory dir = caseDb.addVirtualDirectory(fsIdToRootDir.get(fsObjId), name, trans);
commitTransaction(); commitTransaction();
addDataSourceCallbacks.onFilesAdded(Arrays.asList(dir.getId()));
return dir.getId(); return dir.getId();
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error creating virtual directory " + name + " under file system ID " + fsObjId, ex); logger.log(Level.SEVERE, "Error creating virtual directory " + name + " under file system ID " + fsObjId, ex);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment