|
@@ -33,7 +33,7 @@ import com.dmdirc.ui.WindowManager;
|
33
|
33
|
import com.dmdirc.ui.input.AdditionalTabTargets;
|
34
|
34
|
|
35
|
35
|
import java.util.ArrayList;
|
36
|
|
-import java.util.Arrays;
|
|
36
|
+import java.util.Date;
|
37
|
37
|
import java.util.List;
|
38
|
38
|
|
39
|
39
|
/**
|
|
@@ -54,34 +54,51 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
|
54
|
54
|
|
55
|
55
|
/** {@inheritDoc} */
|
56
|
56
|
@Override
|
57
|
|
- public void execute(final FrameContainer origin, final boolean isSilent,
|
|
57
|
+ public void execute(final FrameContainer<?> origin, final boolean isSilent,
|
58
|
58
|
final CommandArguments args) {
|
59
|
|
- if (args.getArguments().length > 0
|
60
|
|
- && args.getArguments()[0].equalsIgnoreCase("--active")) {
|
61
|
|
- final FrameContainer frame = WindowManager.getActiveWindow();
|
62
|
|
- frame.addLine(FORMAT_OUTPUT, args.getArgumentsAsString(1));
|
63
|
|
- } else if (args.getArguments().length > 1
|
64
|
|
- && args.getArguments()[0].equalsIgnoreCase("--target")) {
|
65
|
|
- FrameContainer frame = null;
|
66
|
|
- FrameContainer target = origin;
|
|
59
|
+ int offset = 0;
|
|
60
|
+ Date time = new Date();
|
|
61
|
+
|
|
62
|
+ if (args.getArguments().length > 1
|
|
63
|
+ && args.getArguments()[offset].equalsIgnoreCase("--ts")) {
|
|
64
|
+ try {
|
|
65
|
+ time = new Date(Long.parseLong(args.getWordsAsString(2, 2)));
|
|
66
|
+ } catch (NumberFormatException ex) {
|
|
67
|
+ sendLine(origin, isSilent, FORMAT_ERROR, "Unable to process timestamp");
|
|
68
|
+ return;
|
|
69
|
+ }
|
|
70
|
+
|
|
71
|
+ offset = 2;
|
|
72
|
+ }
|
|
73
|
+
|
|
74
|
+ if (args.getArguments().length > offset
|
|
75
|
+ && args.getArguments()[offset].equalsIgnoreCase("--active")) {
|
|
76
|
+ if (!isSilent) {
|
|
77
|
+ final FrameContainer<?> frame = WindowManager.getActiveWindow();
|
|
78
|
+ frame.addLine(FORMAT_OUTPUT, time, args.getArgumentsAsString(offset + 1));
|
|
79
|
+ }
|
|
80
|
+ } else if (args.getArguments().length > offset + 1
|
|
81
|
+ && args.getArguments()[offset].equalsIgnoreCase("--target")) {
|
|
82
|
+ FrameContainer<?> frame = null;
|
|
83
|
+ FrameContainer<?> target = origin;
|
67
|
84
|
|
68
|
85
|
while (frame == null && target != null) {
|
69
|
|
- frame = WindowManager.findCustomWindow(target, args.getArguments()[1]);
|
|
86
|
+ frame = WindowManager.findCustomWindow(target, args.getArguments()[offset + 1]);
|
70
|
87
|
}
|
71
|
88
|
|
72
|
89
|
if (frame == null) {
|
73
|
|
- frame = WindowManager.findCustomWindow(args.getArguments()[1]);
|
|
90
|
+ frame = WindowManager.findCustomWindow(args.getArguments()[offset + 1]);
|
74
|
91
|
}
|
75
|
92
|
|
76
|
93
|
if (frame == null) {
|
77
|
94
|
sendLine(origin, isSilent, FORMAT_ERROR,
|
78
|
95
|
"Unable to find target window");
|
79
|
|
- } else {
|
80
|
|
- frame.addLine(FORMAT_OUTPUT, args.getArgumentsAsString(2));
|
|
96
|
+ } else if (!isSilent) {
|
|
97
|
+ frame.addLine(FORMAT_OUTPUT, time, args.getArgumentsAsString(offset + 2));
|
81
|
98
|
}
|
82
|
99
|
|
83
|
|
- } else {
|
84
|
|
- sendLine(origin, isSilent, FORMAT_OUTPUT, args.getArgumentsAsString());
|
|
100
|
+ } else if (origin != null && !isSilent) {
|
|
101
|
+ origin.addLine(FORMAT_OUTPUT, time, args.getArgumentsAsString(offset));
|
85
|
102
|
}
|
86
|
103
|
}
|
87
|
104
|
|
|
@@ -100,7 +117,7 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
|
100
|
117
|
/** {@inheritDoc} */
|
101
|
118
|
@Override
|
102
|
119
|
public String getHelp() {
|
103
|
|
- return "echo [--active|--target <window>] <line> "
|
|
120
|
+ return "echo [--ts <timestamp>] [--active|--target <window>] <line> "
|
104
|
121
|
+ "- echos the specified line to the window";
|
105
|
122
|
}
|
106
|
123
|
|
|
@@ -113,7 +130,10 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
|
113
|
130
|
if (arg == 0) {
|
114
|
131
|
targets.add("--active");
|
115
|
132
|
targets.add("--target");
|
116
|
|
- } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--target")) {
|
|
133
|
+ targets.add("--ts");
|
|
134
|
+ } else if ((arg == 1 && context.getPreviousArgs().get(0).equals("--target"))
|
|
135
|
+ || (arg == 3 && context.getPreviousArgs().get(2).equals("--target")
|
|
136
|
+ && context.getPreviousArgs().get(0).equals("--ts"))) {
|
117
|
137
|
|
118
|
138
|
final List<FrameContainer<?>> windowList = new ArrayList<FrameContainer<?>>();
|
119
|
139
|
final Server currentServer = context.getWindow().getContainer()
|
|
@@ -135,6 +155,9 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
|
135
|
155
|
}
|
136
|
156
|
}
|
137
|
157
|
|
|
158
|
+ targets.excludeAll();
|
|
159
|
+ } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--ts")) {
|
|
160
|
+ targets.add(String.valueOf(new Date().getTime()));
|
138
|
161
|
targets.excludeAll();
|
139
|
162
|
}
|
140
|
163
|
|