diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java index fad32d6cc4..fb25824727 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java @@ -43,15 +43,6 @@ public abstract class GetFilesContentVisitor implements ContentVisitor visit(File file); - - @Override - public abstract Collection visit(FileSystem fs); - - @Override - public abstract Collection visit(LayoutFile lc); - @Override public Collection visit(VirtualDirectory ld) { return getAllFromChildren(ld); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java index b796d1b3cc..96435b6878 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java @@ -38,6 +38,7 @@ import org.sleuthkit.autopsy.ingest.IngestScheduler.FileScheduler.ProcessTask; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ContentVisitor; +import org.sleuthkit.datamodel.DerivedFile; import org.sleuthkit.datamodel.Directory; import org.sleuthkit.datamodel.File; import org.sleuthkit.datamodel.FileSystem; @@ -56,6 +57,8 @@ import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM; * Currently a singleton object only. * * Contains internal schedulers for image and file ingests. + * + * TODO test derived files scheduling * */ class IngestScheduler { @@ -878,8 +881,18 @@ class IngestScheduler { @Override public Collection visit(File file) { - throw new IllegalStateException("Should not happen, file cannot be a direct child or Fs, Volume, or Image"); + //can have derived files + return getAllFromChildren(file); } + + @Override + public Collection visit(DerivedFile derivedFile) { + //can have derived files + //TODO test this and overall scheduler with derived files + return getAllFromChildren(derivedFile); + } + + } }