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

Only persist downloaded files if sharing thereof is enabled 

Otherwise we might inadvertently share downloads
pull/37/head
LoveIsGrief 2020-01-25 15:25:48 +01:00
parent aa56cc23c0
commit a891c83518
No known key found for this signature in database
GPG Key ID: E96D1EDFA05345EB
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ public class Core {
eventBus.register(UILoadedEvent.class, persisterService) eventBus.register(UILoadedEvent.class, persisterService)
log.info "initializing folder persistence service" log.info "initializing folder persistence service"
persisterFolderService = new PersisterFolderService(new File(home, "files"), eventBus) persisterFolderService = new PersisterFolderService(this, new File(home, "files"), eventBus)
eventBus.register(PersisterDoneEvent.class, persisterFolderService) eventBus.register(PersisterDoneEvent.class, persisterFolderService)
eventBus.register(FileDownloadedEvent.class, persisterFolderService) eventBus.register(FileDownloadedEvent.class, persisterFolderService)
eventBus.register(FileLoadedEvent.class, persisterFolderService) eventBus.register(FileLoadedEvent.class, persisterFolderService)

6
core/src/main/groovy/com/muwire/core/files/PersisterFolderService.groovy
View File

@ -28,6 +28,7 @@ class PersisterFolderService extends BasePersisterService {
final static int CUT_LENGTH = 6 final static int CUT_LENGTH = 6
private final Core core;
final File location final File location
final EventBus listener final EventBus listener
final int interval final int interval
@ -36,7 +37,8 @@ class PersisterFolderService extends BasePersisterService {
new Thread(r, "file persister") new Thread(r, "file persister")
} as ThreadFactory) } as ThreadFactory)
PersisterFolderService(File location, EventBus listener) { PersisterFolderService(Core core, File location, EventBus listener) {
this.core = core;
this.location = location this.location = location
this.listener = listener this.listener = listener
this.interval = interval this.interval = interval
@ -58,8 +60,10 @@ class PersisterFolderService extends BasePersisterService {
} }
void onFileDownloadedEvent(FileDownloadedEvent downloadedEvent) { void onFileDownloadedEvent(FileDownloadedEvent downloadedEvent) {
if (core.getMuOptions().getShareDownloadedFiles()) {
persistFile(downloadedEvent.downloadedFile) persistFile(downloadedEvent.downloadedFile)
} }
}
/** /**
* Get rid of the json of unshared files * Get rid of the json of unshared files