Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-06 15:20:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor SCP arguments

Browse Source
This commit is contained in:
lguerin
2015-08-13 14:44:45 +02:00
parent 84990ada08
commit d18e9d9961
3 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/schmizz/sshj/xfer/scp/SCPDownloadClient.java
View File

@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static net.schmizz.sshj.xfer.scp.SCPEngine.SCPArgument;
import static net.schmizz.sshj.xfer.scp.SCPEngine.SCPArguments;
/** Support for uploading files over a connected link using SCP. */
@@ -63,7 +64,7 @@ public final class SCPDownloadClient extends AbstractSCPClient {
void startCopy(String sourcePath, LocalDestFile targetFile)
throws IOException {
List<Arg> args = SCPArguments.with(Arg.SOURCE)
List<SCPArgument> args = SCPArguments.with(Arg.SOURCE)
.and(Arg.QUIET)
.and(Arg.PRESERVE_TIMES)
.and(Arg.RECURSIVE, recursiveMode)

94
src/main/java/net/schmizz/sshj/xfer/scp/SCPEngine.java
View File

@@ -41,30 +41,17 @@ class SCPEngine {
VERBOSE('v'),
PRESERVE_TIMES('p'),
QUIET('q'),
LIMIT('l', "");
LIMIT('l');
private final char a;
private String v;
private Arg(char a) {
this.a = a;
}
private Arg(char a, String v) {
this.a = a;
this.v = v;
}
public void setValue(String v) {
this.v = v;
}
@Override
public String toString() {
String arg = "-" + a;
if (v != null && v.length() > 0) {
arg = arg + v;
}
return arg;
return "-" + a;
}
}
@@ -112,10 +99,10 @@ class SCPEngine {
exitStatus = -1;
}
void execSCPWith(List<Arg> args, String path)
void execSCPWith(List<SCPArgument> args, String path)
throws SSHException {
final StringBuilder cmd = new StringBuilder(SCP_COMMAND);
for (Arg arg : args) {
for (SCPArgument arg : args) {
cmd.append(" ").append(arg);
}
cmd.append(" ");
@@ -201,62 +188,83 @@ class SCPEngine {
return listener;
}
public static class SCPArguments {
public static class SCPArgument {
private static List<Arg> args = null;
private Arg name;
private String value;
private SCPArguments() {
this.args = new LinkedList<Arg>();
private SCPArgument(Arg name, String value) {
this.name = name;
this.value = value;
}
private static void addArg(Arg arg, String value, boolean accept) {
public static SCPArgument addArgument(Arg name, String value) {
return new SCPArgument(name, value);
}
@Override
public String toString() {
String option = name.toString();
if (value != null) {
option = option + value;
}
return option;
}
}
public static class SCPArguments {
private static List<SCPArgument> args = null;
private SCPArguments() {
this.args = new LinkedList<SCPArgument>();
}
private static void addArgument(Arg name, String value, boolean accept) {
if (accept) {
if (null != value && value.length() > 0) {
arg.setValue(value);
}
args.add(arg);
args.add(SCPArgument.addArgument(name, value));
}
}
public static SCPArguments with(Arg arg) {
return with(arg, null, true);
public static SCPArguments with(Arg name) {
return with(name, null, true);
}
public static SCPArguments with(Arg arg, String value) {
return with(arg, value, true);
public static SCPArguments with(Arg name, String value) {
return with(name, value, true);
}
public static SCPArguments with(Arg arg, boolean accept) {
return with(arg, null, accept);
public static SCPArguments with(Arg name, boolean accept) {
return with(name, null, accept);
}
public static SCPArguments with(Arg arg, String value, boolean accept) {
public static SCPArguments with(Arg name, String value, boolean accept) {
SCPArguments scpArguments = new SCPArguments();
addArg(arg, value, accept);
addArgument(name, value, accept);
return scpArguments;
}
public SCPArguments and(Arg arg) {
addArg(arg, null, true);
public SCPArguments and(Arg name) {
addArgument(name, null, true);
return this;
}
public SCPArguments and(Arg arg, String value) {
addArg(arg, value, true);
public SCPArguments and(Arg name, String value) {
addArgument(name, value, true);
return this;
}
public SCPArguments and(Arg arg, boolean accept) {
addArg(arg, null, accept);
public SCPArguments and(Arg name, boolean accept) {
addArgument(name, null, accept);
return this;
}
public SCPArguments and(Arg arg, String value, boolean accept) {
addArg(arg, value, accept);
public SCPArguments and(Arg name, String value, boolean accept) {
addArgument(name, value, accept);
return this;
}
public List<Arg> arguments() {
public List<SCPArgument> arguments() {
return args;
}
}

3
src/main/java/net/schmizz/sshj/xfer/scp/SCPUploadClient.java
View File

@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import static net.schmizz.sshj.xfer.scp.SCPEngine.SCPArgument;
import static net.schmizz.sshj.xfer.scp.SCPEngine.SCPArguments;
/** Support for uploading files over a connected link using SCP. */
@@ -59,7 +60,7 @@ public final class SCPUploadClient extends AbstractSCPClient {
private synchronized void startCopy(LocalSourceFile sourceFile, String targetPath)
throws IOException {
List<Arg> args = SCPArguments.with(Arg.SINK)
List<SCPArgument> args = SCPArguments.with(Arg.SINK)
.and(Arg.RECURSIVE)
.and(Arg.PRESERVE_TIMES, sourceFile.providesAtimeMtime())
.and(Arg.LIMIT, String.valueOf(bandwidthLimit), (bandwidthLimit > 0))