Merge branch 'macos-platform-logic'

This branch adds true support for the macos-arm64 and macos64 platforms
as their own entities, and retools the macosx platform into a "platform
group" encompassing any Mac, including both macos-arm64 and macos64.

It also rebrands the "updateable platforms" logic as "active platforms"
to avoid naming confusion with "updateable" files and related API.
And it broadens the platform activation logic to also activate a
platform when its special jars and/or lib subdirectory is present in
the installation. This makes it easier and hopefully less mysterious to
start receiving updates for a particular platform of interest, even if
your actual platform does not match the one you want the files for.

This is especially important for macos-arm64 systems, because
people are likely to want the macos64 platform active as well so that
they can run in x86 mode with Rosetta and make use of x86-specific
native libraries, until all macos-arm64 native libraries become
fully accessible (not only are builds for that architecture needed, but
they also need to be code-signed to appease the hardened runtime!).

Relatedly: this branch now treats *all* files beneath a toplevel folder
ending in .app as launchers for the macosx platform group. In this way,
the entire Fiji.app for Fiji (or whatever the launcher is named) will
always be shipped together by the Updater, to avoid ruining the
immutable app bundle's code signature by splitting it up. As such,
the fact that macos-arm64 and macos64 activate when one of their
native library subfolders is present is actually now needed, since
there are not native launchers that would activate them otherwise.

Instead of the macosx platform group, I considered going through the
db.xml.gz files to update macosx platform files to `macosx,macos-arm64`,
since each file is allowed to belong to multiple platforms, and this
branch does add support for comma-splitting the platform field of the
db.xml (which wasn't being done before). But I think we never use the
multiple platforms feature of FileObject right now, and furthermore,
changing the db.xml.gz files would still leave third-party update sites
in a suboptimal place, with any macOS-specific files they ship still
labeled with previous architecture-agnostic macosx platform tag. I
figured it's better to keep support for the macosx tag, and leave it
meaning essentially what it has always meant: any Mac machine. That way,
existing update sites continue to "just work" on both Mac architectures,
at least from the perspective of those installations not ignoring any
potentially relevant Mac-specific files.

Author: ctrueden

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>net.imagej</groupId>
 	<artifactId>imagej-updater</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<name>ImageJ Updater</name>
 	<description>Keeps components of ImageJ up-to-date.</description>

src/main/java/net/imagej/updater/Checksummer.java

@@ -39,6 +39,7 @@
 import java.io.Writer;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -57,6 +58,7 @@
 import net.imagej.updater.Conflicts.Conflict.Severity;
 import net.imagej.updater.FileObject.Status;
 import net.imagej.updater.util.AbstractProgressable;
+import net.imagej.updater.util.Platforms;
 import net.imagej.updater.util.Progress;
 import net.imagej.updater.util.UpdaterUtil;
 
@@ -75,23 +77,23 @@
  */
 public class Checksummer extends AbstractProgressable {
 
-	private FilesCollection files;
+	private final FilesCollection files;
 	private int counter, total;
 	private Map<String, FileObject.Version> cachedChecksums;
-	private boolean isWindows; // time tax for Redmond
+	private final boolean isWindows; // time tax for Redmond
 	private Map<String, List<StringAndFile>> queue;
 
 	public Checksummer(final FilesCollection files, final Progress progress) {
 		this.files = files;
 		if (progress != null) addProgress(progress);
 		setTitle("Checksummer");
-		isWindows = UpdaterUtil.getPlatform().startsWith("win");
+		isWindows = Platforms.isWindows(files.platform());
 	}
 
 	protected static class StringAndFile {
 
-		private String path;
-		private File file;
+		private final String path;
+		private final File file;
 		public long timestamp;
 		public String checksum;
 
@@ -135,8 +137,7 @@ protected boolean exists(final File file) {
 
 	public void queueDir(final String[] dirs, final String[] extensions) {
 		final Set<String> set = new HashSet<>();
-		for (final String extension : extensions)
-			set.add(extension);
+		Collections.addAll(set, extensions);
 		for (final String dir : dirs)
 			queueDir(dir, set);
 	}
@@ -176,7 +177,7 @@ protected void queue(final String path, final File file) {
 		// from the consideration.
 		if (unversioned.contains(".old")) return;
 		if (!queue.containsKey(unversioned))
-			queue.put(unversioned, new ArrayList<StringAndFile>());
+			queue.put(unversioned, new ArrayList<>());
 		List<StringAndFile> list = queue.get(unversioned);
 		StringAndFile entry = new StringAndFile(path, file);
 		if (!list.contains(entry)) list.add(entry);
@@ -242,27 +243,24 @@ else if (object.hasPreviousVersion(p.checksum))
 				else
 					locallyModifieds.add(p);
 			}
-			Comparator<StringAndFile> comparator = new Comparator<StringAndFile>() {
-				@Override
-				public int compare(StringAndFile a, StringAndFile b) {
-					long diff = a.file.lastModified() - b.file.lastModified();
-					return diff < 0 ? +1 : diff > 0 ? -1 : 0;
-				}
+			Comparator<StringAndFile> comparator = (a, b) -> {
+				long diff = a.file.lastModified() - b.file.lastModified();
+				return diff < 0 ? +1 : diff > 0 ? -1 : 0;
 			};
-			Collections.sort(upToDates, comparator);
-			Collections.sort(obsoletes, comparator);
-			Collections.sort(locallyModifieds, comparator);
-			if (upToDates.size() > 0)
+			upToDates.sort(comparator);
+			obsoletes.sort(comparator);
+			locallyModifieds.sort(comparator);
+			if (!upToDates.isEmpty())
 				pair = pickNewest(upToDates);
-			else if (obsoletes.size() > 0)
+			else if (!obsoletes.isEmpty())
 				pair = pickNewest(obsoletes);
 			else
 				pair = pickNewest(locallyModifieds);
-			if (locallyModifieds.size() > 0)
+			if (!locallyModifieds.isEmpty())
 				addConflict(pair.path, "locally-modified", true, convert(locallyModifieds));
-			if (obsoletes.size() > 0)
+			if (!obsoletes.isEmpty())
 				addConflict(pair.path, "obsolete", false, convert(obsoletes));
-			if (upToDates.size() > 0)
+			if (!upToDates.isEmpty())
 				addConflict(pair.path, "up-to-date", false, convert(upToDates));
 		}
 		handle(pair);
@@ -289,7 +287,7 @@ protected static List<File> convert(final List<StringAndFile> pairs) {
 	}
 
 	protected void addConflict(final String filename, String adjective, boolean isCritical, final List<File> toDelete) {
-		if (!adjective.equals("") && !adjective.endsWith(" "))
+		if (!adjective.isEmpty() && !adjective.endsWith(" "))
 			adjective += " ";
 		String conflictMessage = "Multiple " + adjective + "versions of " + filename + " exist: " + UpdaterUtil.join(", ", toDelete);
 		Resolution ignore = new Resolution("Ignore for now") {
@@ -349,9 +347,9 @@ protected void handle(final StringAndFile pair) {
 				object.localFilename = pair.path;
 				object.localChecksum = pair.checksum;
 				object.localTimestamp = pair.timestamp;
-				if ((!isWindows && UpdaterUtil.canExecute(pair.file)) || pair.path.endsWith(".exe")) object.executable =
-					true;
-				tryToGuessPlatform(object);
+				if ((!isWindows && UpdaterUtil.canExecute(pair.file)) || pair.path.endsWith(".exe"))
+					object.executable = true;
+				guessPlatform(object);
 				files.add(object);
 			}
 			else {
@@ -367,7 +365,7 @@ protected void handle(final StringAndFile pair) {
 						}
 					}
 				} else if (object.current != null && obsoletes != null
-						&& (":" + obsoletes.checksum + ":").indexOf(":" + object.current.checksum + ":") >= 0) {
+						&& (":" + obsoletes.checksum + ":").contains(":" + object.current.checksum + ":")) {
 					// if the recorded checksum is an obsolete equivalent of the current one, use the obsolete one
 					pair.checksum = object.current.checksum;
 				}
@@ -428,11 +426,11 @@ public void updateFromLocal(final List<String> files) {
 		handleQueue();
 	}
 
-	protected boolean tryToGuessPlatform(final FileObject file) {
+	protected boolean guessPlatform(final FileObject file) {
 		// Look for platform names as subdirectories of lib/ and mm/
 		String platform;
 		if (file.executable) {
-			platform = UpdaterUtil.platformForLauncher(file.filename);
+			platform = Platforms.platformForLauncher(file.filename);
 			if (platform == null) return false;
 		}
 		else {
@@ -454,7 +452,7 @@ else if (file.filename.startsWith("mm/")) {
 
 		if (platform.equals("linux")) platform = "linux32";
 
-		for (final String valid : files.util.platforms)
+		for (final String valid : Platforms.known())
 			if (platform.equals(valid)) {
 				file.addPlatform(platform);
 				return true;
@@ -485,9 +483,7 @@ else if (file.filename.startsWith("mm/")) {
 	static {
 		extensions = new HashMap<>();
 		for (int i = 0; i < directories.length; i += 2) {
-			final Set<String> set = new HashSet<>();
-			for (final String extension : directories[i + 1])
-				set.add(extension);
+			final Set<String> set = new HashSet<>(Arrays.asList(directories[i + 1]));
 			for (final String dir : directories[i + 1])
 				extensions.put(dir, set);
 		}
@@ -496,7 +492,7 @@ else if (file.filename.startsWith("mm/")) {
 	public boolean isCandidate(String path) {
 		path = path.replace('\\', '/'); // Microsoft time toll
 		final int slash = path.indexOf('/');
-		if (slash < 0) return files.util.isLauncher(path);
+		if (slash < 0) return Platforms.isLauncher(path);
 		final Set<String> exts = extensions.get(path.substring(0, slash));
 		final int dot = path.lastIndexOf('.');
 		return exts != null && dot >= 0 && exts.contains(path.substring(dot));
@@ -507,8 +503,10 @@ protected void initializeQueue() {
 
 		queueIfExists("README.md");
 		queueIfExists("WELCOME.md");
-		queueIfExists("ImageJ.sh");
-		for (final String launcher : files.util.launchers)
+		queueIfExists("fiji");
+		queueIfExists("fiji.bat");
+		queueIfExists("ImageJ.sh"); // deprecated
+		for (final String launcher : Platforms.launchers())
 			queueIfExists(launcher);
 
 		// Queue any macOS .app folders.
@@ -585,8 +583,7 @@ protected void writeCachedChecksums() {
 	}
 
 	protected String getDigest(final String path, final File file,
-		final long timestamp) throws IOException, NoSuchAlgorithmException,
-		ZipException
+		final long timestamp) throws IOException, NoSuchAlgorithmException
 	{
 		if (cachedChecksums == null) readCachedChecksums();
 		FileObject.Version version = cachedChecksums.get(path);

src/main/java/net/imagej/updater/CommandLine.java

@@ -151,9 +151,7 @@ public FileFilter(final List<String> files) {
 
 		@Override
 		public boolean matches(final FileObject file) {
-			if (!file.isUpdateablePlatform(files)) {
-				return false;
-			}
+			if (!file.isActivePlatform(files)) return false;
 			if (fileNames != null
 					&& !fileNames.contains(file.getFilename(true))) {
 				return false;
@@ -164,7 +162,7 @@ public boolean matches(final FileObject file) {
 
 	public void diff(final List<String> list) {
 		ensureChecksummed();
-		final Diff diff = new Diff(System.out, files.util);
+		final Diff diff = new Diff(System.out);
 
 		Mode mode = Mode.CLASS_FILE_DIFF;
 		while (list.size() > 0 && list.get(0).startsWith("--")) {
@@ -488,8 +486,8 @@ public String toString() {
 	public void download(final FileObject file) {
 		ensureChecksummed();
 		try {
-			new Downloader(progress, files.util).start(new OneFile(file));
-			if (file.executable && !files.util.platform.startsWith("win")) {
+			new Downloader(progress).start(new OneFile(file));
+			if (file.executable && !Platforms.isWindows(files.platform())) {
 				try {
 					Runtime.getRuntime().exec(
 							new String[] { "chmod", "0755",
@@ -930,7 +928,7 @@ public void uploadCompleteSite(final List<String> list) {
 			throw die("Which files do you mean to upload?");
 		}
 		boolean ignoreWarnings = false, forceShadow = false, simulate = false;
-		while (list.size() > 0 && list.get(0).startsWith("-")) {
+		while (!list.isEmpty() && list.get(0).startsWith("-")) {
 			final String option = list.remove(0);
 			if ("--force".equals(option)) {
 				ignoreWarnings = true;
@@ -939,10 +937,10 @@ public void uploadCompleteSite(final List<String> list) {
 			} else if ("--simulate".equals(option)) {
 				simulate = true;
 			} else if ("--platforms".equals(option)) {
-				if (list.size() == 0) {
+				if (list.isEmpty()) {
 					throw die("Need a comma-separated list of platforms with --platform");
 				}
-				files.util.setUpdateablePlatforms(list.remove(0).split(","));
+				files.setActivePlatforms(list.remove(0).split(","));
 			} else {
 				throw die("Unknown option: " + option);
 			}
@@ -959,7 +957,7 @@ public void uploadCompleteSite(final List<String> list) {
 
 		int removeCount = 0, uploadCount = 0, warningCount = 0;
 		for (final FileObject file : files) {
-			if (!file.isUpdateablePlatform(files)) {
+			if (!file.isActivePlatform(files)) {
 				continue;
 			}
 			final String name = file.filename;
@@ -1013,7 +1011,7 @@ public void uploadCompleteSite(final List<String> list) {
 						&& file.getFilename(true).equals("jars/tools.jar")) {
 					break;
 				}
-				if (!file.isUpdateablePlatform(files)) break;
+				if (!file.isActivePlatform(files)) break;
 				file.setAction(files, Action.REMOVE);
 				if (simulate) {
 					log.info("Would mark " + file.filename + " obsolete");
@@ -1087,9 +1085,9 @@ public void uploadCompleteSite(final List<String> list) {
 
 	private void handleLauncherForUpload(final FileObject file) {
 		if (file.getStatus() == Status.LOCAL_ONLY
-				&& files.util.isLauncher(file.filename)) {
+				&& Platforms.isLauncher(file.filename)) {
 			file.executable = true;
-			file.addPlatform(UpdaterUtil.platformForLauncher(file.filename));
+			file.addPlatform(Platforms.platformForLauncher(file.filename));
 			for (final String fileName : new String[] { "jars/imagej-launcher.jar" }) {
 				final FileObject dependency = files.get(fileName);
 				if (dependency != null) {

src/main/java/net/imagej/updater/Diff.java

@@ -95,7 +95,6 @@ public String toString() {
 	}
 
 	private final PrintStream out;
-	private final UpdaterUtil util;
 
 	/**
 	 * Construct a Diff object.
@@ -104,18 +103,7 @@ public String toString() {
 	 */
 	@Deprecated
 	public Diff(final PrintStream out) {
-		this(out, null);
-	}
-
-	/**
-	 * Construct a Diff object.
-	 * 
-	 * @param out this is where the output goes
-	 * @param util an instance of {@link UpdaterUtil} to access URLs
-	 */
-	public Diff(final PrintStream out, final UpdaterUtil util) {
 		this.out = out;
-		this.util = util != null ? util : new UpdaterUtil(null);
 	}
 
 	/**
@@ -447,7 +435,7 @@ protected File cacheFile(final URL url, boolean evenLocal) throws IOException {
 		if (extension.startsWith("jar-")) extension = "jar";
 		final File result = File.createTempFile("diff-", "".equals(extension) ? "" : "." + extension);
 		result.deleteOnExit();
-		copy(util.openStream(url), new FileOutputStream(result), true, true);
+		copy(UpdaterUtil.openStream(url), new FileOutputStream(result), true, true);
 		return result;
 	}