Work on making the IRC Parser a plugin

Core now auto-extracts the IRC parser

Fixes issue 3589
Issue 3588

Depends-On: I595bd3e7ffc62ef7f059ae53beb8d6957c22c541
Change-Id: I8db9f60494939f6581dfc2a5fc8bf8b2d216c580
Reviewed-on: http://gerrit.dmdirc.com/1061
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

build-jar.xml

@@ -24,6 +24,12 @@
             <zipfileset src="modules/plugins/lib/jetty-util-6.1.22.jar" includes="org/mortbay/**"/>
             <zipfileset src="modules/plugins/lib/servlet-api-2.5-20081211.jar" includes="javax/servlet/**"/>
         </jar>
+
+        <jar destfile="plugins/parser_irc.jar" compress="${jar.compress}" keepcompression="true" update="true">
+            <fileset dir="${build.classes.dir}">
+                <include name="com/dmdirc/parser/irc/**/*.class"/>
+            </fileset>
+        </jar>
     </target>
 
 </project>

createAllPluginJar.sh

@@ -15,7 +15,7 @@ if [ ${?} = "0" ]; then
 fi
 
 # Plugins to bundle into development jars.
-plugins="ui_swing.jar tabcompletion_bash.jar tabcompletion_mirc.jar"
+plugins="ui_swing.jar tabcompletion_bash.jar tabcompletion_mirc.jar parser_irc.jar"
 mkdir -p ${PWD}/build/classes/plugins
 for PLUGIN in ${plugins}; do
 	ln -sf ${PWD}/plugins/${PLUGIN} ${PWD}/build/classes/plugins/${PLUGIN};

nbproject/project.properties

@@ -24,7 +24,7 @@ build.test.results.dir=${build.dir}/test/results
 dist.dir=dist
 dist.jar=${dist.dir}/DMDirc.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-dist.jar.excludes=com/dmdirc/addons/**
+dist.jar.excludes=com/dmdirc/addons/**,com/dmdirc/parser/irc/**
 excludes=
 includes=**
 jar.compress=false

src/com/dmdirc/Main.java

@@ -123,10 +123,15 @@ public final class Main {
 
         CommandManager.initCommands();
 
-        for (String service : new String[]{"ui", "tabcompletion"}) {
+        for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
             ensureExists(pm, service);
         }
 
+        // The user may have an existing parser plugin (e.g. twitter) which
+        // will satisfy the service existance check above, but will render the
+        // client pretty useless, so we'll force IRC extraction for now.
+        extractCorePlugins("parser_irc");
+
         loadUI(pm, IdentityManager.getGlobalConfig());
         if (getUI() == null) {
             handleMissingUI();

src/com/dmdirc/ParserFactory.java

@@ -25,13 +25,13 @@ package com.dmdirc;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.plugins.ExportedService;
 import com.dmdirc.plugins.NoSuchProviderException;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
+
 import java.net.URI;
 
 /**
@@ -41,10 +41,10 @@ import java.net.URI;
  * @author chris
  */
 public class ParserFactory {
-    
+
     /**
      * Retrieves a parser instance.
-     * 
+     *
      * @param myInfo The client information to use
      * @param address The address of the server to connect to
      * @return An appropriately configured parser
@@ -62,38 +62,34 @@ public class ParserFactory {
             }
         }
 
-        if (address.getScheme() == null || "irc".equals(address.getScheme())
-                || "ircs".equals(address.getScheme())) {
-            return new IRCParser(myInfo, address);
-        } else {
-            try {
-                final Service service = PluginManager.getPluginManager()
-                        .getService("parser", address.getScheme());
+        // TODO: Move default scheme to a setting
+        final String scheme = address.getScheme() == null ? "irc" : address.getScheme();
 
-                if (service != null && !service.getProviders().isEmpty()) {
-                    final ServiceProvider provider = service.getProviders().get(0);
+        try {
+            final Service service = PluginManager.getPluginManager().getService("parser", scheme);
 
-                    if (provider != null) {
-                        provider.activateServices();
+            if (service != null && !service.getProviders().isEmpty()) {
+                final ServiceProvider provider = service.getProviders().get(0);
 
-                        final ExportedService exportService = provider
-                                .getExportedService("getParser");
-                        final Object obj = exportService.execute(myInfo, address);
-                        if (obj != null && obj instanceof Parser) {
-                            return (Parser)obj;
-                        } else {
-                            Logger.userError(ErrorLevel.MEDIUM,
-                                    "Unable to create parser for: " + address.getScheme());
-                        }
+                if (provider != null) {
+                    provider.activateServices();
+
+                    final ExportedService exportService = provider.getExportedService("getParser");
+                    final Object obj = exportService.execute(myInfo, address);
+                    if (obj != null && obj instanceof Parser) {
+                        return (Parser) obj;
+                    } else {
+                        Logger.userError(ErrorLevel.MEDIUM,
+                                "Unable to create parser for: " + address.getScheme());
                     }
                 }
-            } catch (NoSuchProviderException nspe) {
-                Logger.userError(ErrorLevel.MEDIUM,
-                        "No parser found for: " + address.getScheme(), nspe);
             }
-
-            return null;
+        } catch (NoSuchProviderException nspe) {
+            Logger.userError(ErrorLevel.MEDIUM,
+                    "No parser found for: " + address.getScheme(), nspe);
         }
+
+        return null;
     }
 
 }