From 5b61738ca9322fe419902c83a535527666c6547b Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Tue, 29 Oct 2019 15:56:19 +0000
Subject: [PATCH] skip downloaders that can't start

---
 .../core/download/DownloadManager.groovy      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy b/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
index ae1a65ac..e9ac7c76 100644
--- a/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
+++ b/core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
@@ -26,6 +26,7 @@ import com.muwire.core.UILoadedEvent
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
+import java.util.logging.Level
 
 @Log
 public class DownloadManager {
@@ -140,22 +141,25 @@ public class DownloadManager {
             if (json.pieceSizePow2 == null || json.pieceSizePow2 == 0) {
                 log.warning("Skipping $file because pieceSizePow2=$json.pieceSizePow2")
                 return // skip this download as it's corrupt anyway
-            } else
-                log.info("Loading $file because pieceSizePow2=$json.pieceSizePow2")
+            }
                 
             Pieces pieces = getPieces(infoHash, (long)json.length, json.pieceSizePow2, sequential)
 
-            log.info("Got pieces for file above $pieces.nPieces")
-            
             def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
                 infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
             if (json.paused != null)
                 downloader.paused = json.paused
-            downloaders.put(infoHash, downloader)
-            downloader.readPieces()
-            if (!downloader.paused)
-                downloader.download()
-            eventBus.publish(new DownloadStartedEvent(downloader : downloader))
+                
+            try {
+                downloader.readPieces()
+                if (!downloader.paused)
+                    downloader.download()
+                downloaders.put(infoHash, downloader)
+                eventBus.publish(new DownloadStartedEvent(downloader : downloader))
+            } catch (IllegalArgumentException bad) {
+                log.log(Level.WARNING,"cannot start downloader, skipping", bad)
+                return
+            }
         }
     }