From 327acecace45d0490b68c7d12eb8e3b18ead7fce Mon Sep 17 00:00:00 2001
From: Immueggpain <Immueggpain@users.noreply.github.com>
Date: Sun, 29 Dec 2019 02:22:12 +0800
Subject: [PATCH] 0.0.7

---
 pom.xml                                       |  2 +-
 .../immueggpain/simplestreaming/Launcher.java |  2 +-
 .../simplestreaming/StreamServer.java         | 25 +++++++++++--------
 .../simplestreaming/StreamUpload.java         |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ae4636..a086ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.github.immueggpain</groupId>
 	<artifactId>simple-streaming</artifactId>
-	<version>0.0.6</version>
+	<version>0.0.7</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java b/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java
index 2c6d868..0561d2f 100644
--- a/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java
+++ b/src/main/java/com/github/immueggpain/simplestreaming/Launcher.java
@@ -11,7 +11,7 @@
 		subcommands = { HelpCommand.class, StreamUpload.class, StreamServer.class, Serve.class })
 public class Launcher implements Callable<Void> {
 
-	public static final String VERSTR = "0.0.6";
+	public static final String VERSTR = "0.0.7";
 	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/StreamServer.java b/src/main/java/com/github/immueggpain/simplestreaming/StreamServer.java
index bff5d77..d0a1d66 100644
--- a/src/main/java/com/github/immueggpain/simplestreaming/StreamServer.java
+++ b/src/main/java/com/github/immueggpain/simplestreaming/StreamServer.java
@@ -125,20 +125,23 @@ private void upload_thread(Socket socket) {
 			InputStream is = socket.getInputStream();
 			byte[] buf = new byte[Launcher.BUFLEN];
 
-			int len = is.read(buf);
-			if (len == -1)
-				return;
-
-			synchronized (activeDownloaders) {
-				for (Downloader downloader : activeDownloaders.values()) {
-					if (downloader.buflen == 0) {
-						System.arraycopy(buf, 0, downloader.buf, 0, len);
-						downloader.buflen = len;
+			while (true) {
+				int len = is.read(buf);
+				if (len == -1)
+					return;
+
+				synchronized (activeDownloaders) {
+					for (Downloader downloader : activeDownloaders.values()) {
+						if (downloader.buflen == 0) {
+							System.arraycopy(buf, 0, downloader.buf, 0, len);
+							downloader.buflen = len;
+							System.out.println("copied");
+						} else {
+							System.out.println("skiped");
+						}
 					}
 				}
 			}
-
-			socket.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java b/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java
index 51ed605..430a0e2 100644
--- a/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java
+++ b/src/main/java/com/github/immueggpain/simplestreaming/StreamUpload.java
@@ -57,6 +57,7 @@ private static long copyLarge(final RandomAccessFile input, final OutputStream o
 		int n;
 		while (-1 != (n = input.read(buffer))) {
 			output.write(buffer, 0, n);
+			System.out.println("sent " + n);
 		}
 		return input.getFilePointer();
 	}