Added Command.doTable

/nowplaying --sources now uses a table for its outpt

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

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
-import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -57,6 +56,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final Server server,
             final MessageTarget target, final boolean isSilent, final String ... args) {
         if (args.length > 0 && args[0].equalsIgnoreCase("--sources")) {
@@ -76,7 +76,8 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                     }
                 }
             } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "You must specify a source when using --source.");
+                sendLine(origin, isSilent, FORMAT_ERROR,
+                        "You must specify a source when using --source.");
             }
         } else {
             if (parent.hasRunningSource()) {
@@ -99,23 +100,33 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
         if (sources.isEmpty()) {
             sendLine(origin, isSilent, FORMAT_ERROR, "No media sources available.");
         } else {
-            String status;
+            final String[] headers = {"Source", "Status", "Information"};
+            final String[][] data = new String[sources.size()][3];
+            int i = 0;
             
             for (MediaSource source : sources) {
+                data[i][0] = source.getAppName();
+                
                 if (source.isRunning()) {
                     if (source.isPlaying()) {
-                        status = "playing: " + getInformation(source);
+                        data[i][1] = "playing";
                     } else {
-                        status = "paused: " + getInformation(source);
+                        data[i][1] = "paused";
                     }
+                    
+                    data[i][2] = getInformation(source);
                 } else {
-                    status = "not running";
+                    data[i][1] = "not running";
+                    data[i][2] = "-";
                 }
-                sendLine(origin, isSilent, FORMAT_OUTPUT, source.getAppName() + ": " + status);
+                
+                i++;
             }
+            
+            sendLine(origin, isSilent, FORMAT_OUTPUT, doTable(headers, data));
         }
     }
-    
+       
     /**
      * Returns a formatted information string from the requested soruce.
      *
@@ -139,21 +150,26 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     }
     
     /** {@inheritDoc}. */
+    @Override
     public String getName() {
         return "nowplaying";
     }
     
     /** {@inheritDoc}. */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
     /** {@inheritDoc}. */
+    @Override
     public String getHelp() {
-        return "nowplaying [--sources|--source <source>] - tells the channel the song you're currently playing";
+        return "nowplaying [--sources|--source <source>] - " +
+                "tells the channel the song you're currently playing";
     }
     
     /** {@inheritDoc} */
+    @Override
     public AdditionalTabTargets getSuggestions(final int arg, 
             final List<String> previousArgs) {
         final AdditionalTabTargets res = new AdditionalTabTargets();

src/com/dmdirc/commandparser/CommandInfo.java

@@ -46,6 +46,10 @@ public abstract class CommandInfo {
      */
     public abstract String getHelp();
     
+    /**
+     * Retrieves the type of this command.
+     * @return This command's type
+     */
     public abstract CommandType getType();
 
 }

src/com/dmdirc/commandparser/commands/Command.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.messages.Styliser;
 
 /**
  * Represents a generic command.
@@ -94,6 +95,61 @@ public abstract class Command extends CommandInfo implements Comparable<Command>
                 name, args);
     }    
     
+    /**
+     * Formats the specified data into a table suitable for output in the
+     * textpane. It is expected that each String[] in data has the same number
+     * of elements as the headers array.
+     * 
+     * @param headers The headers of the table.
+     * @param data The contents of the table.
+     * @return A string containing an ASCII table
+     */
+    protected static String doTable(final String[] headers, final String[][] data) {
+        StringBuilder res = new StringBuilder();
+        res.append(Styliser.CODE_FIXED);
+        res.append(Styliser.CODE_BOLD);
+        
+        int[] maxsizes = new int[headers.length];
+        
+        for (int i = 0; i < headers.length; i++) {
+            maxsizes[i] = headers[i].length() + 3;
+            
+            for (int j = 0; j < data.length; j++) {
+                maxsizes[i] = Math.max(maxsizes[i], data[j][i].length() + 3);
+            }
+            
+            doPadding(res, headers[i], maxsizes[i]);
+        }
+                
+        for (String[] source : data) {
+            res.append('\n');
+            res.append(Styliser.CODE_FIXED);
+            
+            for (int i = 0; i < source.length; i++) {
+                doPadding(res, source[i], maxsizes[i]);
+            }
+        }
+        
+        return res.toString();
+    }
+    
+    /**
+     * Adds the specified data to the stringbuilder, padding with spaces to
+     * the specified size.
+     * 
+     * @param builder The stringbuilder to append data to
+     * @param data The data to be added
+     * @param size The minimum size that should be used
+     */
+    private static void doPadding(final StringBuilder builder, final String data,
+            final int size) {
+        builder.append(data);
+        
+        for (int i = 0; i < size - data.length(); i++) {
+            builder.append(' ');
+        }
+    }    
+    
     /** {@inheritDoc} */
     @Override
     public final int compareTo(final Command o) {