From fc2fd4a903b4b2cc8869bfc113480d1bb5d744b2 Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Mon, 22 Sep 2014 18:09:39 +0200
Subject: Adapted files to new filetransfer.

---
 .../filetransfer/FileUploadWorker.java             | 57 ++++++++++++----------
 1 file changed, 32 insertions(+), 25 deletions(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
index 61d4072..415e0df 100644
--- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
+++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
@@ -1,6 +1,7 @@
 package org.openslx.satellitedaemon.filetransfer;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
@@ -51,32 +52,38 @@ public class FileUploadWorker implements Runnable
 
 				// creating the uploader with the "context"-item.
 				Uploader u;
-				u = new Uploader( Globals.getMasterserverHost(),
-						upInfos.port, Globals.getMasterServerSslContext() );
-				// Necessary authentication before upload.
-				u.sendToken( upInfos.token );
-
-				log.info( "upInfos.getMissingBlocks().size() = "
-						+ upInfos.getMissingBlocks().size() );
-				long fileSize = new File( image.path ).length();
-
-				// continue sending Blocks until getMissingBlocks is empty.
-				while ( !upInfos.getMissingBlocks().isEmpty() ) {
-					List<Integer> blocks = upInfos.getMissingBlocks();
-					log.info( "Anzahl angeforderter Blöcke : " + blocks.size() );
-					log.info( blocks );
-					for ( int i = 0; i < blocks.size(); i++ ) {
-						int startOffset = blocks.get( i ) * Globals.BLOCKSIZE; // TODO: long
-						int endOffset = startOffset + Globals.BLOCKSIZE;
-						if ( endOffset > fileSize )
-							endOffset = (int)fileSize; // TODO: Long
-						u.sendRange( startOffset, endOffset );
-						u.sendFile( image.path );
-						log.info( "Block number " + blocks.get( i ) + " uploaded." );
-					}
-					upInfos = ThriftConnection.getUploadInfos( imDat );
+				try {
+					u = new Uploader( Globals.getMasterserverHost(),
+							upInfos.port, Globals.getMasterServerSslContext(), upInfos.token );
+				} catch (IOException e) {
+					e.printStackTrace();
+					continue;
 				}
-				u.close();
+				// Start upload process.
+				u.upload(image.path);
+				
+				
+//				log.info( "upInfos.getMissingBlocks().size() = "
+//						+ upInfos.getMissingBlocks().size() );
+//				long fileSize = new File( image.path ).length();
+//
+//				// continue sending Blocks until getMissingBlocks is empty.
+//				while ( !upInfos.getMissingBlocks().isEmpty() ) {
+//					List<Integer> blocks = upInfos.getMissingBlocks();
+//					log.info( "Anzahl angeforderter Blöcke : " + blocks.size() );
+//					log.info( blocks );
+//					for ( int i = 0; i < blocks.size(); i++ ) {
+//						int startOffset = blocks.get( i ) * Globals.BLOCKSIZE; // TODO: long
+//						int endOffset = startOffset + Globals.BLOCKSIZE;
+//						if ( endOffset > fileSize )
+//							endOffset = (int)fileSize; // TODO: Long
+//						u.prepareSendRange( startOffset, endOffset );
+//						u.sendFile( image.path );
+//						log.info( "Block number " + blocks.get( i ) + " uploaded." );
+//					}
+//					upInfos = ThriftConnection.getUploadInfos( imDat );
+				
+				u.close(null);
 			}
 			try {
 				Thread.sleep( 1 * 60 * 1000 );
-- 
cgit v1.2.3-55-g7522