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

special case mac

pull/5/head
Zlatin Balevsky 2019-06-18 05:26:41 +01:00
parent 84a9bb9482
commit 9c049b9301
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy
View File

@ -4,7 +4,7 @@ import java.nio.file.FileSystem
import java.nio.file.FileSystems import java.nio.file.FileSystems
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
import java.nio.file.StandardWatchEventKinds import static java.nio.file.StandardWatchEventKinds.*
import java.nio.file.WatchEvent import java.nio.file.WatchEvent
import java.nio.file.WatchKey import java.nio.file.WatchKey
import java.nio.file.WatchService import java.nio.file.WatchService
@ -14,12 +14,21 @@ import com.muwire.core.EventBus
import com.muwire.core.SharedFile import com.muwire.core.SharedFile
import groovy.util.logging.Log import groovy.util.logging.Log
import net.i2p.util.SystemVersion
@Log @Log
class DirectoryWatcher { class DirectoryWatcher {
private static final long WAIT_TIME = 1000 private static final long WAIT_TIME = 1000
private static final WatchEvent.Kind[] kinds
static {
if (SystemVersion.isMac())
kinds = [ENTRY_MODIFY, ENTRY_DELETE]
else
kinds = [ENTRY_CREATE, ENTRY_MODIFY, ENTRY_DELETE]
}
private final EventBus eventBus private final EventBus eventBus
private final FileManager fileManager private final FileManager fileManager
private final Thread watcherThread, publisherThread private final Thread watcherThread, publisherThread
@ -53,9 +62,7 @@ class DirectoryWatcher {
if (!e.file.isDirectory()) if (!e.file.isDirectory())
return return
Path path = e.file.getCanonicalFile().toPath() Path path = e.file.getCanonicalFile().toPath()
path.register(watchService, path.register(watchService, kinds)
StandardWatchEventKinds.ENTRY_MODIFY,
StandardWatchEventKinds.ENTRY_DELETE)
} }
@ -64,10 +71,11 @@ class DirectoryWatcher {
while(!shutdown) { while(!shutdown) {
WatchKey key = watchService.take() WatchKey key = watchService.take()
key.pollEvents().each { key.pollEvents().each {
if (it.kind() == StandardWatchEventKinds.ENTRY_MODIFY) switch(it.kind()) {
processModified(key.watchable(), it.context()) case ENTRY_CREATE: processCreated(key.watchable(), it.context()); break
if (it.kind() == StandardWatchEventKinds.ENTRY_DELETE) case ENTRY_MODIFY: processModified(key.watchable(), it.context()); break
processDeleted(key.watchable(), it.context()) case ENTRY_DELETE: processDeleted(key.watchable(), it.context()); break
}
} }
key.reset() key.reset()
} }
@ -77,14 +85,21 @@ class DirectoryWatcher {
} }
} }
private void processCreated(Path parent, Path path) {
File f= join(parent, path)
log.fine("created entry $f")
}
private void processModified(Path parent, Path path) { private void processModified(Path parent, Path path) {
File f = join(parent, path) File f = join(parent, path)
log.fine("modified entry $f")
waitingFiles.put(f, System.currentTimeMillis()) waitingFiles.put(f, System.currentTimeMillis())
} }
private void processDeleted(Path parent, Path path) { private void processDeleted(Path parent, Path path) {
File f = join(parent, path) File f = join(parent, path)
log.fine("deleted entry $f")
SharedFile sf = fileManager.fileToSharedFile.get(f) SharedFile sf = fileManager.fileToSharedFile.get(f)
if (sf != null) if (sf != null)
eventBus.publish(new FileUnsharedEvent(unsharedFile : sf)) eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
@ -103,6 +118,7 @@ class DirectoryWatcher {
def published = [] def published = []
waitingFiles.each { file, timestamp -> waitingFiles.each { file, timestamp ->
if (now - timestamp > WAIT_TIME) { if (now - timestamp > WAIT_TIME) {
log.info("publishing file $file")
eventBus.publish new FileSharedEvent(file : file) eventBus.publish new FileSharedEvent(file : file)
published << file published << file
} }