More work on URL handling

git-svn-id: http://svn.dmdirc.com/trunk@2705 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/commandline/CommandLineParser.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandline;
 
+import com.dmdirc.util.InvalidAddressException;
+import com.dmdirc.util.IrcAddress;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/config/defaults/default/defaults

@@ -130,3 +130,7 @@ actions.highlightcolour=4
 
 popups.nick=Query:query %1$s\nWhois:whois %1$s
 popups.chan-nick=-\nBan:ban %1$s\nKick:kick %1$s
+
+protocol.http=BROWSER
+protocol.https=BROWSER
+protocol.irc=DMDIRC

src/com/dmdirc/ui/dummy/DummyController.java

@@ -158,7 +158,7 @@ public final class DummyController implements UIController {
 
     /** {@inheritDoc} */
     @Override
-    public void showURLDialog(String procotol, String url) {
+    public void showURLDialog(String protocol, String url) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
     

src/com/dmdirc/ui/interfaces/UIController.java

@@ -161,9 +161,9 @@ public interface UIController {
     /**
      * Shows the unknown URL protocol handling dialog for a URL.
      * 
-     * @param procotol URL Protocol
+     * @param protocol URL Protocol
      * @param url full url
      */
-    void showURLDialog(final String procotol, final String url);
+    void showURLDialog(final String protocol, final String url);
     
 }

src/com/dmdirc/ui/swing/SwingController.java

@@ -45,6 +45,7 @@ import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.swing.components.SwingPreferencesPanel;
 import com.dmdirc.ui.swing.components.SwingStatusBar;
 import com.dmdirc.ui.swing.dialogs.SwingUpdaterDialog;
+import com.dmdirc.ui.swing.dialogs.URLDialog;
 import com.dmdirc.ui.swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.ui.swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.ui.swing.dialogs.wizard.firstrun.SwingFirstRunWizard;
@@ -268,7 +269,6 @@ public final class SwingController implements UIController {
     /** {@inheritDoc} */
     @Override
     public void showURLDialog(String protocol, String url) {
-        System.out.println("Protocol: " + protocol);
-        System.out.println("URL: " + url);
+        URLDialog.showURLDialog(protocol, url);
     }
 }

src/com/dmdirc/ui/swing/components/ExecutableFileFilter.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.swing.components;
+
+import java.io.File;
+import javax.swing.filechooser.FileFilter;
+
+/**
+ * Filters non executable files.
+ */
+public class ExecutableFileFilter extends FileFilter {
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @param file File to check
+     */
+    @Override
+    public boolean accept(final File file) {
+        return (file.isDirectory() || file.canExecute());
+    }
+
+    /** 
+     * {@inheritDoc}
+     * 
+     * @return Description
+     */
+    @Override
+    public String getDescription() {
+        return "Executable files";
+    }
+}

src/com/dmdirc/ui/swing/components/Frame.java

@@ -588,9 +588,9 @@ public abstract class Frame extends JInternalFrame implements Window,
         if (event.isPopupTrigger()) {
             //Show hyperlink popup
         } else {
-            Main.getUI().getStatusBar().setMessage("Opening: " + url);
-            BrowserLauncher.openURL(url);
-            //URLHandler.getURLHander().launchApp(url);
+            //Main.getUI().getStatusBar().setMessage("Opening: " + url);
+            //BrowserLauncher.openURL(url);
+            URLHandler.getURLHander().launchApp(url);
         }
     }
     

src/com/dmdirc/ui/swing/dialogs/URLDialog.java

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.swing.dialogs;
+
+import com.dmdirc.Main;
+import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.ui.swing.components.ExecutableFileFilter;
+import com.dmdirc.ui.swing.components.StandardDialog;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import net.miginfocom.swing.MigLayout;
+
+/** URL Protocol dialog. */
+public class URLDialog extends StandardDialog implements ActionListener {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+    /** A previously created instance of URLDialog. */
+    private static URLDialog me;
+    /** File chooser. */
+    private JFileChooser fileChooser;
+    /** Show file chooser. */
+    private JButton showFileChooser;
+    /** Info label. */
+    private JLabel infoLabel;
+    /** Protocol. */
+    private final String protocol;
+    /** URL. */
+    private final String url;
+
+    /**
+     * Instantiates the URLDialog.
+     *
+     * @param protocol Protocol to add
+     * @param url URL to open once added
+     */
+    private URLDialog(final String protocol, final String url) {
+        super((MainFrame) Main.getUI().getMainWindow(), false);
+
+        this.protocol = protocol;
+        this.url = url;
+        
+        initComponents();
+        layoutComponents();
+        addListeners();
+
+        setTitle("DMDirc: Unknown URL Protocol");
+
+        pack();
+    }
+
+    /**
+     * Creates the new URLDialog if one doesn't exist, and displays it.
+     *
+     * @param protocol Protocol to add
+     * @param url URL to open once added
+     */
+    public static synchronized void showURLDialog(final String protocol,
+            final String url) {
+        me = getURLDialog(protocol, url);
+
+        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setVisible(true);
+        me.requestFocus();
+    }
+
+    /**
+     * Returns the current instance of the URLDialog.
+     *
+     * @param protocol Protocol to add
+     * @param url URL to open once added
+     *
+     * @return The current URLDialog instance
+     */
+    public static synchronized URLDialog getURLDialog(final String protocol,
+            final String url) {
+        if (me == null) {
+            me = new URLDialog(protocol, url);
+        }
+
+        return me;
+    }
+
+    /** Initialises the components. */
+    private void initComponents() {
+        orderButtons(new JButton(), new JButton());
+        fileChooser = new JFileChooser();
+        showFileChooser = new JButton();
+        infoLabel = new JLabel();
+        
+        fileChooser.addChoosableFileFilter(new ExecutableFileFilter());
+        fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        showFileChooser.setText("Browse");
+        infoLabel.setText("/set protocol " + protocol + " [DMDIRC|BROWSER|MAIL|some kind of list]");
+    }
+
+    /** Lays out the components. */
+    private void layoutComponents() {
+        setLayout(new MigLayout("fill"));
+        
+        add(infoLabel, "grow");
+    }
+
+    /** Adds listeners to the components. */
+    private void addListeners() {
+        getOkButton().addActionListener(this);
+        getCancelButton().addActionListener(this);
+        showFileChooser.addActionListener(this);
+    }
+
+    /** Saves the settings. */
+    private void save() {
+        dispose();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getSource() == getOkButton()) {
+            save();
+        } else if (e.getSource() == getCancelButton()) {
+            dispose();
+        } else if (e.getSource() == showFileChooser) {
+            fileChooser.showDialog(this, "OK");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        synchronized (me) {
+            super.dispose();
+            me = null;
+        }
+    }
+}

src/com/dmdirc/commandline/InvalidAddressException.java → src/com/dmdirc/util/InvalidAddressException.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.commandline;
+package com.dmdirc.util;
 
 /**
  * Thrown to indicate that an invalid IRC address has been used.

src/com/dmdirc/util/IrcAddress.java

@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Parses an IRC address. IRC addresses take the following form:
+ * irc[s]://[[username][:password]@]<server>[:[+]port][/channel1[,channel2[,...]]]
+ * 
+ * @author Chris
+ */
+public class IrcAddress {
+    
+    /** Whether or not this address uses SSL. */
+    private boolean usesSSL;
+    
+    /** The server name for this address. */
+    private String server;
+    
+    /** The port number for this address. */
+    private int port = 6667;
+    
+    /** A list of channels to auto-connect to. */
+    private List<String> channels = new ArrayList<String>();
+    
+    /** The password for this address. */
+    private String pass = "";
+
+    /**
+     * Creates a new instance of IrcAddress.
+     * 
+     * @param address The address to parse
+     * @throws InvalidAddressException If an invalid address is passed
+     */
+    public IrcAddress(final String address) throws InvalidAddressException {
+        StringBuilder builder;
+        
+        if (address.toLowerCase().startsWith("ircs://")) {
+            usesSSL = true;
+            builder = new StringBuilder(address.substring(7));
+        } else if (address.toLowerCase().startsWith("irc://")) {
+            usesSSL = false;
+            builder = new StringBuilder(address.substring(6));
+        } else {
+            throw new InvalidAddressException("Invalid protocol specified");
+        }
+        
+        final int atIndex = builder.indexOf("@");
+        if (atIndex > -1) {
+            doPass(builder.substring(0, atIndex));
+            builder.delete(0, atIndex + 1);
+        }
+        
+        final int slashIndex = builder.indexOf("/");
+        if (slashIndex > -1) {
+            doChannels(builder.substring(slashIndex + 1));
+            builder.delete(slashIndex, builder.length());
+        }
+        
+        final int colonIndex = builder.indexOf(":");
+        if (colonIndex > -1) {
+            doPort(builder.substring(colonIndex + 1));
+            builder.delete(colonIndex, builder.length());
+        }
+        
+        doServer(builder.toString());
+    }
+    
+    /**
+     * Processes the password part of this address.
+     *
+     * @param pass The password part of this address
+     */
+    private void doPass(final String pass) {
+        this.pass = pass;
+    }
+
+    /**
+     * Processes the channels part of this address.
+     *
+     * @param channels The channels part of this address
+     */    
+    private void doChannels(final String channels) {
+        for (String channel : channels.split(",")) {
+            this.channels.add(channel);
+        }
+    }
+    
+    /**
+     * Processes the port part of this address.
+     *
+     * @param port The port part of this address
+     * @throws InvalidAddressException if the port is non-numeric
+     */    
+    private void doPort(final String port) throws InvalidAddressException {
+        String actualPort = port;
+        
+        if (port.charAt(0) == '+') {
+            usesSSL = true;
+            actualPort = port.substring(1);
+        }
+        
+        try {
+            this.port = Integer.valueOf(actualPort);
+        } catch (NumberFormatException ex) {
+            throw new InvalidAddressException("Invalid port number", ex);
+        }
+    }
+    
+    /**
+     * Processes the server part of this address.
+     *
+     * @param server The server part of this address
+     */    
+    private void doServer(final String server) {
+        this.server = server;
+    }
+    
+    /**
+     * Determines if this address requires the use of SSL or not.
+     *
+     * @return True if the address requires SSL, false otherwise
+     */
+    public boolean isSSL() {
+        return usesSSL;
+    }
+    
+    /**
+     * Retrieves the server from this address.
+     *
+     * @return This address's server
+     */
+    public String getServer() {
+        return server;
+    }
+    
+    /**
+     * Retrieves the port used for this address.
+     *
+     * @return This address's port
+     */
+    public int getPort() {
+        return port;
+    }
+    
+    /**
+     * Retrieves the password used for this address.
+     *
+     * @return This address's password
+     */
+    public String getPassword() {
+        return pass;
+    }
+    
+    /**
+     * Retrieves the list of channels for this address.
+     *
+     * @return This address's channels
+     */
+    public List<String> getChannels() {
+        return channels;
+    }
+}

src/com/dmdirc/util/URLHandler.java

@@ -27,6 +27,7 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+
 import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
@@ -73,37 +74,39 @@ public class URLHandler {
         final int end = url.indexOf(':');
         final String protocol = url.substring(0, end);
         final String info = url.substring(end + 3);
-        
-        System.out.println("URL: " + url + " -> " + protocol + " -> " + info);
-        
+
         if (!config.hasOption("protocol", protocol)) {
             Main.getUI().showURLDialog(protocol, info);
             return;
         }
 
         final List<String> app = config.getOptionList("protocol", protocol);
-        
+
         if (app.size() < 1) {
             Main.getUI().showURLDialog(protocol, info);
             return;
         }
-        
+
         final String command = app.get(0);
-        
-        if ("DMDIRC".equals(command)) {
-            System.out.println("handling IRC link internally.");
-        }else if ("BROWSER".equals(command)) {
-            execBrowser(url);
-        } else if ("MAIL".equals(command)) {
-            execMail(url);
-        } else {
-            execApp(app.toArray(new String[app.size()]));
+
+        try {
+            if ("DMDIRC".equals(command)) {
+                //Handle DMDirc link
+            } else if ("BROWSER".equals(command)) {
+                execBrowser(new URI(url));
+            } else if ("MAIL".equals(command)) {
+                execMail(new URI(url));
+            } else {
+                execApp(app.toArray(new String[app.size()]));
+            }
+        } catch (URISyntaxException ex) {
+            Logger.userError(ErrorLevel.LOW, "Invalid URL: " + ex.getMessage());
         }
     }
 
     /**
      * Launches an application.
-     * 
+     *
      * @param application Application and arguments
      */
     private void execApp(final String[] application) {
@@ -114,39 +117,38 @@ public class URLHandler {
                     "Unable to run application: " + ex.getMessage(), ex);
         }
     }
-    
+
     /**
      * Opens the specified URL in the users browser.
-     * 
+     *
      * @param url URL to open
      */
-    private void execBrowser(final String url) {
-        if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
+    private void execBrowser(final URI url) {
+        if (desktop != null &&
+                desktop.isSupported(Desktop.Action.BROWSE)) {
             try {
-                desktop.browse(new URI(url));
+                desktop.browse(url);
             } catch (IOException ex) {
-                Logger.userError(ErrorLevel.LOW, "Unable to open URL: " + ex.getMessage());
-            } catch (URISyntaxException ex) {
-                Logger.userError(ErrorLevel.LOW, "Invalid URL: " + ex.getMessage());
+                Logger.userError(ErrorLevel.LOW,
+                        "Unable to open URL: " + ex.getMessage());
             }
         } else {
             Logger.userError(ErrorLevel.LOW, "Unable to open your browser.");
         }
     }
-    
+
     /**
      * Opens the specified URL in the users mail client.
-     * 
+     *
      * @param url URL to open
      */
-    private void execMail(final String url) {
+    private void execMail(final URI url) {
         if (desktop != null && desktop.isSupported(Desktop.Action.MAIL)) {
             try {
-                desktop.mail(new URI(url));
+                desktop.mail(url);
             } catch (IOException ex) {
-                Logger.userError(ErrorLevel.LOW, "Unable to open URL: " + ex.getMessage());
-            } catch (URISyntaxException ex) {
-                Logger.userError(ErrorLevel.LOW, "Invalid URL: " + ex.getMessage());
+                Logger.userError(ErrorLevel.LOW,
+                        "Unable to open URL: " + ex.getMessage());
             }
         } else {
             Logger.userError(ErrorLevel.LOW, "Unable to open your mail client.");