zzz/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip downloaders that can't start

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-10-29 15:56:19 +00:00
parent c77d79513e
commit 5b61738ca9
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy
View File

@ -26,6 +26,7 @@ import com.muwire.core.UILoadedEvent
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executor import java.util.concurrent.Executor
import java.util.concurrent.Executors import java.util.concurrent.Executors
import java.util.logging.Level
@Log @Log
public class DownloadManager { public class DownloadManager {
@ -140,22 +141,25 @@ public class DownloadManager {
if (json.pieceSizePow2 == null || json.pieceSizePow2 == 0) { if (json.pieceSizePow2 == null || json.pieceSizePow2 == 0) {
log.warning("Skipping $file because pieceSizePow2=$json.pieceSizePow2") log.warning("Skipping $file because pieceSizePow2=$json.pieceSizePow2")
return // skip this download as it's corrupt anyway 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) 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, def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces) infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
if (json.paused != null) if (json.paused != null)
downloader.paused = json.paused downloader.paused = json.paused
downloaders.put(infoHash, downloader)
downloader.readPieces() try {
if (!downloader.paused) downloader.readPieces()
downloader.download() if (!downloader.paused)
eventBus.publish(new DownloadStartedEvent(downloader : downloader)) 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
}
} }
} }