goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serialize downloads that do not have a hashlist

pull/5/head
Zlatin Balevsky 2019-06-12 22:22:20 +01:00
parent e389090b7e
commit 658d9cf5a8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,8 +89,14 @@ public class DownloadManager {
json.destinations.each { destination -> json.destinations.each { destination ->
destinations.add new Destination(destination) destinations.add new Destination(destination)
} }
byte[] hashList = Base64.decode(json.hashList) InfoHash infoHash
InfoHash infoHash = InfoHash.fromHashList(hashList) if (json.hashList != null) {
byte[] hashList = Base64.decode(json.hashList)
infoHash = InfoHash.fromHashList(hashList)
} else {
byte [] root = Base64.decode(json.hashRoot)
infoHash = new InfoHash(root)
}
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) infoHash, json.pieceSizePow2, connector, destinations, incompletes)
downloader.download() downloader.download()
@ -107,7 +113,7 @@ public class DownloadManager {
File downloadsFile = new File(home,"downloads.json") File downloadsFile = new File(home,"downloads.json")
downloadsFile.withPrintWriter { writer -> downloadsFile.withPrintWriter { writer ->
downloaders.each { downloader -> downloaders.each { downloader ->
if (!downloader.cancelled && downloader.infoHash.hashList != null) { if (!downloader.cancelled) {
def json = [:] def json = [:]
json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath())) json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
json.length = downloader.length json.length = downloader.length
@ -118,8 +124,10 @@ public class DownloadManager {
} }
json.destinations = destinations json.destinations = destinations
json.hashList = Base64.encode(downloader.infoHash.hashList) if (downloader.infoHash.hashList != null)
json.hashList = Base64.encode(downloader.infoHash.hashList)
else
json.hashRoot = Base64.encode(downloader.infoHash.getRoot())
writer.println(JsonOutput.toJson(json)) writer.println(JsonOutput.toJson(json))
} }
} }