Added CommandOptions and implemented behaviour

Added skill command
Added config-based cache for EVE data

externals/evetool

@@ -1 +1 @@
-Subproject commit 981207b68e01d080e71dcb1dbb574ab03c95492c
+Subproject commit c6d26678d8d54c9b4779459724f3f83cc944c2c9

src/com/md87/charliebravo/CommandOptions.java

@@ -0,0 +1,27 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.charliebravo;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * @author chris
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface CommandOptions {
+
+    boolean requireAuthorisation() default false;
+
+    int requireLevel() default -1;
+
+    String[] requiredSettings() default {};
+
+}

src/com/md87/charliebravo/Config.java

@@ -89,4 +89,8 @@ public class Config implements Runnable {
         }
     }
 
+    public ConfigFile getConfigfile() {
+        return configfile;
+    }
+
 }

src/com/md87/charliebravo/ConfigCache.java

@@ -0,0 +1,54 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.charliebravo;
+
+import com.dmdirc.util.ConfigFile;
+import java.util.Map;
+import uk.co.md87.evetool.api.io.ApiCache;
+import uk.co.md87.evetool.api.io.Downloader;
+
+/**
+ *
+ * @author chris
+ */
+public class ConfigCache implements ApiCache {
+    
+    private static final String DOMAIN = ".eve-cache";
+
+    private final ConfigFile config;
+
+    public ConfigCache(ConfigFile config) {
+        this.config = config;
+    }
+
+    public void setCache(String method, Map<String, String> args, String data, long cacheUntil) {
+        final String url = method + "?" + Downloader.encodeArguments(args);
+        config.getKeyDomain(DOMAIN).put(url, cacheUntil + ";"
+                + System.currentTimeMillis() + ";" + data);
+    }
+
+    public CacheStatus getCacheStatus(String method, Map<String, String> args) {
+        final String url = method + "?" + Downloader.encodeArguments(args);
+
+        if (config.getKeyDomain(DOMAIN).containsKey(url)) {
+            final String[] data = config.getKeyDomain(DOMAIN).get(url).split(";", 3);
+            final long expirary = Long.valueOf(data[0]);
+            return expirary < System.currentTimeMillis() ? CacheStatus.EXPIRED : CacheStatus.HIT;
+        } else {
+            return CacheStatus.MISS;
+        }
+    }
+
+    public CacheResult getCache(String method, Map<String, String> args) {
+        final String url = method + "?" + Downloader.encodeArguments(args);
+        final String[] data = config.getKeyDomain(DOMAIN).get(url).split(";", 3);
+        final long expirary = Long.valueOf(data[0]);
+        final long cachedAt = Long.valueOf(data[1]);
+
+        return new CacheResult(data[2], cachedAt, expirary);
+    }
+
+}

src/com/md87/charliebravo/Formatter.java

@@ -1,63 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.md87.charliebravo;
-
-/**
- *
- * @author chris
- */
-public class Formatter {
-
-    /**
-     * Tests for and adds one component of the duration format.
-     *
-     * @param builder The string builder to append text to
-     * @param current The number of seconds in the duration
-     * @param duration The number of seconds in this component
-     * @param name The name of this component
-     * @return The number of seconds used by this component
-     */
-    private static int doDuration(final StringBuilder builder, final int current,
-            final int duration, final String name) {
-        int res = 0;
-
-        if (current >= duration) {
-            final int units = current / duration;
-            res = units * duration;
-
-            if (builder.length() > 0) {
-                builder.append(", ");
-            }
-
-            builder.append(units);
-            builder.append(' ');
-            builder.append(name + (units != 1 ? 's' : ""));
-        }
-
-        return res;
-    }
-
-    /**
-     * Formats the specified number of seconds as a string containing the
-     * number of days, hours, minutes and seconds.
-     *
-     * @param duration The duration in seconds to be formatted
-     * @return A textual version of the duration
-     */
-    public static String formatDuration(final int duration) {
-        final StringBuilder buff = new StringBuilder();
-
-        int seconds = duration;
-
-        seconds -= doDuration(buff, seconds, 60*60*24, "day");
-        seconds -= doDuration(buff, seconds, 60*60, "hour");
-        seconds -= doDuration(buff, seconds, 60, "minute");
-        seconds -= doDuration(buff, seconds, 1, "second");
-
-        return buff.toString();
-    }
-
-}

src/com/md87/charliebravo/InputHandler.java

@@ -20,12 +20,14 @@ import com.md87.charliebravo.commands.HelpCommand;
 import com.md87.charliebravo.commands.IssueCommand;
 import com.md87.charliebravo.commands.QuitCommand;
 import com.md87.charliebravo.commands.SetCommand;
+import com.md87.charliebravo.commands.SkillCommand;
 import com.md87.charliebravo.commands.TranslateCommand;
 import com.md87.charliebravo.commands.WhoisCommand;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
 
 /**
  *
@@ -54,6 +56,7 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
         commands.add(new IssueCommand());
         commands.add(new GitCommand());
         commands.add(new SetCommand());
+        commands.add(new SkillCommand());
     }
 
     public Config getConfig() {
@@ -81,9 +84,9 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
 
     public void onChannelMessage(final IRCParser tParser, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        if (sMessage.startsWith(tParser.getMyNickname() + ", ")) {
+        if (sMessage.matches("^" + Matcher.quoteReplacement(tParser.getMyNickname()) + "[,:!] .*")) {
             handleInput(ClientInfo.parseHost(sHost), cChannel.getName(),
-                    sMessage.substring((tParser.getMyNickname() + ", ").length()));
+                    sMessage.substring(tParser.getMyNickname().length() + 2));
         }
     }
 
@@ -92,6 +95,14 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
     }
 
     protected void handleInput(final String source, final String target, final String text) {
+        new Thread(new Runnable() {
+            public void run() {
+                handleInputImpl(source, target, text);
+            }
+        }).start();
+    }
+
+    protected void handleInputImpl(final String source, final String target, final String text) {
         final Response response = new Response(parser, source, target);
         Command command = null;
         int index = 0;
@@ -116,7 +127,59 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
             }
 
             if (command != null) {
-                command.execute(this, response, text.substring(Math.min(text.length(), index)));
+                boolean cont = true;
+
+                if (command.getClass().isAnnotationPresent(CommandOptions.class)) {
+                    final CommandOptions opts = command.getClass()
+                            .getAnnotation(CommandOptions.class);
+
+                    final String id = (String) parser.getClientInfoOrFake(source)
+                            .getMap().get("OpenID");
+
+                    if (opts.requireAuthorisation() && id == null) {
+                        response.sendMessage("You must be authorised to use that command", true);
+                        cont = false;
+                    } else if (opts.requireLevel() > -1 &&
+                            (!config.hasOption(id, "admin.level")
+                            || (Integer.valueOf(config.getOption(id, "admin.level"))
+                            < opts.requireLevel()))) {
+                        response.sendMessage("You have insufficient access to " +
+                                "use that command", true);
+                        response.addFollowup(new LevelErrorFollowup(response.getSource(),
+                                opts.requireLevel(),
+                                config.hasOption(id, "admin.level")
+                                ? Integer.valueOf(config.getOption(id, "admin.level")) : -1));
+                        cont = false;
+                    } else {
+                        int count = 0;
+                        final StringBuilder missing = new StringBuilder();
+                        
+                        for (String setting : opts.requiredSettings()) {
+
+                            if (!config.hasOption(id, setting)) {
+                                if (missing.length() > 0) {
+                                    missing.append(", ");
+                                }
+
+                                count++;
+                                missing.append(setting);
+                            }
+                        }
+
+                        if (count > 0) {
+                            cont = false;
+                            response.sendRawMessage("You must have the following setting"
+                                    + (count == 1 ? "" : "s")
+                                    + " in order to use that command, " + response.getSource()
+                                    + ": " + missing.toString()
+                                    .replaceAll("^(.*), (.*?)$", "$1 and $2") + ".");
+                        }
+                    }
+                }
+
+                if (cont) {
+                    command.execute(this, response, text.substring(Math.min(text.length(), index)));
+                }
             }
         } catch (Throwable ex) {
             response.sendMessage("an error has occured: " + ex.getMessage());
@@ -131,6 +194,31 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
         }
     }
 
+    protected static class LevelErrorFollowup implements Followup {
+
+        private final String source;
+        private final int required, desired;
+
+        public LevelErrorFollowup(String source, int required, int desired) {
+            this.source = source;
+            this.required = required;
+            this.desired = desired;
+        }
+
+        public boolean matches(String line) {
+            return line.equalsIgnoreCase("details");
+        }
+
+        public void execute(InputHandler handler, Response response, String line) throws Exception {
+            final boolean you = response.getSource().equals(source);
+            response.sendMessage("that command requires level " + required
+                    + " access, but " + (you ? "you" : source) + " "
+                    + (desired == -1 ? "do" + (you ? "" : "es") + " not have any assigned level"
+                    : "only ha" + (you ? "ve" : "s") + " level " + desired));
+        }
+
+    }
+
     protected static class StacktraceFollowup implements Followup {
 
         private final Throwable ex;

src/com/md87/charliebravo/commands/QuitCommand.java

@@ -6,6 +6,7 @@
 package com.md87.charliebravo.commands;
 
 import com.md87.charliebravo.Command;
+import com.md87.charliebravo.CommandOptions;
 import com.md87.charliebravo.InputHandler;
 import com.md87.charliebravo.Response;
 
@@ -13,6 +14,7 @@ import com.md87.charliebravo.Response;
  *
  * @author chris
  */
+@CommandOptions(requireAuthorisation=true, requireLevel=100)
 public class QuitCommand implements Command {
 
     /** {@inheritDoc} */

src/com/md87/charliebravo/commands/SetCommand.java

@@ -5,7 +5,9 @@
 
 package com.md87.charliebravo.commands;
 
+import com.dmdirc.parser.irc.ClientInfo;
 import com.md87.charliebravo.Command;
+import com.md87.charliebravo.CommandOptions;
 import com.md87.charliebravo.InputHandler;
 import com.md87.charliebravo.Response;
 
@@ -13,13 +15,44 @@ import com.md87.charliebravo.Response;
  *
  * @author chris
  */
+@CommandOptions(requireAuthorisation=true)
 public class SetCommand implements Command {
 
     public void execute(InputHandler handler, Response response, String line) throws Exception {
         final String openID = (String) handler.getParser().getClientInfoOrFake(response.getSource())
                 .getMap().get("OpenID");
+        String target = openID;
+        String value = line;
 
-        final String[] parts = line.split("\\s+", 2);
+        int offset;
+        if ((offset = line.toLowerCase().lastIndexOf("on behalf of")) > -1) {
+            if (!handler.getConfig().hasOption(openID, "admin.level")
+                || Integer.parseInt(handler.getConfig().getOption(openID, "admin.level")) < 100) {
+                response.sendMessage("You do not have sufficient access", true);
+                return;
+            } else {
+                final String user = line.substring(offset + 13);
+                value = line.substring(0, offset - 1);
+                
+                final ClientInfo client = handler.getParser().getClientInfo(user);
+
+                if (client != null) {
+                    if (client.getMap().get("OpenID") == null) {
+                        response.sendMessage(client.getNickname() + " isn't authed", true);
+                        return;
+                    }
+
+                    target = (String) client.getMap().get("OpenID");
+                } else if (handler.getConfig().hasOption(user, "internal.lastseen")) {
+                    target = user;
+                } else {
+                    response.sendMessage("I couldn't find anyone by that name", true);
+                    return;
+                }
+            }
+        }
+
+        final String[] parts = value.split("\\s+", 2);
 
         if (openID == null) {
             response.sendMessage("You must be authorised to use this command", true);
@@ -32,7 +65,7 @@ public class SetCommand implements Command {
                 || Integer.parseInt(handler.getConfig().getOption(openID, "admin.level")) < 100)) {
             response.sendMessage("You do not have sufficient access", true);
         } else {
-            handler.getConfig().setOption(openID, parts[0], parts[1]);
+            handler.getConfig().setOption(target, parts[0], parts[1]);
             response.sendMessage("OK", true);
         }
     }

src/com/md87/charliebravo/commands/SkillCommand.java

@@ -0,0 +1,134 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.md87.charliebravo.commands;
+
+import com.dmdirc.ui.messages.Formatter;
+import com.md87.charliebravo.Command;
+import com.md87.charliebravo.CommandOptions;
+import com.md87.charliebravo.ConfigCache;
+import com.md87.charliebravo.Followup;
+import com.md87.charliebravo.InputHandler;
+import com.md87.charliebravo.Response;
+import uk.co.md87.evetool.api.ApiResponse;
+import uk.co.md87.evetool.api.EveApi;
+import uk.co.md87.evetool.api.wrappers.SkillInTraining;
+import uk.co.md87.evetool.api.wrappers.SkillList;
+
+/**
+ *
+ * @author chris
+ */
+@CommandOptions(requireAuthorisation=true, requiredSettings={"eve.apikey","eve.userid","eve.charid"})
+public class SkillCommand implements Command {
+
+    public void execute(InputHandler handler, Response response, String line) throws Exception {
+        final String openID = (String) handler.getParser().getClientInfoOrFake(response.getSource())
+                .getMap().get("OpenID");
+
+        if (openID == null) {
+            response.sendMessage("You must be authorised to use this command", true);
+        } else {
+            final EveApi api = new EveApi(new ConfigCache(handler.getConfig().getConfigfile()));
+            api.setApiKey(handler.getConfig().getOption(openID, "eve.apikey"));
+            api.setUserID(Integer.parseInt(handler.getConfig().getOption(openID, "eve.userid")));
+            api.setCharID(Integer.parseInt(handler.getConfig().getOption(openID, "eve.charid")));
+
+            final ApiResponse<SkillInTraining> res = api.getSkillInTraining();
+
+            if (res.wasSuccessful()) {
+                final SkillInTraining skill = res.getResult();
+
+                final ApiResponse<SkillList> res2 = api.getSkillTree();
+
+                if (res2.wasSuccessful()) {
+                    if (skill.isInTraining() && System.currentTimeMillis()
+                                < skill.getEndTime().getTime() - 1000) {
+                        skill.setSkill(res2.getResult().getSkillById(skill.getTypeId()));
+                        response.sendMessage("you are currently training "
+                                + skill.getSkill().getName() + " to level "
+                                + skill.getTargetLevel() + ". It will finish in "
+                                + Formatter.formatDuration((int) (skill.getEndTime()
+                                .getTime() - System.currentTimeMillis()) / 1000));
+                    } else {
+                        response.sendMessage("You are not training anything", true);
+                    }
+                } else {
+                    response.sendMessage("There was an error retrieving the EVE skill list", true);
+                    response.addFollowup(new ErrorFollowup(res2));
+                    response.addFollowup(new RetryFollowup(this));
+                }
+            } else {
+                response.sendMessage("There was an error retrieving your skill information", true);
+                response.addFollowup(new ErrorFollowup(res));
+                response.addFollowup(new RetryFollowup(this));
+            }
+
+            response.addFollowup(new CacheFollowup(res));
+        }
+    }
+
+    protected static class CacheFollowup implements Followup {
+
+        protected final ApiResponse<?> apiresponse;
+
+        public CacheFollowup(ApiResponse<?> apiresponse) {
+            this.apiresponse = apiresponse;
+        }
+
+        public boolean matches(String line) {
+            return line.equalsIgnoreCase("cache");
+        }
+
+        public void execute(InputHandler handler, Response response, String line) throws Exception {
+            response.setInheritFollows(true);
+            response.sendMessage("the result has been cached for " +
+                    Formatter.formatDuration((int) (System.currentTimeMillis()
+                    - apiresponse.getApiResult().getCachedSince().getTime()) / 1000)
+                    + ", and will expire in " +
+                    Formatter.formatDuration((int) (apiresponse.getApiResult()
+                    .getCachedUntil().getTime() - System.currentTimeMillis()) / 1000));
+        }
+
+    }
+
+    protected static class ErrorFollowup implements Followup {
+
+        protected final ApiResponse<?> apiresponse;
+
+        public ErrorFollowup(ApiResponse<?> response) {
+            this.apiresponse = response;
+        }
+
+        public boolean matches(String line) {
+            return line.equalsIgnoreCase("error");
+        }
+
+        public void execute(InputHandler handler, Response response, String line) throws Exception {
+            response.setInheritFollows(true);
+            response.sendMessage("the error message was: " + apiresponse.getError());
+        }
+
+    }
+
+    protected static class RetryFollowup implements Followup {
+
+        protected final Command command;
+
+        public RetryFollowup(Command command) {
+            this.command = command;
+        }
+
+        public boolean matches(String line) {
+            return line.equalsIgnoreCase("retry");
+        }
+
+        public void execute(InputHandler handler, Response response, String line) throws Exception {
+            command.execute(handler, response, line);
+        }
+
+    }
+
+}

src/com/md87/charliebravo/commands/WhoisCommand.java

@@ -6,8 +6,8 @@
 package com.md87.charliebravo.commands;
 
 import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.ui.messages.Formatter;
 import com.md87.charliebravo.Command;
-import com.md87.charliebravo.Formatter;
 import com.md87.charliebravo.InputHandler;
 import com.md87.charliebravo.Response;
 
@@ -44,19 +44,20 @@ public class WhoisCommand implements Command {
                 }
             } else {
                 final String openid = (String) ci.getMap().get("OpenID");
+                final boolean you = ci.getNickname().equals(response.getSource());
 
                 if (openid == null) {
-                    response.sendMessage(ci.getNickname() + " has not authenticated with me", true);
+                    response.sendMessage((you ? "You have" : ci.getNickname() + " has")
+                            + " not authenticated with me", true);
                 } else {
                     final StringBuilder extra = new StringBuilder();
 
                     if (handler.getConfig().hasOption(openid, "admin.level")) {
-                        extra.append(", and has access level ");
+                        extra.append(", and " + (you ? "have" : "has") + " access level ");
                         extra.append(handler.getConfig().getOption(openid, "admin.level"));
                     }
 
-                    response.sendMessage((ci.getNickname().equals(response.getSource()) ?
-                            "you are " : ci.getNickname() + " is")
+                    response.sendMessage((you ? "you are" : ci.getNickname() + " is")
                             + " authenticated as " + openid + extra);
                 }
             }