installer updates for translator and cr

This commit is contained in:
Greg DiCristofaro 2022-05-18 08:22:30 -04:00
parent 6f8019b737
commit d04578d12a
4 changed files with 18 additions and 2 deletions

View File

@ -347,6 +347,7 @@
<package>org.sleuthkit.autopsy.textextractors.configs</package> <package>org.sleuthkit.autopsy.textextractors.configs</package>
<package>org.sleuthkit.autopsy.textsummarizer</package> <package>org.sleuthkit.autopsy.textsummarizer</package>
<package>org.sleuthkit.autopsy.texttranslation</package> <package>org.sleuthkit.autopsy.texttranslation</package>
<package>org.sleuthkit.autopsy.texttranslation.translators.settings</package>
<package>org.sleuthkit.autopsy.url.analytics</package> <package>org.sleuthkit.autopsy.url.analytics</package>
<package>org.sleuthkit.datamodel</package> <package>org.sleuthkit.datamodel</package>
<package>org.sleuthkit.datamodel.blackboardutils</package> <package>org.sleuthkit.datamodel.blackboardutils</package>

View File

@ -110,6 +110,7 @@ public class Installer extends ModuleInstall {
File prevDir = new File(prevPath); File prevDir = new File(prevPath);
// copy all files starting with prevDbName in prevPath to new path location. // copy all files starting with prevDbName in prevPath to new path location.
if (prevDir.exists() && prevDir.isDirectory()) { if (prevDir.exists() && prevDir.isDirectory()) {
new File(CentralRepoSettings.getInstance().getDefaultDbPath()).mkdirs();
try { try {
for (File childFile : prevDir.listFiles((dir, name) -> name.startsWith(prevDbName))) { for (File childFile : prevDir.listFiles((dir, name) -> name.startsWith(prevDbName))) {
FileUtils.copyFile(childFile, new File(CentralRepoSettings.getInstance().getDefaultDbPath(), childFile.getName())); FileUtils.copyFile(childFile, new File(CentralRepoSettings.getInstance().getDefaultDbPath(), childFile.getName()));
@ -118,7 +119,13 @@ public class Installer extends ModuleInstall {
logger.log(Level.SEVERE, "There was an error upgrading settings.", ex); logger.log(Level.SEVERE, "There was an error upgrading settings.", ex);
} }
} }
// update path settings accordingly
prevSettings.put(SqliteCentralRepoSettings.getDatabasePathKey(), CentralRepoSettings.getInstance().getDefaultDbPath());
} }
// copy settings
ModuleSettings.setConfigSettings(CentralRepoSettings.getInstance().getModuleSettingsKey(), prevSettings);
} }
} }

View File

@ -28,7 +28,11 @@ import org.sleuthkit.autopsy.texttranslation.translators.settings.TranslatorSett
public final class BingTranslatorSettings { public final class BingTranslatorSettings {
private static final String AUTHENTICATION_KEY = "Credentials"; private static final String AUTHENTICATION_KEY = "Credentials";
private static final String BING_TRANSLATE_NAME = TranslatorSettings.getInstance().getModuleSettingsResource("BingTranslate");
// Legacy ModuleSettings key to use.
static final String BING_TRANSLATE_SIMPLE_NAME = "BingTranslate";
// ModuleSettings key to use (moved to new directory).
static final String BING_TRANSLATE_NAME = TranslatorSettings.getInstance().getModuleSettingsResource(BING_TRANSLATE_SIMPLE_NAME);
private static final String DEFAULT_AUTHENTICATION = ""; private static final String DEFAULT_AUTHENTICATION = "";
private static final String DEFAULT_TARGET_LANGUAGE = "en"; private static final String DEFAULT_TARGET_LANGUAGE = "en";
private static final String TARGET_LANGUAGE_CODE_KEY = "TargetLanguageCode"; private static final String TARGET_LANGUAGE_CODE_KEY = "TargetLanguageCode";

View File

@ -31,7 +31,11 @@ public final class GoogleTranslatorSettings {
private static final String DEFAULT_TARGET_LANGUAGE = TranslateOptions.getDefaultInstance().getTargetLanguage(); private static final String DEFAULT_TARGET_LANGUAGE = TranslateOptions.getDefaultInstance().getTargetLanguage();
private static final String CREDENTIAL_PATH_KEY = "CredentialPath"; private static final String CREDENTIAL_PATH_KEY = "CredentialPath";
private static final String TARGET_LANGUAGE_CODE_KEY = "TargetLanguageCode"; private static final String TARGET_LANGUAGE_CODE_KEY = "TargetLanguageCode";
private static final String GOOGLE_TRANSLATE_NAME = TranslatorSettings.getInstance().getModuleSettingsResource("GoogleTranslate");
// Legacy module settings key used.
static final String GOOGLE_TRANSLATE_SIMPLE_NAME = "GoogleTranslate";
// Module settings key to use (moved to new directory).
static final String GOOGLE_TRANSLATE_NAME = TranslatorSettings.getInstance().getModuleSettingsResource(GOOGLE_TRANSLATE_SIMPLE_NAME);
private static final String DEFAULT_CREDENTIAL_PATH = ""; private static final String DEFAULT_CREDENTIAL_PATH = "";
private String targetLanguageCode; private String targetLanguageCode;
private String credentialPath; private String credentialPath;