Merge pull request #360 from joelwilson/master

DropSnorz · web-flow · commit cb6d75b15c7f · 2025-09-01T23:35:29.000+02:00
take alias files into account by ignoring them
diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/tasks/FileSyncTask.java b/owlplug-client/src/main/java/com/owlplug/plugin/tasks/FileSyncTask.java
@@ -107,9 +107,10 @@ public long extractFolderSize(File directory, FileStat parent) {
         directoryStat.getChilds().add(fileStat);
         length += fileStat.getLength();
 
-      } else {
+      } else if (file.isDirectory()) {
         length += extractFolderSize(file, directoryStat);
       }
+      // else it's probably a mac finder alias. Ignore it.
     }
 
     directoryStat.setLength(length);

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,10 @@ public long extractFolderSize(File directory, FileStat parent) {`
`107`	`107`	`directoryStat.getChilds().add(fileStat);`
`108`	`108`	`length += fileStat.getLength();`
`109`	`109`
`110`		`- } else {`
	`110`	`+ } else if (file.isDirectory()) {`
`111`	`111`	`length += extractFolderSize(file, directoryStat);`
`112`	`112`	`}`
	`113`	`+ // else it's probably a mac finder alias. Ignore it.`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`directoryStat.setLength(length);`