Changeset 5c99491

Timestamp:

Aug 23, 2010, 4:21:10 PM (8 years ago)

Author:

Michael Seifert <mseifert@…>

Branches:

master

Children:

d7023f0

Parents:

c60bc67

Message:

core:
Added commons-cli as dependecy for easier processing of commandline arguments
ReplayStorage? supports setting a storage path;
First steps of creating a command line interface

Location:

core

Files:

• pom.xml (modified) (1 diff)
• src/main/java/de/erichseifert/warp/core/DataPresenter.java (modified) (4 diffs)
• src/main/java/de/erichseifert/warp/core/WARP.java (modified) (2 diffs)
• src/main/java/de/erichseifert/warp/core/io/BufferedStorage.java (modified) (2 diffs)
• src/main/java/de/erichseifert/warp/core/io/MemoryStorage.java (modified) (2 diffs)
• src/main/java/de/erichseifert/warp/core/io/ReplayStorage.java (modified) (2 diffs)
• src/main/java/de/erichseifert/warp/core/io/SerializingStorage.java (modified) (1 diff)
• src/main/java/de/erichseifert/warp/core/ui/CLI.java (modified) (1 diff)

core/pom.xml

@@ -55 +55 @@
     </plugins>
   </build>
+  
+  <dependencies>
+        <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.2</version>
+        </dependency>
+  </dependencies>
 
   <reporting>

core/src/main/java/de/erichseifert/warp/core/DataPresenter.java

@@ -153 +153 @@
          * This constructor uses a <code>MemoryStorage</code> as storage
          * and a <code>CLI</code> as user interface by default.
-         */
-        protected DataPresenter() {
-                this(new MemoryStorage(), new CLI());
+         * @param args Command line arguments.
+         */
+        protected DataPresenter(String... args) {
+                this(new MemoryStorage(), args);
         }
 
         /**
          * Creates a <code>DataPresenter</code> object with the specified
-         * storage and user interface.
+         * storage and a command line user interface.
          * @param storage Replay storage.
-         * @param ui User interface.
-         */
-        protected DataPresenter(ReplayStorage storage, WARPUI ui) {
+         * @param args Command line arguments.
+         */
+        protected DataPresenter(ReplayStorage storage, String... args) {
                 this.storage = storage;
-                this.ui = ui;
+                this.ui = new CLI(this, args);
                 invalidFiles = new LinkedHashSet<File>();
         }
@@ -192 +193 @@
          * @param dir
          */
-        public void parseDir(File dir, ProgressListener listener) {
+        public void parseDir(File dir, ProgressListener... listeners) {
                 if (dir == null) {
                         return;
@@ -208 +209 @@
 
                 // Start parsing routine
-                ParserThread parserThread = new ParserThread(dir, storage, invalidFiles, listener);
+                ParserThread parserThread = new ParserThread(dir, storage, invalidFiles, listeners);
                 parserThread.start();
         }
@@ -292 +293 @@
                 return ui;
         }
+
+        public void setStoragePath(String path) throws IOException {
+                storage.setStoragePath(path);
+        }
+
+        public String getStoragePath() {
+                return storage.getStoragePath();
+        }
 }

core/src/main/java/de/erichseifert/warp/core/WARP.java

@@ -34 +34 @@
         /**
          * Creates a <code>WARP</code> object.
+         * @param args Command line arguments.
          */
-        public WARP() {
+        public WARP(String... args) {
+                super(args);
                 WARPUI ui = getUi();
                 ui.setReplays(getStorage().getDescriptors());
@@ -45 +47 @@
 
         /**
-         * @param args No command line arguments are processed.
+         * @param args Command line arguments.
          */
         public static void main(String[] args) {
-                new WARP();
+                new WARP(args);
         }
 }

core/src/main/java/de/erichseifert/warp/core/io/BufferedStorage.java

@@ -23 +23 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -164 +165 @@
                 storage.clear();
         }
+
+        @Override
+        public String getStoragePath() {
+                return storage.getStoragePath();
+        }
+
+        @Override
+        public void setStoragePath(String path) throws IOException {
+                storage.setStoragePath(path);
+        }
 }

core/src/main/java/de/erichseifert/warp/core/io/MemoryStorage.java

@@ -23 +23 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -120 +121 @@
                 cache.clear();
         }
+
+        @Override
+        public String getStoragePath() {
+                return null;
+        }
+
+        @Override
+        public void setStoragePath(String path) throws IOException {
+        }
 }

core/src/main/java/de/erichseifert/warp/core/io/ReplayStorage.java

@@ -23 +23 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
@@ -121 +122 @@
          */
         void clear();
+
+        String getStoragePath();
+        void setStoragePath(String path) throws IOException;
 }

core/src/main/java/de/erichseifert/warp/core/io/SerializingStorage.java

@@ -388 +388 @@
                 }
         }
+
+        @Override
+        public String getStoragePath() {
+                return storageDir.getAbsolutePath();
+        }
+
+        @Override
+        public void setStoragePath(String path) throws IOException {
+                File dst = new File(path);
+                boolean moveSuccessful = storageDir.renameTo(dst);
+                if (!moveSuccessful) {
+                        throw new IOException(String.format("Could not move %s to %s.", storageDir.getAbsolutePath(), dst.getAbsolutePath()));
+                }
+        }
 }

core/src/main/java/de/erichseifert/warp/core/ui/CLI.java

@@ -22 +22 @@
 package de.erichseifert.warp.core.ui;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Set;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+import de.erichseifert.warp.core.DataPresenter;
 import de.erichseifert.warp.core.replay.ReplayDescriptor;
 
 public class CLI implements WARPUI {
 
-        public CLI() {
-                System.err.println(getClass().getName()+" is not implemented.");
+        public CLI(DataPresenter presenter, String[] args) {
+                // Create options
+                Options opts = new Options();
+                @SuppressWarnings("static-access")
+                Option parseOpt = OptionBuilder.withArgName("src dst").hasArgs(2)
+                        .withValueSeparator(' ')
+                        .withDescription("Parses the files in the specified source folder storing it in the specified destination folder. If the destination folder is \"\", the parsed replays will be stored in memory.")
+                        .withLongOpt("parse").create("p");
+                opts.addOption(parseOpt);
+                //opts.addOption("p", "parse", true, "Parses the files in the specified folder");
+                opts.addOption("v", "verbose", false, "Verbose mode (not implemented)");
+                //opts.addOption(null, "path", true, "Save path of parsed replays. Parsed replays are stored in the memory, if no path is set. (not implemented)");
+
+                // Create help
+                HelpFormatter help = new HelpFormatter();
+                help.printHelp("WARP", opts);
+
+                // Process arguments
+                CommandLineParser parser = new PosixParser();
+                CommandLine cl = null;
+                try {
+                        cl = parser.parse(opts, args, true);
+                } catch (ParseException e) {
+                        e.printStackTrace();
+                        // TODO Auto-generated catch block
+                        return;
+                }
+
+                if (cl.hasOption("p")) {
+                        String[] paths = cl.getOptionValues("p");
+                        File src = new File(paths[0]);
+                        if (!paths[1].isEmpty()) {
+                                try {
+                                        presenter.setStoragePath(paths[1]);
+                                } catch (IOException e) {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+                        }
+                        presenter.parseDir(src);
+                }
+
         }