Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-11-24-23'

Ghidra/Framework/Generic/src/main/java/ghidra/util/extensions/ExtensionUtils.java

@@ -96,12 +96,13 @@ public class ExtensionUtils {
 	}
 
 	public static boolean install(ExtensionDetails extension, File file, TaskMonitor monitor) {
+		boolean success = false;
 		try {
 			if (file.isFile()) {
-				return unzipToInstallationFolder(extension, file, monitor);
+				success = unzipToInstallationFolder(extension, file, monitor);
 			}
 
-			return copyToInstallationFolder(file, monitor);
+			success = copyToInstallationFolder(extension, file, monitor);
 		}
 		catch (CancelledException e) {
 			log.info("Extension installation cancelled by user");
@@ -110,7 +111,12 @@ public class ExtensionUtils {
 			Msg.showError(ExtensionUtils.class, null, "Error Installing Extension",
 				"Unexpected error installing extension", e);
 		}
-		return false;
+
+		if (success) {
+			extensions.add(extension);
+		}
+
+		return success;
 	}
 
 	public static Set<ExtensionDetails> getActiveInstalledExtensions() {
@@ -197,10 +203,17 @@ public class ExtensionUtils {
 	 */
 	public static void reload() {
 		log.trace("Clearing extensions cache");
-		extensions = null;
+		clearCache();
 		getAllInstalledExtensions();
 	}
 
+	/**
+	 * Clears any cached extensions.
+	 */
+	public static void clearCache() {
+		extensions = null;
+	}
+
 	/**
 	 * Returns all archive extensions. These are all the extensions found in
 	 * {@link ApplicationLayout#getExtensionArchiveDir}.   This are added to an installation as
@@ -260,8 +273,7 @@ public class ExtensionUtils {
 			}
 		}
 		catch (IOException e) {
-			log.error(
-				"Unable to read zip file to get extension properties: " + file, e);
+			log.error("Unable to read zip file to get extension properties: " + file, e);
 		}
 		return null;
 	}
@@ -276,10 +288,9 @@ public class ExtensionUtils {
 			}
 
 			if (results.contains(extension)) {
-				log.error(
-					"Skipping extension \"" + extension.getName() + "\" found at " +
-						extension.getInstallPath() +
-						".\nArchived extension by that name already found.");
+				log.error("Skipping extension \"" + extension.getName() + "\" found at " +
+					extension.getInstallPath() +
+					".\nArchived extension by that name already found.");
 			}
 			results.add(extension);
 		}
@@ -299,9 +310,8 @@ public class ExtensionUtils {
 			extension.setArchivePath(extDir.getAbsolutePath());
 
 			if (results.contains(extension)) {
-				log.error(
-					"Skipping duplicate extension \"" + extension.getName() + "\" found at " +
-						extension.getInstallPath());
+				log.error("Skipping duplicate extension \"" + extension.getName() + "\" found at " +
+					extension.getInstallPath());
 			}
 			results.add(extension);
 		}
@@ -368,8 +378,7 @@ public class ExtensionUtils {
 			Properties nextProperties = getProperties(zipFile, entry);
 			if (nextProperties != null) {
 				if (props != null) {
-					throw new IOException(
-						"Zip file contains multiple extension properties files");
+					throw new IOException("Zip file contains multiple extension properties files");
 				}
 				props = nextProperties;
 			}
@@ -484,27 +493,29 @@ public class ExtensionUtils {
 	 * <p>
 	 * Note: Any existing folder with the same name will be overwritten.
 	 *
+	 * @param extension the extension
 	 * @param sourceFolder the extension folder
 	 * @param monitor the task monitor
 	 * @return true if successful
 	 * @throws IOException if the delete or copy fails
 	 * @throws CancelledException if the user cancels the copy
 	 */
-	private static boolean copyToInstallationFolder(File sourceFolder, TaskMonitor monitor)
-			throws IOException, CancelledException {
+	private static boolean copyToInstallationFolder(ExtensionDetails extension, File sourceFolder,
+			TaskMonitor monitor) throws IOException, CancelledException {
 
 		log.trace("Copying extension from " + sourceFolder);
 
 		ApplicationLayout layout = Application.getApplicationLayout();
 		ResourceFile installDir = layout.getExtensionInstallationDirs().get(0);
 		File installDirRoot = installDir.getFile(false);
-		File newDir = new File(installDirRoot, sourceFolder.getName());
-		if (hasExistingExtension(newDir, monitor)) {
+		File destinationFolder = new File(installDirRoot, sourceFolder.getName());
+		if (hasExistingExtension(destinationFolder, monitor)) {
 			return false;
 		}
 
-		log.trace("Copying extension to " + newDir);
-		FileUtilities.copyDir(sourceFolder, newDir, monitor);
+		log.trace("Copying extension to " + destinationFolder);
+		FileUtilities.copyDir(sourceFolder, destinationFolder, monitor);
+		extension.setInstallDir(destinationFolder);
 		return true;
 	}
 
@@ -524,8 +535,7 @@ public class ExtensionUtils {
 	 * @throws IOException if error unzipping zip file
 	 */
 	private static boolean unzipToInstallationFolder(ExtensionDetails extension, File file,
-			TaskMonitor monitor)
-			throws CancelledException, IOException {
+			TaskMonitor monitor) throws CancelledException, IOException {
 
 		log.trace("Unzipping extension from " + file);
 
@@ -554,6 +564,8 @@ public class ExtensionUtils {
 				}
 			}
 		}
+
+		extension.setInstallDir(destinationFolder);
 		return true;
 	}
 

Ghidra/Framework/Generic/src/main/java/ghidra/util/extensions/Extensions.java

@@ -43,7 +43,7 @@ public class Extensions {
 	 * @return all matching extensions
 	 */
 	public List<ExtensionDetails> getMatchingExtensions(ExtensionDetails e) {
-		return extensionsByName.computeIfAbsent(e.getName(), name -> List.of());
+		return extensionsByName.computeIfAbsent(e.getName(), name -> new ArrayList<>());
 	}
 
 	/**
@@ -187,8 +187,7 @@ public class Extensions {
 		for (int i = 1; i < extensions.size(); i++) {
 			ExtensionDetails duplicate = extensions.get(i);
 			log.info("Duplicate extension found '" + name + "'.  Keeping extension from " +
-				loadedInstallDir + ".  Skipping extension found at " +
-				duplicate.getInstallDir());
+				loadedInstallDir + ".  Skipping extension found at " + duplicate.getInstallDir());
 		}
 	}
 

Ghidra/Framework/Project/src/main/java/ghidra/framework/project/extensions/ExtensionInstaller.java

@@ -121,8 +121,7 @@ public class ExtensionInstaller {
 
 		String archivePath = extension.getArchivePath();
 		if (archivePath == null) {
-			log.error(
-				"Cannot install from archive; extension is missing archive path");
+			log.error("Cannot install from archive; extension is missing archive path");
 			return false;
 		}
 
@@ -161,9 +160,7 @@ public class ExtensionInstaller {
 		String message = "Extension version mismatch.\nName: " + extension.getName() +
 			"Extension version: " + extVersion + ".\nGhidra version: " + appVersion + ".";
 		int choice = OptionDialog.showOptionDialogWithCancelAsDefaultButton(null,
-			"Extension Version Mismatch",
-			message,
-			"Install Anyway");
+			"Extension Version Mismatch", message, "Install Anyway");
 		if (choice != OptionDialog.OPTION_ONE) {
 			log.info(removeNewlines(message + " Did not install"));
 			return false;
@@ -201,16 +198,12 @@ public class ExtensionInstaller {
 				"Installed extension version: " + installedExtension.getVersion() + ".\n\n" +
 				"To install, click 'Remove Existing', restart Ghidra, then install again.";
 		int choice = OptionDialog.showOptionDialogWithCancelAsDefaultButton(null,
-			"Duplicate Extension",
-			message,
-			"Remove Existing");
+			"Duplicate Extension", message, "Remove Existing");
 
 		String installPath = installedExtension.getInstallPath();
 		if (choice != OptionDialog.OPTION_ONE) {
-			log.info(
-				removeNewlines(
-					message + " Skipping installation. Original extension still installed: " +
-						installPath));
+			log.info(removeNewlines(message +
+				" Skipping installation. Original extension still installed: " + installPath));
 			return true;
 		}
 
@@ -218,10 +211,9 @@ public class ExtensionInstaller {
 		// At this point the user would like to replace the existing extension.  We cannot delete
 		// the existing extension, as it may be in use; mark it for removal.
 		//
-		log.info(
-			removeNewlines(
-				message + " Installing new extension. Existing extension will be removed after " +
-					"restart: " + installPath));
+		log.info(removeNewlines(
+			message + " Installing new extension. Existing extension will be removed after " +
+				"restart: " + installPath));
 		installedExtension.markForUninstall();
 		return true;
 	}

Ghidra/Framework/Project/src/test/java/ghidra/framework/project/extensions/ExtensionInstallerTest.java

@@ -60,6 +60,9 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 
 		setErrorGUIEnabled(false);
 
+		// clear static caching of extensions
+		ExtensionUtils.clearCache();
+
 		appLayout = Application.getApplicationLayout();
 
 		FileUtilities.deleteDir(appLayout.getExtensionArchiveDir().getFile(false));
@@ -317,8 +320,7 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 			didInstall.set(ExtensionInstaller.install(extensionFolder2));
 		});
 
-		DialogComponentProvider confirmDialog =
-			waitForDialogComponent("Duplicate Extension");
+		DialogComponentProvider confirmDialog = waitForDialogComponent("Duplicate Extension");
 		pressButtonByText(confirmDialog, "Remove Existing");
 
 		waitForSwing();
@@ -363,8 +365,7 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 			didInstall.set(ExtensionInstaller.install(extensionFolder2));
 		});
 
-		DialogComponentProvider confirmDialog =
-			waitForDialogComponent("Duplicate Extension");
+		DialogComponentProvider confirmDialog = waitForDialogComponent("Duplicate Extension");
 		pressButtonByText(confirmDialog, "Cancel");
 		waitForSwing();
 
@@ -397,8 +398,7 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 			didInstall.set(ExtensionInstaller.install(extensionFolder2));
 		});
 
-		DialogComponentProvider confirmDialog =
-			waitForDialogComponent("Duplicate Extension");
+		DialogComponentProvider confirmDialog = waitForDialogComponent("Duplicate Extension");
 		pressButtonByText(confirmDialog, "Remove Existing");
 
 		waitForSwing();
@@ -493,10 +493,9 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 
 	private void assertExtensionNotInstalled(String name, String version) {
 		Set<ExtensionDetails> extensions = ExtensionUtils.getInstalledExtensions();
-		Optional<ExtensionDetails> match =
-			extensions.stream()
-					.filter(e -> e.getName().equals(name) && e.getVersion().equals(version))
-					.findFirst();
+		Optional<ExtensionDetails> match = extensions.stream()
+				.filter(e -> e.getName().equals(name) && e.getVersion().equals(version))
+				.findFirst();
 		assertFalse("Extension should not be installed: '" + name + "'", match.isPresent());
 	}
 
@@ -594,8 +593,7 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 	}
 
 	private File doCreateExternalExtensionInFolder(File externalFolder, String extensionName,
-			String version)
-			throws Exception {
+			String version) throws Exception {
 		return doCreateExternalExtensionInFolder(externalFolder, extensionName, extensionName,
 			version);
 	}
@@ -609,9 +607,8 @@ public class ExtensionInstallerTest extends AbstractDockingTest {
 			version);
 	}
 
-	private File doCreateExternalExtensionInFolder(File externalFolder,
-			String extensionName, String nameProperty, String version)
-			throws Exception {
+	private File doCreateExternalExtensionInFolder(File externalFolder, String extensionName,
+			String nameProperty, String version) throws Exception {
 		ResourceFile root = new ResourceFile(new ResourceFile(externalFolder), extensionName);
 		root.mkdir();