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

restore behavior where watched directories get scanned on startup

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-11-02 00:27:12 +00:00
parent 0dae0a561b
commit 094b9ac2b0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/groovy/com/muwire/core/files/HasherService.groovy
View File

@@ -34,6 +34,8 @@ class HasherService {
return return
if (fileManager.fileToSharedFile.containsKey(canonical)) if (fileManager.fileToSharedFile.containsKey(canonical))
return return
if (fileManager.negativeTree.fileToNode.containsKey(canonical))
return
if (canonical.getName().endsWith(".mwcomment") && canonical.length() <= Constants.MAX_COMMENT_LENGTH) if (canonical.getName().endsWith(".mwcomment") && canonical.length() <= Constants.MAX_COMMENT_LENGTH)
eventBus.publish(new SideCarFileEvent(file : canonical)) eventBus.publish(new SideCarFileEvent(file : canonical))
else if (hashed.add(canonical)) else if (hashed.add(canonical))

2
gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
View File

@@ -255,7 +255,7 @@ class MainFrameModel {
void onAllFilesLoadedEvent(AllFilesLoadedEvent e) { void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
runInsideUIAsync { runInsideUIAsync {
core.muOptions.watchedDirectories.each { core.eventBus.publish(new DirectoryWatchedEvent(directory : new File(it))) } core.muOptions.watchedDirectories.each { core.eventBus.publish(new FileSharedEvent(file : new File(it))) }
core.muOptions.trustSubscriptions.each { core.muOptions.trustSubscriptions.each {
core.eventBus.publish(new TrustSubscriptionEvent(persona : it, subscribe : true)) core.eventBus.publish(new TrustSubscriptionEvent(persona : it, subscribe : true))