diff --git a/pom.xml b/pom.xml index 5d40b1e..2ae4636 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.immueggpain simple-streaming - 0.0.5 + 0.0.6 UTF-8 diff --git a/src/main/java/com/github/immueggpain/simplestreaming/Hash.java b/src/main/java/com/github/immueggpain/simplestreaming/Hash.java deleted file mode 100644 index 975c9ce..0000000 --- a/src/main/java/com/github/immueggpain/simplestreaming/Hash.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.immueggpain.simplestreaming; - -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.concurrent.Callable; - -import org.apache.commons.codec.digest.DigestUtils; - -import picocli.CommandLine.Command; -import picocli.CommandLine.Option; -import picocli.CommandLine.Parameters; - -@Command(description = "Calculate hash of file", name = "hash", mixinStandardHelpOptions = true, - version = Launcher.VERSTR) -public class Hash implements Callable { - - @Option(names = { "-a", "--algo" }, required = true, description = "hash algorithm") - public String algo; - - @Parameters - public Path[] files; - - @Override - public Void call() throws Exception { - for (Path file : files) { - try (InputStream is = Files.newInputStream(file)) { - String digestStr = "no algo"; - if (algo.equals("sha512")) - digestStr = DigestUtils.sha512Hex(is); - else if (algo.equals("md5")) - digestStr = DigestUtils.md5Hex(is); - System.out.println(String.format("%s %s", digestStr, file.toString())); - } - } - return null; - } - -} diff --git a/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java b/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java index a034a32..2c6d868 100644 --- a/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java +++ b/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java @@ -7,10 +7,11 @@ import picocli.CommandLine.HelpCommand; @Command(description = "Streaming with OBS", name = "simple-streaming", mixinStandardHelpOptions = true, - version = Launcher.VERSTR, subcommands = { HelpCommand.class, StreamServer.class, Serve.class }) + version = Launcher.VERSTR, + subcommands = { HelpCommand.class, StreamUpload.class, StreamServer.class, Serve.class }) public class Launcher implements Callable { - public static final String VERSTR = "0.0.5"; + public static final String VERSTR = "0.0.6"; public static final int LOCAL_PORT = 2233; public static final int LOCAL_OVPN_PORT = 1194; public static final int BUFLEN = 1024 * 16; diff --git a/src/main/java/com/github/immueggpain/simplestreaming/StreamDownloader.java b/src/main/java/com/github/immueggpain/simplestreaming/StreamDownloader.java index 36ccaa2..18a6382 100644 --- a/src/main/java/com/github/immueggpain/simplestreaming/StreamDownloader.java +++ b/src/main/java/com/github/immueggpain/simplestreaming/StreamDownloader.java @@ -4,7 +4,8 @@ import picocli.CommandLine.Command; import picocli.CommandLine.Option; -@Command(description = "Start uploader", name = "upload", mixinStandardHelpOptions = true, version = Launcher.VERSTR) +@Command(description = "Start downloader", name = "download", mixinStandardHelpOptions = true, + version = Launcher.VERSTR) public class StreamDownloader implements Callable { @Option(names = { "-p", "--port" }, required = true, description = "server's port") diff --git a/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java b/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java index 9beae0b..51ed605 100644 --- a/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java +++ b/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java @@ -54,11 +54,9 @@ public Void call() throws Exception { private static long copyLarge(final RandomAccessFile input, final OutputStream output, final byte[] buffer) throws IOException { - long count = 0; int n; while (-1 != (n = input.read(buffer))) { output.write(buffer, 0, n); - count += n; } return input.getFilePointer(); }