diff options
author | Nils Schwabe | 2014-07-11 16:01:35 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-07-11 16:01:35 +0200 |
commit | 0891a6042dd90d83bbc31e5983736b60276711c9 (patch) | |
tree | 1e8387101ff683a62c67effd5cd100006d29c611 /src/main | |
parent | Move checking of incoming block into while loop (where it belongs) (diff) | |
download | masterserver-0891a6042dd90d83bbc31e5983736b60276711c9.tar.gz masterserver-0891a6042dd90d83bbc31e5983736b60276711c9.tar.xz masterserver-0891a6042dd90d83bbc31e5983736b60276711c9.zip |
Add download mode
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java index f89e028..6fab572 100644 --- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java +++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java @@ -1,6 +1,5 @@ package org.openslx.imagemaster.serverconnection; -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -133,15 +132,13 @@ public class ConnectionHandler implements IncomingEvent return; } - List<Integer> list = connections.get( token ).client.getLastRequestedBlocks( token ); - // TODO: check which range needs to be sent and send this range - // logik von michael + List<Integer> blocks = connections.get( token ).client.getLastRequestedBlocks( token ); + for ( Integer block : blocks ) { + uploader.sendRange( block*Globals.blockSize, (block+1)*Globals.blockSize - 1 ); + uploader.sendFile( connections.get( token ).filepath ); + uploader.close(); + } - long length = ( new File( connections.get( token ).filepath ) ).length(); - - uploader.sendRange( 0, (int)length ); - uploader.sendFile( connections.get( token ).filepath ); - uploader.close(); } /** @@ -188,7 +185,5 @@ public class ConnectionHandler implements IncomingEvent } } downloader.close(); - - } } |