From 0891a6042dd90d83bbc31e5983736b60276711c9 Mon Sep 17 00:00:00 2001 From: Nils Schwabe Date: Fri, 11 Jul 2014 16:01:35 +0200 Subject: Add download mode --- .../imagemaster/serverconnection/ConnectionHandler.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src') 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 list = connections.get( token ).client.getLastRequestedBlocks( token ); - // TODO: check which range needs to be sent and send this range - // logik von michael + List 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(); - - } } -- cgit v1.2.3-55-g7522