Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Native Mac App integration #295

Merged
merged 4 commits into from
Jul 17, 2020
Merged

Native Mac App integration #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbdb04d
default icons used if icon can not be loaded
hendrikebbers Jul 16, 2020
04a3814
App added to launchpad
hendrikebbers Jul 16, 2020
05670e2
Merge branch 'master' into mac-shortcut
hendrikebbers Jul 17, 2020
c9f75a7
Test fixed
hendrikebbers Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 45 additions & 50 deletions openwebstart/src/main/java/com/openwebstart/os/mac/AppFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,42 @@
package com.openwebstart.os.mac;

import com.openwebstart.os.mac.icns.IcnsFactory;
import net.adoptopenjdk.icedteaweb.Assert;
import net.adoptopenjdk.icedteaweb.JavaSystemProperties;
import net.adoptopenjdk.icedteaweb.config.FilesystemConfiguration;
import net.adoptopenjdk.icedteaweb.io.FileUtils;
import net.adoptopenjdk.icedteaweb.io.IOUtils;
import net.adoptopenjdk.icedteaweb.logging.Logger;
import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import com.openwebstart.os.mac.icns.IcnsFactory;

import net.adoptopenjdk.icedteaweb.Assert;
import net.adoptopenjdk.icedteaweb.JavaSystemProperties;
import net.adoptopenjdk.icedteaweb.config.FilesystemConfiguration;
import net.adoptopenjdk.icedteaweb.io.FileUtils;
import net.adoptopenjdk.icedteaweb.io.IOUtils;
import net.adoptopenjdk.icedteaweb.logging.Logger;
import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;

public class AppFactory {

private static final Logger LOG = LoggerFactory.getLogger(AppFactory.class);

private static final Logger LOG = LoggerFactory.getLogger(AppFactory.class);

public final static String CONTENTS_FOLDER_NAME = "Contents";

public final static String CONTENTS_FOLDER_NAME = "Contents";
private final static String MAC_OS_FOLDER_NAME = "MacOS";

private final static String MAC_OS_FOLDER_NAME = "MacOS";
private final static String RESOURCES_FOLDER_NAME = "Resources";

private final static String RESOURCES_FOLDER_NAME = "Resources";
private final static String INFO_PLIST_NAME = "Info.plist";

private final static String INFO_PLIST_NAME = "Info.plist";
private final static String INFO_PLIST_TEMPLATE_NAME = "Info.plist.template";

private final static String INFO_PLIST_TEMPLATE_NAME = "Info.plist.template";

public final static String APP_EXTENSION = ".app";
public final static String APP_EXTENSION = ".app";

private final static String SCRIPT_NAME = "start.sh";

Expand All @@ -66,25 +62,29 @@ public static boolean exists(final String name) {
}

public static void createApp(final String name, final String script, final String... iconPaths) throws Exception {
final File appPackage = createAppWithoutMenuEntry(name, script, iconPaths);

final Path linkFolder = ensureUserApplicationFolder();
final Path appLinkPath = linkFolder.resolve(name + APP_EXTENSION);
if (Files.exists(appLinkPath, LinkOption.NOFOLLOW_LINKS)) {
Files.delete(appLinkPath);
}
Files.createSymbolicLink(appLinkPath, appPackage.toPath());
final Path userApplicationFolder = ensureUserApplicationFolder();
createNativeApp(userApplicationFolder, name, script, iconPaths);
}

final static File createAppWithoutMenuEntry(final String name, final String script, final String... iconPaths)
throws Exception {

final Path applicationsFolder = ensureUserApplicationCacheFolder();
return createNativeApp(applicationsFolder, name, script, iconPaths);
}

final static File createNativeApp(final Path applicationsFolder, final String name, final String script, final String... iconPaths)
throws Exception {
Assert.requireNonNull(applicationsFolder, "applicationsFolder");
Assert.requireNonBlank(name, "name");
Assert.requireNonBlank(script, "script");

LOG.info("Creating app '{}'", name);

final Path applicationsFolder = ensureUserApplicationCacheFolder();
final File appPackage = new File(applicationsFolder.toFile(), name + APP_EXTENSION);

LOG.info("Creating app '{}' at '{}'", name, appPackage);


if (!appPackage.exists()) {
if (!appPackage.mkdirs()) {
throw new IOException("Cannot create app directory");
Expand Down Expand Up @@ -113,7 +113,7 @@ final static File createAppWithoutMenuEntry(final String name, final String scri

final File iconsFile = new File(resourcesFolder, ICON_FILE_NAME + ICON_FILE_EXTENSION);
try (final InputStream inputStream = getIcnsInputStream(iconPaths);
final FileOutputStream outputStream = new FileOutputStream(iconsFile)) {
final FileOutputStream outputStream = new FileOutputStream(iconsFile)) {
IOUtils.copy(inputStream, outputStream);
}
LOG.debug("Iconfile for app '{}' created", name);
Expand Down Expand Up @@ -142,26 +142,21 @@ final static File createAppWithoutMenuEntry(final String name, final String scri
return appPackage;
}

private static InputStream getIcnsInputStream(final String... iconPaths) throws Exception {
if(iconPaths == null || iconPaths.length == 0) {
return AppFactory.class.getResourceAsStream("icons.icns");
}
final IcnsFactory factory = new IcnsFactory();
final List<File> iconFiles = Arrays.stream(iconPaths).map(File::new).collect(Collectors.toList());
return new FileInputStream(factory.createIconSet(iconFiles));
}
private static InputStream getIcnsInputStream(final String... iconPaths) throws Exception {
final IcnsFactory factory = new IcnsFactory();
final List<File> iconFiles = Arrays.stream(iconPaths).map(File::new).collect(Collectors.toList());
return new FileInputStream(factory.createIconSet(iconFiles));
}

private final static Path ensureUserApplicationFolder() {
final String userHome = JavaSystemProperties.getUserHome();
final File appFolder = new File(new File(userHome), USER_APPLICATIONS_FOLDER);
if (!appFolder.exists()) {
appFolder.mkdir();
}
return appFolder.toPath();
}

private final static Path ensureUserApplicationFolder()
{
final String userHome = JavaSystemProperties.getUserHome();
final File appFolder = new File( new File(userHome), USER_APPLICATIONS_FOLDER);
if ( !appFolder.exists() )
{
appFolder.mkdir();
}
return appFolder.toPath();
}

private final static Path ensureUserApplicationCacheFolder() {
final Path appcache = Paths.get(FilesystemConfiguration.getCacheHome(), USER_APPLICATIONS_CACHE_FOLDER);
if (!Files.isDirectory(appcache)) {
Expand Down
2 changes: 1 addition & 1 deletion openwebstart/src/main/java/com/openwebstart/os/mac/MacEntryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class MacEntryFactory implements MenuAndDesktopEntriesFactory {

@Override
public boolean supportsDesktopEntry() {
return false;
return true;
}

@Override
Expand Down
Loading