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

canonicalize before checking if file is already shared

pull/9/head
Zlatin Balevsky 2019-06-30 17:12:25 +01:00
parent f5e1833a48
commit d830d9261f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ class DirectoryWatcher {
private static File join(Path parent, Path path) { private static File join(Path parent, Path path) {
File parentFile = parent.toFile().getCanonicalFile() File parentFile = parent.toFile().getCanonicalFile()
new File(parentFile, path.toFile().getName()) new File(parentFile, path.toFile().getName()).getCanonicalFile()
} }
private void publish() { private void publish() {

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

@ -24,7 +24,7 @@ class HasherService {
} }
void onFileSharedEvent(FileSharedEvent evt) { void onFileSharedEvent(FileSharedEvent evt) {
if (fileManager.fileToSharedFile.containsKey(evt.file)) if (fileManager.fileToSharedFile.containsKey(evt.file.getCanonicalFile()))
return return
executor.execute( { -> process(evt.file) } as Runnable) executor.execute( { -> process(evt.file) } as Runnable)
} }