Allows custom formats to be passed to nowplaying command.

Fixes issue 1164
Change-Id: I6a21d609ad5d8179085bceb8376444e943f5299d
Reviewed-on: http://gerrit.dmdirc.com/750
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

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

@@ -63,7 +63,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
             final MessageTarget target, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--sources")) {
-            doSourceList(origin, isSilent);
+            doSourceList(origin, isSilent, args.getArgumentsAsString(1));
         } else if (args.getArguments().length > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--source")) {
             if (args.getArguments().length > 1) {
@@ -75,7 +75,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                 } else {
                     if (source.getState() != MediaSourceState.CLOSED) {
                         target.getFrame().getCommandParser().parseCommand(origin,
-                                getInformation(source));
+                                getInformation(source, args.getArgumentsAsString(2)));
                     } else {
                         sendLine(origin, isSilent, FORMAT_ERROR, "Source is not running.");
                     }
@@ -87,7 +87,8 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
         } else {
             if (parent.hasRunningSource()) {
                 target.getFrame().getCommandParser().parseCommand(origin,
-                        getInformation(parent.getBestSource()));
+                        getInformation(parent.getBestSource(), args.
+                        getArgumentsAsString(0)));
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR, "No running media sources available.");
             }
@@ -99,8 +100,10 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
      *
      * @param origin The input window where the command was entered
      * @param isSilent Whether this command is being silenced
+     * @param format Format to be passed to getInformation
      */
-    private void doSourceList(final InputWindow origin, final boolean isSilent) {
+    private void doSourceList(final InputWindow origin, final boolean isSilent,
+            final String format) {
         final List<MediaSource> sources = parent.getSources();
         
         if (sources.isEmpty()) {
@@ -115,7 +118,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                 
                 if (source.getState() != MediaSourceState.CLOSED) {
                     data[i][1] = source.getState().getNiceName().toLowerCase();
-                    data[i][2] = getInformation(source);
+                    data[i][2] = getInformation(source, format);
                 } else {
                     data[i][1] = "not running";
                     data[i][2] = "-";
@@ -132,12 +135,18 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
      * Returns a formatted information string from the requested soruce.
      *
      * @param source MediaSource to query
+     * @param format Format to use
      *
      * @return Formatted information string
-     */ 
-    private String getInformation(final MediaSource source) {
-        return parent.doSubstitution(IdentityManager.getGlobalConfig()
-                .getOption(parent.getDomain(), "format"), source);
+     * @since 0.6.3
+     */
+    private String getInformation(final MediaSource source, final String format) {
+        if (format.isEmpty()) {
+            return parent.doSubstitution(IdentityManager.getGlobalConfig()
+                    .getOption(parent.getDomain(), "format"), source);
+        } else {
+            return parent.doSubstitution(format, source);
+        }
     }
     
     /** {@inheritDoc}. */