diff --git a/source/net/sourceforge/filebot/ApplicationStarter.java b/source/net/sourceforge/filebot/ApplicationStarter.java deleted file mode 100644 index ded28fe0..00000000 --- a/source/net/sourceforge/filebot/ApplicationStarter.java +++ /dev/null @@ -1,361 +0,0 @@ - -package net.sourceforge.filebot; - - -import static java.awt.GraphicsEnvironment.*; -import static javax.swing.JFrame.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.tuned.ui.TunedUtilities.*; - -import java.awt.Desktop; -import java.awt.Dialog.ModalityType; -import java.awt.event.ActionEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.nio.ByteBuffer; -import java.security.CodeSource; -import java.security.Permission; -import java.security.PermissionCollection; -import java.security.Permissions; -import java.security.Policy; -import java.security.ProtectionDomain; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.swing.AbstractAction; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.kohsuke.args4j.CmdLineException; -import org.w3c.dom.NodeList; - -import net.miginfocom.swing.MigLayout; -import net.sf.ehcache.CacheManager; -import net.sourceforge.filebot.cli.ArgumentBean; -import net.sourceforge.filebot.cli.ArgumentProcessor; -import net.sourceforge.filebot.cli.CmdlineOperations; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.ui.MainFrame; -import net.sourceforge.filebot.ui.SinglePanelFrame; -import net.sourceforge.filebot.ui.sfv.SfvPanelBuilder; -import net.sourceforge.filebot.ui.transfer.FileTransferable; -import net.sourceforge.filebot.web.CachedResource; -import net.sourceforge.tuned.ByteBufferInputStream; -import net.sourceforge.tuned.PreferencesMap.PreferencesEntry; - - -public class ApplicationStarter { - - /** - * @param args - */ - public static void main(String... arguments) { - // initialize this stuff before anything else - initializeCache(); - initializeSecurityManager(); - - try { - // parse arguments - final ArgumentProcessor cli = new ArgumentProcessor(); - final ArgumentBean args = cli.parse(arguments); - - if (args.printHelp() || args.printVersion() || (!args.runCLI() && isHeadless())) { - System.out.format("%s / %s%n%n", getApplicationIdentifier(), getJavaRuntimeIdentifier()); - - if (args.printHelp() || (!args.printVersion() && isHeadless())) { - cli.printHelp(args); - } - - // just print help message or version string and then exit - System.exit(0); - } - - if (args.clearUserData()) { - // clear preferences and cache - System.out.println("Reset preferences and clear cache"); - Settings.forPackage(Main.class).clear(); - CacheManager.getInstance().clearAll(); - } - - // initialize analytics - Analytics.setEnabled(!args.disableAnalytics); - - // CLI mode => run command-line interface and then exit - if (args.runCLI()) { - // default cross-platform laf used in scripting to nimbus instead of metal (if possible) - if (args.script != null && !isHeadless()) { - try { - Class nimbusLook = Class.forName("javax.swing.plaf.nimbus.NimbusLookAndFeel", false, Thread.currentThread().getContextClassLoader()); - System.setProperty("swing.crossplatformlaf", nimbusLook.getName()); - } catch (Throwable e) { - // ignore all errors and stick with default cross-platform laf - } - } - - int status = cli.process(args, new CmdlineOperations()); - System.exit(status); - } - - // GUI mode => start user interface - try { - SwingUtilities.invokeAndWait(new Runnable() { - - @Override - public void run() { - try { - // use native laf an all platforms - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { - Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.getMessage(), e); - } - - startUserInterface(args); - } - }); - } catch (Exception e) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, e.getMessage(), e); - System.exit(-1); // starting up UI failed - } - - // pre-load certain classes and resources in the background - warmupCachedResources(); - - // check for application updates (only when installed, i.e. not running via fatjar or webstart) - if (!"skip".equals(System.getProperty("application.update"))) { - try { - checkUpdate(); - } catch (Exception e) { - Logger.getLogger(Main.class.getName()).log(Level.WARNING, "Failed to check for updates", e); - } - } - } catch (CmdLineException e) { - // illegal arguments => just print CLI error message and stop - System.err.println(e.getMessage()); - System.exit(-1); - } - } - - - private static void startUserInterface(ArgumentBean args) { - JFrame frame; - - if (args.openSFV()) { - // single panel frame - FileTransferable files = new FileTransferable(args.getFiles(false)); - frame = new SinglePanelFrame(new SfvPanelBuilder()).publish(files); - } else { - // default frame - frame = new MainFrame(); - } - - frame.setLocationByPlatform(true); - frame.setDefaultCloseOperation(EXIT_ON_CLOSE); - - try { - // restore previous size and location - restoreWindowBounds(frame, Settings.forPackage(MainFrame.class)); - } catch (Exception e) { - // don't care, doesn't make a difference - } - - // start application - frame.setVisible(true); - } - - - /** - * Show update notifications if updates are available - */ - private static void checkUpdate() throws Exception { - final PreferencesEntry updateIgnoreRevision = Settings.forPackage(Main.class).entry("update.revision.ignore"); - final Properties updateProperties = new CachedResource(getApplicationProperty("update.url"), Properties.class, 24 * 60 * 60 * 1000) { - - @Override - public Properties process(ByteBuffer data) { - try { - Properties properties = new Properties(); - NodeList fields = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteBufferInputStream(data)).getFirstChild().getChildNodes(); - for (int i = 0; i < fields.getLength(); i++) { - properties.setProperty(fields.item(i).getNodeName(), fields.item(i).getTextContent().trim()); - } - return properties; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - }.get(); - - // check if update is required - int latestRev = Integer.parseInt(updateProperties.getProperty("revision")); - int latestIgnoreRev = Math.max(getApplicationRevisionNumber(), updateIgnoreRevision.getValue() == null ? 0 : Integer.parseInt(updateIgnoreRevision.getValue())); - - if (latestRev > latestIgnoreRev) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - final JDialog dialog = new JDialog(JFrame.getFrames()[0], updateProperties.getProperty("title"), ModalityType.APPLICATION_MODAL); - final JPanel pane = new JPanel(new MigLayout("fill, nogrid, insets dialog")); - dialog.setContentPane(pane); - - pane.add(new JLabel(ResourceManager.getIcon("window.icon.medium")), "aligny top"); - pane.add(new JLabel(updateProperties.getProperty("message")), "gap 10, wrap paragraph:push"); - pane.add(new JButton(new AbstractAction("Download", ResourceManager.getIcon("dialog.continue")) { - - @Override - public void actionPerformed(ActionEvent evt) { - try { - Desktop.getDesktop().browse(URI.create(updateProperties.getProperty("download"))); - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - dialog.setVisible(false); - } - } - }), "tag ok"); - pane.add(new JButton(new AbstractAction("Details", ResourceManager.getIcon("action.report")) { - - @Override - public void actionPerformed(ActionEvent evt) { - try { - Desktop.getDesktop().browse(URI.create(updateProperties.getProperty("discussion"))); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - }), "tag help2"); - pane.add(new JButton(new AbstractAction("Ignore", ResourceManager.getIcon("dialog.cancel")) { - - @Override - public void actionPerformed(ActionEvent evt) { - updateIgnoreRevision.setValue(updateProperties.getProperty("revision")); - dialog.setVisible(false); - } - }), "tag cancel"); - - dialog.pack(); - dialog.setLocation(getOffsetLocation(dialog.getOwner())); - dialog.setVisible(true); - } - }); - } - } - - - private static void warmupCachedResources() { - Thread warmup = new Thread("warmupCachedResources") { - - @Override - public void run() { - try { - // pre-load media.types (when loaded during DnD it will freeze the UI for a few hundred milliseconds) - MediaTypes.getDefault(); - - // pre-load movie/series index - List dummy = Collections.singletonList(""); - MediaDetection.stripReleaseInfo(dummy, true); - MediaDetection.matchSeriesByName(dummy, -1); - MediaDetection.matchMovieName(dummy, true, -1); - - // pre-load Groovy script engine - new ExpressionFormat("").format(""); - } catch (Exception e) { - Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage(), e); - } - } - }; - - // start background thread - warmup.setDaemon(true); - warmup.setPriority(Thread.MIN_PRIORITY); - warmup.start(); - } - - - private static void restoreWindowBounds(final JFrame window, final Settings settings) { - // store bounds on close - window.addWindowListener(new WindowAdapter() { - - @Override - public void windowClosing(WindowEvent e) { - // don't save window bounds if window is maximized - if (!isMaximized(window)) { - settings.put("window.x", String.valueOf(window.getX())); - settings.put("window.y", String.valueOf(window.getY())); - settings.put("window.width", String.valueOf(window.getWidth())); - settings.put("window.height", String.valueOf(window.getHeight())); - } - } - }); - - // restore bounds - int x = Integer.parseInt(settings.get("window.x")); - int y = Integer.parseInt(settings.get("window.y")); - int width = Integer.parseInt(settings.get("window.width")); - int height = Integer.parseInt(settings.get("window.height")); - window.setBounds(x, y, width, height); - } - - - /** - * Shutdown ehcache properly, so that disk-persistent stores can actually be saved to disk - */ - private static void initializeCache() { - System.setProperty("ehcache.disk.store.dir", new File(getApplicationFolder(), "cache").getAbsolutePath()); - Runtime.getRuntime().addShutdownHook(new Thread() { - - @Override - public void run() { - CacheManager.getInstance().shutdown(); - } - }); - } - - - /** - * Initialize default SecurityManager and grant all permissions via security policy. - * Initialization is required in order to run {@link ExpressionFormat} in a secure sandbox. - */ - private static void initializeSecurityManager() { - try { - // initialize security policy used by the default security manager - // because default the security policy is very restrictive (e.g. no FilePermission) - Policy.setPolicy(new Policy() { - - @Override - public boolean implies(ProtectionDomain domain, Permission permission) { - // all permissions - return true; - } - - - @Override - public PermissionCollection getPermissions(CodeSource codesource) { - // VisualVM can't connect if this method does return - // a checked immutable PermissionCollection - return new Permissions(); - } - }); - - // set default security manager - System.setSecurityManager(new SecurityManager()); - } catch (Exception e) { - // security manager was probably set via system property - Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString(), e); - } - } - -} diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java index 179ec047..bdf0e052 100644 --- a/source/net/sourceforge/filebot/Main.java +++ b/source/net/sourceforge/filebot/Main.java @@ -2,27 +2,360 @@ package net.sourceforge.filebot; -import java.lang.reflect.Method; +import static java.awt.GraphicsEnvironment.*; +import static javax.swing.JFrame.*; +import static net.sourceforge.filebot.Settings.*; +import static net.sourceforge.tuned.ui.TunedUtilities.*; -import org.codehaus.groovy.tools.LoaderConfiguration; -import org.codehaus.groovy.tools.RootLoader; +import java.awt.Desktop; +import java.awt.Dialog.ModalityType; +import java.awt.event.ActionEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.nio.ByteBuffer; +import java.security.CodeSource; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Permissions; +import java.security.Policy; +import java.security.ProtectionDomain; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.swing.AbstractAction; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.kohsuke.args4j.CmdLineException; +import org.w3c.dom.NodeList; + +import net.miginfocom.swing.MigLayout; +import net.sf.ehcache.CacheManager; +import net.sourceforge.filebot.cli.ArgumentBean; +import net.sourceforge.filebot.cli.ArgumentProcessor; +import net.sourceforge.filebot.cli.CmdlineOperations; +import net.sourceforge.filebot.format.ExpressionFormat; +import net.sourceforge.filebot.media.MediaDetection; +import net.sourceforge.filebot.ui.MainFrame; +import net.sourceforge.filebot.ui.SinglePanelFrame; +import net.sourceforge.filebot.ui.sfv.SfvPanelBuilder; +import net.sourceforge.filebot.ui.transfer.FileTransferable; +import net.sourceforge.filebot.web.CachedResource; +import net.sourceforge.tuned.ByteBufferInputStream; +import net.sourceforge.tuned.PreferencesMap.PreferencesEntry; public class Main { /** - * Invoke ApplicationStarter with Groovy RootLoader + * @param args */ - public static void main(String[] args) throws Exception { - LoaderConfiguration lc = new LoaderConfiguration(); - lc.setMainClass("net.sourceforge.filebot.ApplicationStarter"); + public static void main(String... arguments) { + // initialize this stuff before anything else + initializeCache(); + initializeSecurityManager(); - RootLoader rootLoader = new RootLoader(lc); - rootLoader.addURL(Main.class.getProtectionDomain().getCodeSource().getLocation()); + try { + // parse arguments + final ArgumentProcessor cli = new ArgumentProcessor(); + final ArgumentBean args = cli.parse(arguments); + + if (args.printHelp() || args.printVersion() || (!args.runCLI() && isHeadless())) { + System.out.format("%s / %s%n%n", getApplicationIdentifier(), getJavaRuntimeIdentifier()); + + if (args.printHelp() || (!args.printVersion() && isHeadless())) { + cli.printHelp(args); + } + + // just print help message or version string and then exit + System.exit(0); + } + + if (args.clearUserData()) { + // clear preferences and cache + System.out.println("Reset preferences and clear cache"); + Settings.forPackage(Main.class).clear(); + CacheManager.getInstance().clearAll(); + } + + // initialize analytics + Analytics.setEnabled(!args.disableAnalytics); + + // CLI mode => run command-line interface and then exit + if (args.runCLI()) { + // default cross-platform laf used in scripting to nimbus instead of metal (if possible) + if (args.script != null && !isHeadless()) { + try { + Class nimbusLook = Class.forName("javax.swing.plaf.nimbus.NimbusLookAndFeel", false, Thread.currentThread().getContextClassLoader()); + System.setProperty("swing.crossplatformlaf", nimbusLook.getName()); + } catch (Throwable e) { + // ignore all errors and stick with default cross-platform laf + } + } + + int status = cli.process(args, new CmdlineOperations()); + System.exit(status); + } + + // GUI mode => start user interface + try { + SwingUtilities.invokeAndWait(new Runnable() { + + @Override + public void run() { + try { + // use native laf an all platforms + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { + Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.getMessage(), e); + } + + startUserInterface(args); + } + }); + } catch (Exception e) { + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, e.getMessage(), e); + System.exit(-1); // starting up UI failed + } + + // pre-load certain classes and resources in the background + warmupCachedResources(); + + // check for application updates (only when installed, i.e. not running via fatjar or webstart) + if (!"skip".equals(System.getProperty("application.update"))) { + try { + checkUpdate(); + } catch (Exception e) { + Logger.getLogger(Main.class.getName()).log(Level.WARNING, "Failed to check for updates", e); + } + } + } catch (CmdLineException e) { + // illegal arguments => just print CLI error message and stop + System.err.println(e.getMessage()); + System.exit(-1); + } + } + + + private static void startUserInterface(ArgumentBean args) { + JFrame frame; - Class c = rootLoader.loadClass(lc.getMainClass()); - Method m = c.getMethod("main", new Class[] { String[].class }); - m.invoke(null, new Object[] { args }); + if (args.openSFV()) { + // single panel frame + FileTransferable files = new FileTransferable(args.getFiles(false)); + frame = new SinglePanelFrame(new SfvPanelBuilder()).publish(files); + } else { + // default frame + frame = new MainFrame(); + } + + frame.setLocationByPlatform(true); + frame.setDefaultCloseOperation(EXIT_ON_CLOSE); + + try { + // restore previous size and location + restoreWindowBounds(frame, Settings.forPackage(MainFrame.class)); + } catch (Exception e) { + // don't care, doesn't make a difference + } + + // start application + frame.setVisible(true); + } + + + /** + * Show update notifications if updates are available + */ + private static void checkUpdate() throws Exception { + final PreferencesEntry updateIgnoreRevision = Settings.forPackage(Main.class).entry("update.revision.ignore"); + final Properties updateProperties = new CachedResource(getApplicationProperty("update.url"), Properties.class, 24 * 60 * 60 * 1000) { + + @Override + public Properties process(ByteBuffer data) { + try { + Properties properties = new Properties(); + NodeList fields = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteBufferInputStream(data)).getFirstChild().getChildNodes(); + for (int i = 0; i < fields.getLength(); i++) { + properties.setProperty(fields.item(i).getNodeName(), fields.item(i).getTextContent().trim()); + } + return properties; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }.get(); + + // check if update is required + int latestRev = Integer.parseInt(updateProperties.getProperty("revision")); + int latestIgnoreRev = Math.max(getApplicationRevisionNumber(), updateIgnoreRevision.getValue() == null ? 0 : Integer.parseInt(updateIgnoreRevision.getValue())); + + if (latestRev > latestIgnoreRev) { + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + final JDialog dialog = new JDialog(JFrame.getFrames()[0], updateProperties.getProperty("title"), ModalityType.APPLICATION_MODAL); + final JPanel pane = new JPanel(new MigLayout("fill, nogrid, insets dialog")); + dialog.setContentPane(pane); + + pane.add(new JLabel(ResourceManager.getIcon("window.icon.medium")), "aligny top"); + pane.add(new JLabel(updateProperties.getProperty("message")), "gap 10, wrap paragraph:push"); + pane.add(new JButton(new AbstractAction("Download", ResourceManager.getIcon("dialog.continue")) { + + @Override + public void actionPerformed(ActionEvent evt) { + try { + Desktop.getDesktop().browse(URI.create(updateProperties.getProperty("download"))); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + dialog.setVisible(false); + } + } + }), "tag ok"); + pane.add(new JButton(new AbstractAction("Details", ResourceManager.getIcon("action.report")) { + + @Override + public void actionPerformed(ActionEvent evt) { + try { + Desktop.getDesktop().browse(URI.create(updateProperties.getProperty("discussion"))); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + }), "tag help2"); + pane.add(new JButton(new AbstractAction("Ignore", ResourceManager.getIcon("dialog.cancel")) { + + @Override + public void actionPerformed(ActionEvent evt) { + updateIgnoreRevision.setValue(updateProperties.getProperty("revision")); + dialog.setVisible(false); + } + }), "tag cancel"); + + dialog.pack(); + dialog.setLocation(getOffsetLocation(dialog.getOwner())); + dialog.setVisible(true); + } + }); + } + } + + + private static void warmupCachedResources() { + Thread warmup = new Thread("warmupCachedResources") { + + @Override + public void run() { + try { + // pre-load media.types (when loaded during DnD it will freeze the UI for a few hundred milliseconds) + MediaTypes.getDefault(); + + // pre-load movie/series index + List dummy = Collections.singletonList(""); + MediaDetection.stripReleaseInfo(dummy, true); + MediaDetection.matchSeriesByName(dummy, -1); + MediaDetection.matchMovieName(dummy, true, -1); + + // pre-load Groovy script engine + new ExpressionFormat("").format(""); + } catch (Exception e) { + Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage(), e); + } + } + }; + + // start background thread + warmup.setDaemon(true); + warmup.setPriority(Thread.MIN_PRIORITY); + warmup.start(); + } + + + private static void restoreWindowBounds(final JFrame window, final Settings settings) { + // store bounds on close + window.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosing(WindowEvent e) { + // don't save window bounds if window is maximized + if (!isMaximized(window)) { + settings.put("window.x", String.valueOf(window.getX())); + settings.put("window.y", String.valueOf(window.getY())); + settings.put("window.width", String.valueOf(window.getWidth())); + settings.put("window.height", String.valueOf(window.getHeight())); + } + } + }); + + // restore bounds + int x = Integer.parseInt(settings.get("window.x")); + int y = Integer.parseInt(settings.get("window.y")); + int width = Integer.parseInt(settings.get("window.width")); + int height = Integer.parseInt(settings.get("window.height")); + window.setBounds(x, y, width, height); + } + + + /** + * Shutdown ehcache properly, so that disk-persistent stores can actually be saved to disk + */ + private static void initializeCache() { + System.setProperty("ehcache.disk.store.dir", new File(getApplicationFolder(), "cache").getAbsolutePath()); + Runtime.getRuntime().addShutdownHook(new Thread() { + + @Override + public void run() { + CacheManager.getInstance().shutdown(); + } + }); + } + + + /** + * Initialize default SecurityManager and grant all permissions via security policy. + * Initialization is required in order to run {@link ExpressionFormat} in a secure sandbox. + */ + private static void initializeSecurityManager() { + try { + // initialize security policy used by the default security manager + // because default the security policy is very restrictive (e.g. no FilePermission) + Policy.setPolicy(new Policy() { + + @Override + public boolean implies(ProtectionDomain domain, Permission permission) { + // all permissions + return true; + } + + + @Override + public PermissionCollection getPermissions(CodeSource codesource) { + // VisualVM can't connect if this method does return + // a checked immutable PermissionCollection + return new Permissions(); + } + }); + + // set default security manager + System.setSecurityManager(new SecurityManager()); + } catch (Exception e) { + // security manager was probably set via system property + Logger.getLogger(Main.class.getName()).log(Level.WARNING, e.toString(), e); + } } }