Add implementation for the new up- and download protocoll

Remove some old stuff that is not needed anymore
Fix some small bugs

1 files changed, 5 insertions, 10 deletions

diff --git a/src/main/java/org/openslx/imagemaster/crcchecker/CRCChecker.java b/src/main/java/org/openslx/imagemaster/crcchecker/CRCChecker.java
index 04f6a22..29b7090 100644
--- a/src/main/java/org/openslx/imagemaster/crcchecker/CRCChecker.java
+++ b/src/main/java/org/openslx/imagemaster/crcchecker/CRCChecker.java
@@ -1,14 +1,12 @@
 package org.openslx.imagemaster.crcchecker;
 
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.CRC32;
 
 import org.apache.log4j.Logger;
+import org.openslx.imagemaster.Globals;
 
 
 public class CRCChecker
@@ -27,9 +25,7 @@ public class CRCChecker
 	{
 		List<Integer> result = new LinkedList<>();
 		
-		final int blockSize = 16 * 1024 * 1024;
-		
-		ImageFile image = new ImageFile( imageFile, blockSize );
+		ImageFile image = new ImageFile( imageFile, Globals.blockSize );
 		CRCFile crc = new CRCFile( crcFile );
 		
 		log.debug( "Checking image file: '" + imageFile + "' with crc file: '" + crcFile + "'");
@@ -40,7 +36,7 @@ public class CRCChecker
 		}
 		
 		// file is smaller than one block - no need to check crc yet
-		if (image.length() < blockSize) {
+		if (image.length() < Globals.blockSize) {
 			return result;
 		}
 		// check all blocks
@@ -60,16 +56,15 @@ public class CRCChecker
 			CRC32 crcCalc = new CRC32();
 			crcCalc.update( block );
 			int crcSum = Integer.reverseBytes( (int) crcCalc.getValue() );
-			log.debug( "Got crc for block '" + blockN + "': '" + crcSum + "'" );
 			int crcSumFromFile;
 			try {
 				crcSumFromFile = crc.getCRCSum( blockN );
 			} catch ( IOException e ) {
 				throw new IOException( "Could not read CRC file", e );
 			}
-			log.debug( "And read crc from file: '" + crcSumFromFile + "'" );
 			
-			if (crcSum ==  crcSumFromFile) result.add( blockN );
+			if (crcSum == crcSumFromFile) result.add( blockN );
+			else log.debug(blockN + " was invalid");
 		}
 		
 		return result;