From 423549dc343c97f2383eae9bbfc5247ce3f12c4a Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Thu, 21 Oct 2021 15:25:42 -0400
Subject: [PATCH] 7673 Add ingest job IDs to artifact posts

---
 .../autopsy/recentactivity/Bundle.properties-MERGED        | 2 ++
 .../org/sleuthkit/autopsy/recentactivity/ExtractOs.java    | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index b310ec60b3..2d032d69fe 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -9,6 +9,7 @@ ChromeCacheExtractor.progressMsg={0}: Extracting cache entry {1} of {2} entries
 DataSourceUsage_AndroidMedia=Android Media Card
 DataSourceUsage_DJU_Drone_DAT=DJI Internal SD Card
 DataSourceUsage_FlashDrive=Flash Drive
+# {0} - OS name
 DataSourceUsageAnalyzer.customVolume.label=OS Drive ({0})
 DataSourceUsageAnalyzer.displayName=Data Source Usage Analyzer
 DataSourceUsageAnalyzer.parentModuleName=Recent Activity
@@ -27,6 +28,7 @@ ExtractOs.androidOs.label=Android
 ExtractOs.androidVolume.label=OS Drive (Android)
 ExtractOs.debianLinuxOs.label=Linux (Debian)
 ExtractOs.debianLinuxVolume.label=OS Drive (Linux Debian)
+ExtractOs.displayName=OS Info Extractor
 ExtractOs.fedoraLinuxOs.label=Linux (Fedora)
 ExtractOs.fedoraLinuxVolume.label=OS Drive (Linux Fedora)
 ExtractOs.gentooLinuxOs.label=Linux (Gentoo)
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractOs.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractOs.java
index d13568a50a..5adce7b595 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractOs.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractOs.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2019 Basis Technology Corp.
+ * Copyright 2019-2021 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.logging.Level;
 import org.apache.commons.io.FilenameUtils;
 import org.openide.util.NbBundle.Messages;
-import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
 import org.sleuthkit.autopsy.ingest.IngestJobContext;
@@ -40,7 +39,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Create OS INFO artifacts for the Operating Systems believed to be present on
  * the data source.
  */
-@Messages({"ExtractOs.parentModuleName=Recent Activity",
+@Messages({"ExtractOs.displayName=OS Info Extractor",
     "ExtractOS_progressMessage=Checking for OS"})
 class ExtractOs extends Extract {
 
@@ -105,7 +104,7 @@ class ExtractOs extends Extract {
             //if the os info program name is not empty create an os info artifact on the first of the files found
             Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
             bbattributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME,
-                    Bundle.ExtractOs_parentModuleName(),
+                    getRAModuleName(),
                     osType.getOsInfoLabel())); //NON-NLS
             postArtifact(createArtifactWithAttributes(BlackboardArtifact.Type.TSK_OS_INFO, file, bbattributes));
         }