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

persist pause state

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-06-23 07:48:49 +01:00
parent bd12a1de3d
commit 2de18227c1
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/groovy/com/muwire/core/Core.groovy
View File

@@ -16,6 +16,7 @@ import com.muwire.core.download.DownloadManager
import com.muwire.core.download.SourceDiscoveredEvent
import com.muwire.core.download.UIDownloadCancelledEvent
import com.muwire.core.download.UIDownloadEvent
import com.muwire.core.download.UIDownloadPausedEvent
import com.muwire.core.files.FileDownloadedEvent
import com.muwire.core.files.FileHashedEvent
import com.muwire.core.files.FileHasher
@@ -217,7 +218,8 @@ public class Core {
eventBus.register(FileDownloadedEvent.class, downloadManager)
eventBus.register(UIDownloadCancelledEvent.class, downloadManager)
eventBus.register(SourceDiscoveredEvent.class, downloadManager)
eventBus.register(UIDownloadPausedEvent.class, downloadManager)
log.info("initializing upload manager")
UploadManager uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager)

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

@@ -90,6 +90,10 @@ public class DownloadManager {
persistDownloaders()
}
public void onUIDownloadPausedEvent(UIDownloadPausedEvent e) {
persistDownloaders()
}
void resume(Downloader downloader) {
executor.execute({downloader.download() as Runnable})
}
@@ -119,7 +123,10 @@ public class DownloadManager {
def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
downloaders.put(infoHash, downloader)
if (json.paused != null)
downloader.paused = json.paused
if (!downloader.paused)
downloaders.put(infoHash, downloader)
downloader.download()
eventBus.publish(new DownloadStartedEvent(downloader : downloader))
}
@@ -174,6 +181,8 @@ public class DownloadManager {
json.hashList = Base64.encode(infoHash.hashList)
else
json.hashRoot = Base64.encode(infoHash.getRoot())
json.paused = downloader.paused
writer.println(JsonOutput.toJson(json))
}
}

6
core/src/main/groovy/com/muwire/core/download/UIDownloadPausedEvent.groovy Normal file
View File

@@ -0,0 +1,6 @@
package com.muwire.core.download
import com.muwire.core.Event
class UIDownloadPausedEvent extends Event {
}

2
gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
View File

@@ -17,6 +17,7 @@ import com.muwire.core.Core
import com.muwire.core.download.DownloadStartedEvent
import com.muwire.core.download.UIDownloadCancelledEvent
import com.muwire.core.download.UIDownloadEvent
import com.muwire.core.download.UIDownloadPausedEvent
import com.muwire.core.search.QueryEvent
import com.muwire.core.search.SearchEvent
import com.muwire.core.trust.TrustEvent
@@ -170,6 +171,7 @@ class MainFrameController {
void pause() {
def downloader = model.downloads[selectedDownload()].downloader
downloader.pause()
core.eventBus.publish(new UIDownloadPausedEvent())
}
private void markTrust(String tableName, TrustLevel level, def list) {