mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-19 11:07:43 +00:00
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into new_table_load
This commit is contained in:
commit
420d86a23b
@ -56,6 +56,7 @@ import org.sleuthkit.autopsy.ingest.IngestManager;
|
|||||||
import org.sleuthkit.autopsy.ingest.IngestModuleError;
|
import org.sleuthkit.autopsy.ingest.IngestModuleError;
|
||||||
import org.sleuthkit.autopsy.ingest.IngestProfiles;
|
import org.sleuthkit.autopsy.ingest.IngestProfiles;
|
||||||
import org.sleuthkit.autopsy.ingest.IngestProfiles.IngestProfile;
|
import org.sleuthkit.autopsy.ingest.IngestProfiles.IngestProfile;
|
||||||
|
import org.sleuthkit.autopsy.ingest.profile.IngestProfilePaths;
|
||||||
import org.sleuthkit.autopsy.modules.interestingitems.FilesSet;
|
import org.sleuthkit.autopsy.modules.interestingitems.FilesSet;
|
||||||
import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager;
|
import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager;
|
||||||
import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
|
import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
|
||||||
@ -543,7 +544,7 @@ public class CommandLineIngestManager extends CommandLineManager {
|
|||||||
ingestJobSettings = new IngestJobSettings(UserPreferences.getCommandLineModeIngestModuleContextString());
|
ingestJobSettings = new IngestJobSettings(UserPreferences.getCommandLineModeIngestModuleContextString());
|
||||||
} else {
|
} else {
|
||||||
// load the custom ingest
|
// load the custom ingest
|
||||||
ingestJobSettings = new IngestJobSettings(selectedProfile.toString());
|
ingestJobSettings = new IngestJobSettings(IngestProfilePaths.getInstance().getIngestProfilePrefix() + selectedProfile.toString());
|
||||||
ingestJobSettings.setFileFilter(selectedFileSet);
|
ingestJobSettings.setFileFilter(selectedFileSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user