fix piece count calculation

cli/src/main/groovy/com/muwire/cli/Cli.groovy

@@ -35,7 +35,7 @@ class Cli {
         
         Core core 
         try {
-            core = new Core(props, home, "0.3.6")
+            core = new Core(props, home, "0.3.8")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

cli/src/main/groovy/com/muwire/cli/CliDownloader.groovy

@@ -53,7 +53,7 @@ class CliDownloader {
 
         Core core
         try {
-            core = new Core(props, home, "0.3.6")
+            core = new Core(props, home, "0.3.8")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

core/src/main/groovy/com/muwire/core/Core.groovy

@@ -297,7 +297,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.3.6")
+        Core core = new Core(props, home, "0.3.8")
         core.startServices()
         
         // ... at the end, sleep or execute script

core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy

@@ -75,7 +75,7 @@ class DownloadSession {
         if (available.isEmpty())
             piece = pieces.claim()
         else
-            piece = pieces.claim(available)
+            piece = pieces.claim(new HashSet<>(available))
         if (piece == -1)
             return false
         boolean unclaim = true

core/src/main/groovy/com/muwire/core/download/Downloader.groovy

@@ -18,6 +18,7 @@ import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
+import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
@@ -269,7 +270,7 @@ public class Downloader {
                     writePieces()
                 }
             } catch (Exception bad) {
-                log.log(Level.WARNING,"Exception while downloading",bad)
+                log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
             } finally {
                 currentState = WorkerState.FINISHED
                 if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {

core/src/main/groovy/com/muwire/core/mesh/MeshManager.groovy

@@ -1,5 +1,6 @@
 package com.muwire.core.mesh
 
+import java.util.logging.Level
 import java.util.stream.Collectors
 
 import com.muwire.core.Constants
@@ -8,11 +9,14 @@ import com.muwire.core.Persona
 import com.muwire.core.download.Pieces
 import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.files.FileManager
+import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
+import groovy.util.logging.Log
 import net.i2p.data.Base64
 
+@Log
 class MeshManager {
     
     private static final int EXPIRATION = 60 * 60 * 1000
@@ -35,6 +39,7 @@ class MeshManager {
         synchronized(meshes) {
             if (meshes.containsKey(infoHash))
                 return meshes.get(infoHash)
+            log.log(Level.INFO,"creating mesh with pieces:$nPieces", new Exception())
             Pieces pieces = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
             if (fileManager.rootToFiles.containsKey(infoHash)) {
                 for (int i = 0; i < nPieces; i++)
@@ -50,8 +55,8 @@ class MeshManager {
         Mesh mesh = meshes.get(e.infoHash)
         if (mesh == null)
             return
-       if (mesh.sources.add(e.source))
+       mesh.sources.add(e.source)
-            save()
+       save()
     }
     
     private void save() {
@@ -64,6 +69,7 @@ class MeshManager {
                     json.infoHash = Base64.encode(mesh.infoHash.getRoot())
                     json.sources = mesh.sources.stream().map({it.toBase64()}).collect(Collectors.toList())
                     json.nPieces = mesh.pieces.nPieces
+                    json.xHave = DataUtil.encodeXHave(mesh.pieces.downloaded, mesh.pieces.nPieces)
                     writer.println(JsonOutput.toJson(json))
                 }
             }
@@ -89,6 +95,9 @@ class MeshManager {
                 mesh.sources.add(persona)
             }
             
+            if (json.xHave != null) 
+                DataUtil.decodeXHave(json.xHave).each { pieces.markDownloaded(it) }
+                
             if (!mesh.sources.isEmpty())
                 meshes.put(infoHash, mesh)
         }

core/src/main/groovy/com/muwire/core/upload/ContentUploader.groovy

@@ -12,8 +12,10 @@ import com.muwire.core.connection.Endpoint
 import com.muwire.core.mesh.Mesh
 import com.muwire.core.util.DataUtil
 
+import groovy.util.logging.Log
 import net.i2p.data.Destination
 
+@Log
 class ContentUploader extends Uploader {
     
     private final File file
@@ -42,8 +44,10 @@ class ContentUploader extends Uploader {
             int endPiece = range.end / (0x1 << pieceSize)
             for (int i = startPiece; i <= endPiece; i++)
                 satisfiable &= mesh.pieces.isDownloaded(i)
+            log.info("requested range $range.start-$range.end startPiece:$startPiece endPiece:$endPiece satisfiable:$satisfiable my pieces: ${mesh.pieces.getDownloaded()}")
         }
         if (!satisfiable) {
+            log.info("416 range not satisfiable")
             os.write("416 Range Not Satisfiable\r\n".getBytes(StandardCharsets.US_ASCII))
             writeMesh(request.downloader)
             os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
@@ -51,6 +55,8 @@ class ContentUploader extends Uploader {
             return
         }
 
+        log.info("200 ok")
+        
         os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
         os.write("Content-Range: $range.start-$range.end\r\n".getBytes(StandardCharsets.US_ASCII))
         writeMesh(request.downloader)

core/src/main/groovy/com/muwire/core/util/DataUtil.groovy

@@ -109,4 +109,10 @@ class DataUtil {
         }
         available
     }
+    
+    public static Exception findRoot(Exception e) {
+        while(e.getCause() != null)
+            e = e.getCause()
+        e
+    }
 }

core/src/main/java/com/muwire/core/SharedFile.java

@@ -30,7 +30,7 @@ public class SharedFile {
 	    long length = file.length();
 	    int rawPieceSize = 0x1 << pieceSize;
 	    int rv = (int) (length / rawPieceSize);
-	    if (length % pieceSize != 0)
+	    if (length % rawPieceSize != 0)
 	        rv++;
 	    return rv;
 	}

gradle.properties

@@ -1,5 +1,5 @@
 group         = com.muwire
-version       = 0.3.6
+version       = 0.3.8
 groovyVersion = 2.4.15
 slf4jVersion  = 1.7.25
 spockVersion  = 1.1-groovy-2.4

logging/4_logging.properties

@@ -35,7 +35,7 @@ handlers= java.util.logging.FileHandler
 
 # default file output is in user's home directory.
 java.util.logging.FileHandler.pattern = MuWire.log
-java.util.logging.FileHandler.limit = 50000000
+java.util.logging.FileHandler.limit = 150000000
 java.util.logging.FileHandler.count = 1
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 
@@ -60,3 +60,5 @@ java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$
 # messages:
 com.xyz.foo.level = SEVERE
 com.muwire.core.level = FINE
+net.i2p.client.streaming.impl.level = FINE
+net.i2p.client.impl.level = FINE