Merge pull request #577 from csmith/plugin-tidying

Remove silly URL usage in PluginMetaData.

src/com/dmdirc/plugins/PluginFileHandler.java

@@ -32,8 +32,6 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.FileVisitOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,12 +39,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -111,7 +107,6 @@ public class PluginFileHandler {
                     .filter(p -> p.getFileName().toString().endsWith(".jar"))
                     .map(Path::toAbsolutePath)
                     .map(path -> getMetaData(path, manager))
-                    .filter(Objects::nonNull)
                     .collect(Collectors.toList());
         } catch (IOException ex) {
             eventBus.publish(new UserErrorEvent(ErrorLevel.HIGH, ex,
@@ -125,20 +120,12 @@ public class PluginFileHandler {
      *
      * @param path The path of the plugin to get metadata from.
      * @param manager The plugin manager to pass to new metadata instances.
-     * @return The metadata if it could be created, {@code null} otherwise.
+     * @return The metadata for the given plugin.
      */
-    @Nullable
     private PluginMetaData getMetaData(final Path path, final PluginManager manager) {
-        try {
-            final PluginMetaData metaData = new PluginMetaData(
-                    manager, new URL("jar:file:" + path + "!/META-INF/plugin.config"), path);
-            metaData.load();
-            return metaData;
-        } catch (MalformedURLException ex) {
-            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
-                    "Error creating URL for plugin " + path + ": " + ex.getMessage(), ""));
-            return null;
-        }
+        final PluginMetaData metaData = new PluginMetaData(manager, path);
+        metaData.load();
+        return metaData;
     }
 
     /**

src/com/dmdirc/plugins/PluginManager.java

@@ -31,8 +31,6 @@ import com.dmdirc.updater.components.PluginComponent;
 import com.dmdirc.updater.manager.UpdateManager;
 
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -144,8 +142,6 @@ public class PluginManager {
 
         try {
             final PluginMetaData metadata = new PluginMetaData(this,
-                    new URL("jar:file:" + directory + filename
-                            + "!/META-INF/plugin.config"),
                     Paths.get(directory, filename));
             metadata.load();
             final PluginInfo pluginInfo = new PluginInfo(this, serviceManager, directory, metadata,
@@ -169,9 +165,6 @@ public class PluginManager {
 
             eventBus.publishAsync(new PluginRefreshEvent());
             return true;
-        } catch (MalformedURLException mue) {
-            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, mue,
-                    "Error creating URL for plugin " + filename + ": " + mue.getMessage(), ""));
         } catch (PluginException e) {
             eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, e,
                     "Error loading plugin " + filename + ": " + e.getMessage(), ""));

src/com/dmdirc/plugins/PluginMetaData.java

@@ -27,8 +27,8 @@ import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -108,8 +108,6 @@ public class PluginMetaData {
     private boolean unloadable;
     /** The URL to the plugin. */
     private final Path pluginPath;
-    /** The URL to load the metadata from. */
-    private final URL url;
     /** The parent plugin manager. */
     private final PluginManager manager;
 
@@ -117,13 +115,11 @@ public class PluginMetaData {
      * Creates a new meta data reader for a config file at the specified URL.
      *
      * @param manager   Plugin manager
-     * @param url       The URL to load the config file from
      * @param pluginPath The path to the plugin that this data corresponds to
      */
-    public PluginMetaData(final PluginManager manager, final URL url, final Path pluginPath) {
+    public PluginMetaData(final PluginManager manager, final Path pluginPath) {
         this.manager = manager;
         this.pluginPath = pluginPath;
-        this.url = url;
     }
 
     /**
@@ -131,8 +127,8 @@ public class PluginMetaData {
      */
     public void load() {
         errors.clear();
-        try (final InputStream stream = url.openStream()) {
-            final ConfigFile configFile = new ConfigFile(stream);
+        try (FileSystem fs = FileSystems.newFileSystem(pluginPath, getClass().getClassLoader())) {
+            final ConfigFile configFile = new ConfigFile(fs.getPath("/META-INF/plugin.config"));
             configFile.read();
             readMetaData(configFile.getKeyDomain("metadata"));
             readVersion(configFile.getKeyDomain("version"));