Merge pull request #1322 from sidheshenator/add_derived_files_after_closing_resources

Add the derived files to the job after closing open resources
This commit is contained in:
Richard Cordovano 2015-06-08 15:05:20 -04:00
commit 755e4fcd86

View File

@ -486,12 +486,6 @@ class SevenZipExtractor {
unpackedTree.addDerivedFilesToCase(); unpackedTree.addDerivedFilesToCase();
unpackedFiles = unpackedTree.getAllFileObjects(); unpackedFiles = unpackedTree.getAllFileObjects();
if (!unpackedFiles.isEmpty()) {
//currently sending a single event for all new files
services.fireModuleContentEvent(new ModuleContentEvent(archiveFile));
context.addFilesToJob(unpackedFiles);
}
//check if children are archives, update archive depth tracking //check if children are archives, update archive depth tracking
for (AbstractFile unpackedFile : unpackedFiles) { for (AbstractFile unpackedFile : unpackedFiles) {
if (isSevenZipExtractionSupported(unpackedFile)) { if (isSevenZipExtractionSupported(unpackedFile)) {
@ -563,6 +557,13 @@ class SevenZipExtractor {
archiveFile.getName(), EmbeddedFileExtractorModuleFactory.getModuleName()); archiveFile.getName(), EmbeddedFileExtractorModuleFactory.getModuleName());
services.postMessage(IngestMessage.createWarningMessage(EmbeddedFileExtractorModuleFactory.getModuleName(), msg, details)); services.postMessage(IngestMessage.createWarningMessage(EmbeddedFileExtractorModuleFactory.getModuleName(), msg, details));
} }
// adding unpacked extracted derived files to the job after closing relevant resources.
if (!unpackedFiles.isEmpty()) {
//currently sending a single event for all new files
services.fireModuleContentEvent(new ModuleContentEvent(archiveFile));
context.addFilesToJob(unpackedFiles);
}
} }
/** /**