Intelligent notification targets

git-svn-id: http://svn.dmdirc.com/trunk@2252 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Server.java

@@ -813,6 +813,29 @@ public final class Server extends WritableFrameContainer implements
             addLineToAll(messageType, args);
         } else if ("active".equals(target)) {
             addLineToActive(messageType, args);
+        } else if (target.startsWith("lastcommand:")) {
+            final String command = String.format(target.substring(12), args);
+            
+            WritableFrameContainer best = this;
+            long besttime = 0;
+            
+            final List<WritableFrameContainer> containers = new ArrayList<WritableFrameContainer>();
+            containers.addAll(channels.values());
+            containers.addAll(queries.values());
+            
+            if (raw != null) {
+                containers.add(raw);
+            }
+            
+            for (WritableFrameContainer container: containers) {
+                long time = container.getFrame().getCommandParser().getCommandTime(command);
+                if (time > besttime) {
+                    besttime = time;
+                    best = container;
+                }
+            }
+            
+            best.addLine(messageType, args);
         } else if (!"none".equals(target)) {
             Logger.userError(ErrorLevel.MEDIUM,
                     "Invalid notification target for type " + messageType + ": " + target);

src/com/dmdirc/commandparser/CommandParser.java

@@ -29,7 +29,9 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -52,6 +54,11 @@ public abstract class CommandParser implements Serializable {
      */
     private final Map<String, Command> commands;
     
+    /**
+     * A history of commands that have been entered into this parser.
+     */
+    private final List<PreviousCommand> history = new ArrayList<PreviousCommand>();
+    
     /** Creates a new instance of CommandParser. */
     public CommandParser() {
         commands = new Hashtable<String, Command>();
@@ -90,12 +97,14 @@ public abstract class CommandParser implements Serializable {
             return;
         }
         
-        if (line.charAt(0) == IdentityManager.getGlobalConfig().getOption("general", "commandchar").charAt(0)) {
+        if (line.charAt(0) == IdentityManager.getGlobalConfig()
+                .getOption("general", "commandchar").charAt(0)) {
             int offset = 1;
             boolean silent = false;
             
             if (line.length() > offset
-                    && line.charAt(offset) == IdentityManager.getGlobalConfig().getOption("general", "silencechar").charAt(0)) {
+                    && line.charAt(offset) == IdentityManager.getGlobalConfig()
+                    .getOption("general", "silencechar").charAt(0)) {
                 silent = true;
                 offset++;
             }
@@ -106,7 +115,8 @@ public abstract class CommandParser implements Serializable {
             
             assert args.length > 0;
             
-            if (args.length >= 2 && parseChannel && origin != null && origin.getContainer().getServer() != null
+            if (args.length >= 2 && parseChannel && origin != null
+                    && origin.getContainer().getServer() != null
                     && origin.getContainer().getServer().getParser().isValidChannelName(args[1])
                     && CommandManager.isChannelCommand(command)) {
                 final Server server = origin.getContainer().getServer();
@@ -138,8 +148,10 @@ public abstract class CommandParser implements Serializable {
             // have error handlers if there are too few arguments (e.g., msg/0 and
             // msg/1 would return errors, so msg only gets called with 2+ args).
             if (commands.containsKey(signature.toLowerCase())) {
+                addHistory(command, comargs);
                 executeCommand(origin, silent, commands.get(signature.toLowerCase()), comargs);
             } else if (commands.containsKey(command.toLowerCase())) {
+                addHistory(command, comargs);
                 executeCommand(origin, silent, commands.get(command.toLowerCase()), comargs);
             } else {
                 handleInvalidCommand(origin, command, comargs);
@@ -149,6 +161,47 @@ public abstract class CommandParser implements Serializable {
         }
     }
     
+    /**
+     * Adds a command to this parser's history.
+     *
+     * @param command The command name that was used
+     * @param args The arguments for the command, if any
+     */
+    private void addHistory(final String command, final String... args) {
+        final StringBuilder builder = new StringBuilder(command);
+        
+        for (String arg : args) {
+            builder.append(' ');
+            builder.append(arg);
+        }
+        
+        history.add(new PreviousCommand(builder.toString()));
+        
+        while (history.size() >
+                IdentityManager.getGlobalConfig().getOptionInt("general", "commandhistory", 10)) {
+            history.remove(0);
+        }
+    }
+    
+    /**
+     * Retrieves the most recent time that the specified command was used.
+     * Commands should not include command or silence chars.
+     *
+     * @param command The command to search for
+     * @return The timestamp that the command was used, or 0 if it wasn't
+     */
+    public long getCommandTime(final String command) {
+        long res = 0;
+        
+        for (PreviousCommand pc : history) {
+            if (pc.getLine().equalsIgnoreCase(command)) {
+                res = Math.max(res, pc.getTime());
+            }
+        }
+        
+        return res;
+    }
+    
     /**
      * Parses the specified string as a command.
      * @param origin The window in which the command was typed

src/com/dmdirc/commandparser/PreviousCommand.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.commandparser;
+
+import java.util.Date;
+
+public final class PreviousCommand {
+    
+    private final String line;
+    private final long time;
+    
+    public PreviousCommand(final String line) {
+        this.line = line;
+        this.time = new Date().getTime();
+    }
+    
+    public long getTime() {
+        return time;
+    }
+    
+    public String getLine() {
+        return line;
+    }
+    
+}

src/com/dmdirc/config/defaults/defaults

@@ -67,7 +67,7 @@ notifications.numeric_671=group:whois
 
 notifications.numeric_705=server
 
-notifications.whois=active
+notifications.whois=lastcommand:whois %4$s
         
 ui.backgroundcolour=0
 ui.foregroundcolour=1