Changes to chunk list related classes, support hash handling better

1 files changed, 45 insertions, 24 deletions

diff --git a/src/main/java/org/openslx/filetransfer/util/FileChunk.java b/src/main/java/org/openslx/filetransfer/util/FileChunk.java
index 3ec6468..0204e00 100644
--- a/src/main/java/org/openslx/filetransfer/util/FileChunk.java
+++ b/src/main/java/org/openslx/filetransfer/util/FileChunk.java
@@ -1,7 +1,7 @@
 package org.openslx.filetransfer.util;
 
-import java.nio.ByteBuffer;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 
 import org.openslx.filetransfer.FileRange;
@@ -9,17 +9,33 @@ import org.openslx.filetransfer.FileRange;
 public class FileChunk
 {
 
+	public static final int SHA1_LENGTH = 20;
 	public static final int CHUNK_SIZE_MIB = 16;
 	public static final int CHUNK_SIZE = CHUNK_SIZE_MIB * ( 1024 * 1024 );
 
 	public final FileRange range;
-	public final byte[] sha1sum;
 	private int failCount = 0;
+	protected byte[] sha1sum;
+	protected ChunkStatus status = ChunkStatus.MISSING;
 
 	public FileChunk( long startOffset, long endOffset, byte[] sha1sum )
 	{
 		this.range = new FileRange( startOffset, endOffset );
+		if ( sha1sum == null || sha1sum.length != SHA1_LENGTH ) {
+			this.sha1sum = null;
+		} else {
+			this.sha1sum = sha1sum;
+		}
+	}
+
+	public synchronized void setSha1Sum( byte[] sha1sum )
+	{
+		if ( this.sha1sum != null || sha1sum == null || sha1sum.length != SHA1_LENGTH )
+			return;
 		this.sha1sum = sha1sum;
+		if ( this.status == ChunkStatus.COMPETE ) {
+			this.status = ChunkStatus.HASHING;
+		}
 	}
 
 	/**
@@ -44,6 +60,23 @@ public class FileChunk
 		return "[Chunk " + getChunkIndex() + " (" + range.startOffset + "-" + range.endOffset + "), fails: " + failCount + "]";
 	}
 
+	public synchronized byte[] getSha1Sum()
+	{
+		return sha1sum;
+	}
+
+	public synchronized ChunkStatus getStatus()
+	{
+		return status;
+	}
+
+	protected synchronized void setStatus( ChunkStatus status )
+	{
+		if ( status != null ) {
+			this.status = status;
+		}
+	}
+
 	//
 
 	public static int fileSizeToChunkCount( long fileSize )
@@ -51,39 +84,27 @@ public class FileChunk
 		return (int) ( ( fileSize + CHUNK_SIZE - 1 ) / CHUNK_SIZE );
 	}
 
-	public static void createChunkList( Collection<FileChunk> list, long fileSize, List<ByteBuffer> sha1Sums )
+	public static void createChunkList( Collection<FileChunk> list, long fileSize, List<byte[]> sha1Sums )
 	{
 		if ( fileSize < 0 )
 			throw new IllegalArgumentException( "fileSize cannot be negative" );
 		if ( !list.isEmpty() )
 			throw new IllegalArgumentException( "Passed list is not empty" );
-		long chunkCount = fileSizeToChunkCount( fileSize );
+		long offset = 0;
+		Iterator<byte[]> hashIt = null;
 		if ( sha1Sums != null ) {
-			if ( sha1Sums.size() != chunkCount )
-				throw new IllegalArgumentException(
-						"Passed a sha1sum list, but hash count in list doesn't match expected chunk count" );
-			long offset = 0;
-			for ( ByteBuffer sha1sum : sha1Sums ) { // Do this as we don't know how efficient List.get(index) is...
-				long end = offset + CHUNK_SIZE;
-				if ( end > fileSize )
-					end = fileSize;
-				list.add( new FileChunk( offset, end, sha1sum.array() ) );
-				offset = end;
-			}
-			return;
+			hashIt = sha1Sums.iterator();
 		}
-		long offset = 0;
-		while ( offset < fileSize ) { // ...otherwise we could share this code
+		while ( offset < fileSize ) {
 			long end = offset + CHUNK_SIZE;
 			if ( end > fileSize )
 				end = fileSize;
-			list.add( new FileChunk( offset, end, null ) );
+			byte[] hash = null;
+			if ( hashIt != null && hashIt.hasNext() ) {
+				hash = hashIt.next();
+			}
+			list.add( new FileChunk( offset, end, hash ) );
 			offset = end;
 		}
 	}
-
-	public boolean hasSha1Sum()
-	{
-		return sha1sum != null && sha1sum.length == 20;
-	}
 }