From 6dcff287d2bf080273860aa6b3c02eb4e5e3f52c Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Tue, 15 Sep 2020 14:22:06 -0400 Subject: [PATCH 1/3] Inital clean up --- .../org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED | 2 +- .../sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java | 2 +- .../modules/pictureanalyzer/impls/Bundle.properties-MERGED | 4 ++-- .../autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED index a964a1826e..c0d9ef6975 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED @@ -1,6 +1,6 @@ CTL_OpenDiscoveryAction=Discovery # {0} - dataSourceName -DataSourceModuleWrapper.exifModule.text=Exif Parser module was not run on data source: {0}\n +DataSourceModuleWrapper.exifModule.text=Picture Analyzer module was not run on data source: {0}\n # {0} - dataSourceName DataSourceModuleWrapper.fileTypeModule.text=File Type Identification module was not run on data source: {0}\n # {0} - dataSourceName diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java b/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java index 9d48827b30..2f0e30a6f0 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java @@ -49,7 +49,7 @@ class DataSourceModulesWrapper { "# {0} - dataSourceName", "DataSourceModuleWrapper.fileTypeModule.text=File Type Identification module was not run on data source: {0}\n", "# {0} - dataSourceName", - "DataSourceModuleWrapper.exifModule.text=Exif Parser module was not run on data source: {0}\n" + "DataSourceModuleWrapper.exifModule.text=Picture Analyzer module was not run on data source: {0}\n" }) /** * Get the message which indicates which modules were not run on this data diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED index 349e005b1b..2d18b6e66f 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED @@ -1,3 +1,3 @@ -ExifProcessor.indexError.message=Failed to post EXIF Metadata artifact(s). +ExifProcessor.indexError.message=Failed to post Picture Analzyer artifact(s). ExifProcessor.module_name=Exif Parser -ExifProcessor.userContent.description=EXIF metadata exists for this file. +ExifProcessor.userContent.description=Picture Analyzer data exists for this file. diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java index c2c5051050..210e85522b 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java @@ -69,8 +69,8 @@ public class EXIFProcessor implements PictureProcessor { @Override @NbBundle.Messages({ - "ExifProcessor.indexError.message=Failed to post EXIF Metadata artifact(s).", - "ExifProcessor.userContent.description=EXIF metadata exists for this file.", + "ExifProcessor.indexError.message=Failed to post Picture Analzyer artifact(s).", + "ExifProcessor.userContent.description=Picture Analyzer data exists for this file.", "ExifProcessor.module_name=Exif Parser" }) public void process(IngestJobContext context, AbstractFile file) { From 9a8e76f6577b276d36b8a8e5793d8748fb314abb Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Wed, 16 Sep 2020 12:27:43 -0400 Subject: [PATCH 2/3] Changed the string EXIFProcessor was using for module name --- .../modules/pictureanalyzer/impls/Bundle.properties-MERGED | 1 - .../modules/pictureanalyzer/impls/EXIFProcessor.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED index 2d18b6e66f..3882b130d3 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED @@ -1,3 +1,2 @@ ExifProcessor.indexError.message=Failed to post Picture Analzyer artifact(s). -ExifProcessor.module_name=Exif Parser ExifProcessor.userContent.description=Picture Analyzer data exists for this file. diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java index 210e85522b..d208fc514c 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java @@ -44,6 +44,7 @@ import org.sleuthkit.autopsy.ingest.IngestJobContext; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; +import org.sleuthkit.autopsy.modules.pictureanalyzer.PictureAnalyzerIngestModuleFactory; import org.sleuthkit.datamodel.Blackboard; import org.sleuthkit.datamodel.BlackboardArtifact; import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF; @@ -70,11 +71,10 @@ public class EXIFProcessor implements PictureProcessor { @Override @NbBundle.Messages({ "ExifProcessor.indexError.message=Failed to post Picture Analzyer artifact(s).", - "ExifProcessor.userContent.description=Picture Analyzer data exists for this file.", - "ExifProcessor.module_name=Exif Parser" + "ExifProcessor.userContent.description=Picture Analyzer data exists for this file." }) public void process(IngestJobContext context, AbstractFile file) { - final String MODULE_NAME = Bundle.ExifProcessor_module_name(); + final String MODULE_NAME = PictureAnalyzerIngestModuleFactory.getModuleName(); try (BufferedInputStream bin = new BufferedInputStream(new ReadContentInputStream(file));) { From 0dcada4a8c8a466c6441466b93f7cc7cf501a2dd Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Wed, 16 Sep 2020 15:37:53 -0400 Subject: [PATCH 3/3] Changed messages back to orginal state --- .../modules/pictureanalyzer/impls/Bundle.properties-MERGED | 4 ++-- .../autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED index 3882b130d3..569370ec6e 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED @@ -1,2 +1,2 @@ -ExifProcessor.indexError.message=Failed to post Picture Analzyer artifact(s). -ExifProcessor.userContent.description=Picture Analyzer data exists for this file. +ExifProcessor.indexError.message=Failed to post EXIF Metadata artifact(s). +ExifProcessor.userContent.description=EXIF metadata data exists for this file. diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java index d208fc514c..5a48fcf7bf 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java @@ -70,8 +70,8 @@ public class EXIFProcessor implements PictureProcessor { @Override @NbBundle.Messages({ - "ExifProcessor.indexError.message=Failed to post Picture Analzyer artifact(s).", - "ExifProcessor.userContent.description=Picture Analyzer data exists for this file." + "ExifProcessor.indexError.message=Failed to post EXIF Metadata artifact(s).", + "ExifProcessor.userContent.description=EXIF metadata data exists for this file." }) public void process(IngestJobContext context, AbstractFile file) { final String MODULE_NAME = PictureAnalyzerIngestModuleFactory.getModuleName();