diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java index 415e0df..aec589a 100644 --- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java @@ -41,6 +41,7 @@ public class FileUploadWorker implements Runnable true, false, "best", "theVeryBest", image.fileSize ); String crcPath = image.path.concat( ".crc" ); + // ThriftConnection.getUploadInfos returns uploadInfo and handles ThriftAuthentication UploadInfos upInfos = ThriftConnection.getUploadInfos( imDat, crcPath ); if ( upInfos == null ) { @@ -59,30 +60,9 @@ public class FileUploadWorker implements Runnable e.printStackTrace(); continue; } + // 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 { |