Refactored main class

diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index 949e4ff8b2152b2e5d0ac3824f79bcc84f8adbf2..e16ffb6053fb96d4d262b4fafed5ab36a623528d 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -46,6 +46,12 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
 public class Main {
+       private static final int ACTION_DEFAULT = 0;
+       private static final int ACTION_LICENSE = 1;
+       private static final int ACTION_DESCRIPTION = 2;
+       private static final int ACTION_HELP = 3;
+       private static final int ACTION_CAPABILITIES = 4;
+       private static final int ACTION_CONFIGURE = 5;
        private File configFile;
        private Config config;
        private PrintStream outputWriter;
@@ -73,7 +79,7 @@ public class Main {
                logger.info("under certain conditions; `tv_grab_nl_java --license' for details.");
        }
 
-       public void run() throws FactoryConfigurationError, Exception {
+       public void fetchData() throws FactoryConfigurationError, Exception {
                if (!config.quiet) {
                        showHeader();
                        logger.info("Fetching programme data for " + this.days
@@ -327,7 +333,7 @@ public class Main {
                System.out.println(copyright);
        }
 
-       public void processOptions(String[] args) throws FileNotFoundException {
+       public Options createOptions()  {
                Options options = new Options();
                options.addOption(
                                OptionBuilder
@@ -392,7 +398,12 @@ public class Main {
                                                OptionBuilder.withLongOpt("license")
                                                                .withDescription("Show license information")
                                                                .create());
-               // .addOption(OptionBuilder.withLongOpt("preferredmethod").withDescription("Show preferred method").create();
+                       // .addOption(OptionBuilder.withLongOpt("preferredmethod").withDescription("Show preferred method").create();
+               return options;
+       }
+
+       public int processOptions(Options options, String[] args) throws FileNotFoundException {
+               int action = ACTION_DEFAULT;
 
                CommandLine line = null;
                try {
@@ -402,8 +413,8 @@ public class Main {
                }
 
                if (line.hasOption("license")) {
-                       showLicense();
-                       System.exit(0);
+                       action = ACTION_LICENSE;
+                       return action; // do not read config file
                }
                if (line.hasOption("config-file")) {
                        configFile = new File(line.getOptionValue("config-file"));
@@ -414,17 +425,10 @@ public class Main {
                        Logger.getRootLogger().setLevel(Level.ERROR);
                }
                if (line.hasOption("description")) {
-                       showHeader();
-                       System.out.println();
-                       System.out
-                                       .println("tv_grab_nl_java is a parser for Dutch TV listings using the tvgids.nl JSON interface");
-                       System.exit(0);
+                       action = ACTION_DESCRIPTION;
                }
                if (line.hasOption("help")) {
-                       // automatically generate the help statement
-                       HelpFormatter formatter = new HelpFormatter();
-                       formatter.printHelp("tv_grab_nl_java", options);
-                       System.exit(0);
+                       action = ACTION_HELP;
                }
                if (line.hasOption("output")) {
                        this.outputWriter = new PrintStream(new FileOutputStream(
@@ -449,33 +453,62 @@ public class Main {
                        this.offset = Integer.parseInt(line.getOptionValue("offset"));
                }
                if (line.hasOption("capabilities")) {
+                       action = ACTION_CAPABILITIES;
+               }
+               if (line.hasOption("configure")) {
+                       action = ACTION_CONFIGURE;
+               }
+               return action;
+       }
+
+       public static File defaultConfigFile() {
+               return FileUtils.getFile(FileUtils.getUserDirectory(), ".xmltv",
+                               "tv_grab_nl_java.conf");
+       }
+
+       public void run(String[] args) throws FactoryConfigurationError, Exception {
+               Options options = createOptions();
+               int action = processOptions(options, args);
+               switch(action) {
+               case ACTION_DEFAULT: 
+                       fetchData();
+                       break;
+               case ACTION_LICENSE: 
+                       showLicense();
+                       break;
+               case ACTION_DESCRIPTION:
+                       showHeader();
+                       System.out.println();
+                       System.out.println("tv_grab_nl_java is a parser for Dutch TV listings using the tvgids.nl JSON interface");
+                       break;
+               case ACTION_HELP:
+                       // automatically generate the help statement
+                       HelpFormatter formatter = new HelpFormatter();
+                       formatter.printHelp("tv_grab_nl_java", options);
+                       break;
+               case ACTION_CAPABILITIES:
                        System.out.println("baseline");
                        System.out.println("manualconfig");
                        System.out.println("cache");
                        // System.out.println("preferredmethod");
-                       System.exit(0);
-               }
-               if (line.hasOption("configure")) {
+                       break;
+               case ACTION_CONFIGURE:
                        try {
                                configure();
                        } catch (IOException e) {
                                logger.warn("Exception during configure");
                                logger.debug("Stack trace: ", e);
                        }
-                       System.exit(0);
-               }
-       }
-
-       public static File defaultConfigFile() {
-               return FileUtils.getFile(FileUtils.getUserDirectory(), ".xmltv",
-                               "tv_grab_nl_java.conf");
+                       break;
+               default:
+                       logger.error("Unknown main action value "+action);
+               }               
        }
 
        public static void main(String[] args) {
                Main main = new Main();
                try {
-                       main.processOptions(args);
-                       main.run();
+                       main.run(args);
                } catch (Exception e) {
                        logger.error("Error in tv_grab_nl_java application", e);
                }

diff --git a/src/test/java/org/vanbest/xmltv/MainTest.java b/src/test/java/org/vanbest/xmltv/MainTest.java
index 94323c3a560dea9669952d6f0b81f6c21cba9968..e52a5ec5eb77731462f131962adefb9e7707d66e 100644 (file)
--- a/src/test/java/org/vanbest/xmltv/MainTest.java
+++ b/src/test/java/org/vanbest/xmltv/MainTest.java
@@ -6,6 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.OutputStream;\r
 import java.io.StringWriter;\r
 \r
+import org.apache.commons.cli.Options;\r
 import org.apache.log4j.Logger;\r
 import org.apache.log4j.SimpleLayout;\r
 import org.apache.log4j.WriterAppender;\r
@@ -21,7 +22,8 @@ public class MainTest {
                Main main = new Main();\r
                String[] args = {}; \r
                try {\r
-                       main.processOptions(args);\r
+                       Options options = main.createOptions();\r
+                       main.processOptions(options, args);\r
                } catch (FileNotFoundException e) {\r
                        // TODO Auto-generated catch block\r
                        e.printStackTrace();\r