jdk-sandbox: comparison src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java

equal deleted inserted replaced

-:a9316bb4c0e8
+:d1602ae35212
 */
 package jdk.jpackage.internal;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.imageio.ImageIO;
 static final String UTILITY_SCRIPTS = "UTILITY_SCRIPTS";
 DesktopIntegration(PlatformPackage thePackage,
 Map<String, ? super Object> params) {
-associations = FILE_ASSOCIATIONS.fetchFrom(params).stream().filter(
+associations = FileAssociation.fetchFrom(params).stream()
-a -> {
+.filter(fa -> !fa.mimeTypes.isEmpty())
-if (a == null) {
+.map(LinuxFileAssociation::new)
-return false;
+.collect(Collectors.toUnmodifiableList());
-}
-List<String> mimes = FA_CONTENT_TYPE.fetchFrom(a);
-return (mimes != null && !mimes.isEmpty());
-}).collect(Collectors.toUnmodifiableList());
 launchers = ADD_LAUNCHERS.fetchFrom(params);
 this.thePackage = thePackage;
 List::stream).map(DesktopIntegration::requiredPackagesSelf).flatMap(
 List::stream).distinct().collect(Collectors.toList());
 }
 Map<String, String> create() throws IOException {
+associations.forEach(assoc -> assoc.data.verify());
 if (iconFile != null) {
 // Create application icon file.
 iconResource.saveToFile(iconFile.srcPath());
 }
 createFileAssociationsMimeInfoFile();
 shellCommands.setFileAssociations();
 // Create icon files corresponding to file associations
-Map<String, Path> mimeTypeWithIconFile = createFileAssociationIconFiles();
+addFileAssociationIconFiles(shellCommands);
-mimeTypeWithIconFile.forEach((k, v) -> {
-shellCommands.addIcon(k, v);
-});
 }
 // Create shell commands to install/uninstall integration with desktop of the app.
 if (shellCommands != null) {
 shellCommands.applyTo(data);
 unregisterFileAssociationsCmd = stringifyShellCommands(
 unregisterFileAssociationsCmd, cleanUpCommand);
 }
 void addIcon(String mimeType, Path iconFile) {
-final int imgSize = getSquareSizeOfImage(iconFile.toFile());
+addIcon(mimeType, iconFile, getSquareSizeOfImage(iconFile.toFile()));
+}
+void addIcon(String mimeType, Path iconFile, int imgSize) {
+imgSize = normalizeIconSize(imgSize);
 final String dashMime = mimeType.replace('/', '-');
 registerIconCmds.add(String.join(" ", "xdg-icon-resource",
-"install", "--context", "mimetypes", "--size ",
+"install", "--context", "mimetypes", "--size",
 Integer.toString(imgSize), iconFile.toString(), dashMime));
 unregisterIconCmds.add(String.join(" ", "xdg-icon-resource",
-"uninstall", dashMime));
+"uninstall", dashMime, "--size", Integer.toString(imgSize)));
 }
 void applyTo(Map<String, String> data) {
 List<String> cmds = new ArrayList<>();
 return srcPath;
 }
 }
 private void appendFileAssociation(XMLStreamWriter xml,
-Map<String, ? super Object> assoc) throws XMLStreamException {
+FileAssociation assoc) throws XMLStreamException {
-xml.writeStartElement("mime-type");
+for (var mimeType : assoc.mimeTypes) {
-final String thisMime = FA_CONTENT_TYPE.fetchFrom(assoc).get(0);
+xml.writeStartElement("mime-type");
-xml.writeAttribute("type", thisMime);
+xml.writeAttribute("type", mimeType);
-final String description = FA_DESCRIPTION.fetchFrom(assoc);
+final String description = assoc.description;
 if (description != null && !description.isEmpty()) {
 xml.writeStartElement("comment");
 xml.writeCharacters(description);
 xml.writeEndElement();
 }
-final List<String> extensions = FA_EXTENSIONS.fetchFrom(assoc);
+for (String ext : assoc.extensions) {
-if (extensions == null) {
-Log.error(I18N.getString(
-"message.creating-association-with-null-extension"));
-} else {
-for (String ext : extensions) {
 xml.writeStartElement("glob");
 xml.writeAttribute("pattern", "*." + ext);
 xml.writeEndElement();
 }
-}
+xml.writeEndElement();
-xml.writeEndElement();
+}
 }
 private void createFileAssociationsMimeInfoFile() throws IOException {
 IOUtils.createXml(mimeInfoFile.srcPath(), xml -> {
 xml.writeStartElement("mime-info");
 xml.writeDefaultNamespace(
 "http://www.freedesktop.org/standards/shared-mime-info");
 for (var assoc : associations) {
-appendFileAssociation(xml, assoc);
+appendFileAssociation(xml, assoc.data);
 }
 xml.writeEndElement();
 });
 }
-private Map<String, Path> createFileAssociationIconFiles() throws
+private void addFileAssociationIconFiles(ShellCommands shellCommands)
-IOException {
+throws IOException {
-Map<String, Path> mimeTypeWithIconFile = new HashMap<>();
+Set<String> processedMimeTypes = new HashSet<>();
 for (var assoc : associations) {
-File customFaIcon = FA_ICON.fetchFrom(assoc);
+if (assoc.iconSize <= 0) {
-if (customFaIcon == null || !customFaIcon.exists() || getSquareSizeOfImage(
+// No icon.
-customFaIcon) == 0) {
 continue;
 }
-String fname = iconFile.srcPath().getFileName().toString();
+for (var mimeType : assoc.data.mimeTypes) {
-if (fname.indexOf(".") > 0) {
+if (processedMimeTypes.contains(mimeType)) {
-fname = fname.substring(0, fname.lastIndexOf("."));
+continue;
 }
-DesktopFile faIconFile = new DesktopFile(
+processedMimeTypes.add(mimeType);
-fname + "_fa_" + customFaIcon.getName());
+// Create icon name for mime type from mime type.
-IOUtils.copyFile(customFaIcon, faIconFile.srcPath().toFile());
+DesktopFile faIconFile = new DesktopFile(mimeType.replace(
+File.separatorChar, '-') + IOUtils.getSuffix(
-mimeTypeWithIconFile.put(FA_CONTENT_TYPE.fetchFrom(assoc).get(0),
+assoc.data.iconPath));
-faIconFile.installPath());
-}
+IOUtils.copyFile(assoc.data.iconPath.toFile(),
-return mimeTypeWithIconFile;
+faIconFile.srcPath().toFile());
+shellCommands.addIcon(mimeType, faIconFile.installPath(),
+assoc.iconSize);
+}
+}
 }
 private void createDesktopFile(Map<String, String> data) throws IOException {
 List<String> mimeTypes = getMimeTypeNamesFromFileAssociations();
 data.put("DESKTOP_MIMES", "MimeType=" + String.join(";", mimeTypes));
 .setSubstitutionData(data)
 .saveToFile(desktopFile.srcPath());
 }
 private List<String> getMimeTypeNamesFromFileAssociations() {
-return associations.stream().map(
+return associations.stream()
-a -> FA_CONTENT_TYPE.fetchFrom(a).get(0)).collect(
+.map(fa -> fa.data.mimeTypes)
-Collectors.toUnmodifiableList());
+.flatMap(List::stream)
+.collect(Collectors.toUnmodifiableList());
 }
 private static int getSquareSizeOfImage(File f) {
 try {
 BufferedImage bi = ImageIO.read(f);
-if (bi.getWidth() == bi.getHeight()) {
+return Math.max(bi.getWidth(), bi.getHeight());
-return bi.getWidth();
-}
 } catch (IOException e) {
 Log.verbose(e);
 }
 return 0;
+}
+private static int normalizeIconSize(int iconSize) {
+// If register icon with "uncommon" size, it will be ignored.
+// So find the best matching "common" size.
+List<Integer> commonIconSizes = List.of(16, 22, 32, 48, 64, 128);
+int idx = Collections.binarySearch(commonIconSizes, iconSize);
+if (idx < 0) {
+// Given icon size is greater than the largest common icon size.
+return commonIconSizes.get(commonIconSizes.size() - 1);
+}
+if (idx == 0) {
+// Given icon size is less or equal than the smallest common icon size.
+return commonIconSizes.get(idx);
+}
+int commonIconSize = commonIconSizes.get(idx);
+if (iconSize < commonIconSize) {
+// It is better to scale down original icon than to scale it up for
+// better visual quality.
+commonIconSize = commonIconSizes.get(idx - 1);
+}
+return commonIconSize;
 }
 private static String stringifyShellCommands(String... commands) {
 return stringifyShellCommands(Arrays.asList(commands));
 }
 private static String stringifyShellCommands(List<String> commands) {
 return String.join(System.lineSeparator(), commands.stream().filter(
 s -> s != null && !s.isEmpty()).collect(Collectors.toList()));
 }
+private static class LinuxFileAssociation {
+LinuxFileAssociation(FileAssociation fa) {
+this.data = fa;
+if (fa.iconPath != null && Files.isReadable(fa.iconPath)) {
+iconSize = getSquareSizeOfImage(fa.iconPath.toFile());
+} else {
+iconSize = -1;
+}
+}
+final FileAssociation data;
+final int iconSize;
+}
 private final PlatformPackage thePackage;
-private final List<Map<String, ? super Object>> associations;
+private final List<LinuxFileAssociation> associations;
 private final List<Map<String, ? super Object>> launchers;
 private final OverridableResource iconResource;
 private final OverridableResource desktopFileResource;

branch	JDK-8200758-branch
changeset 58885	d1602ae35212
parent 58762	0fe62353385b