Browse Source

Finished feature: Fuse on Win

Bumped required version of fuse-nio-adapter to 1.2.4
Added comments
Changed log messages to be more descriptive
JaniruTEC 4 years ago
parent
commit
598bec3050

+ 10 - 3
main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java

@@ -69,13 +69,20 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 		try {
 			switch (caller.getMountPointRequirement()) {
 				case PARENT_NO_MOUNT_POINT -> {
-					Files.createDirectories(mountPoint.getParent());
-					LOG.debug("Successfully created folder for mount point: {}", mountPoint);
+					//Create everything up to the parent (but not the actual mountpoint)
+					Path parent = mountPoint.getParent();
+					Files.createDirectories(parent);
+
+					//Get the name of the parent directory (#getFileName())
+					//or just use the parent if the name is null (that's the case if parent is the root)
+					Path parentName = parent.getFileName() != null ? parent.getFileName() : parent;
+					LOG.debug("Successfully created/checked parent folder (\"{}\") for mount point: {}", parentName, mountPoint);
 					return false;
 				}
 				case EMPTY_MOUNT_POINT -> {
+					//Create everything up to the mountpoint (including the actual mountpoint)
 					Files.createDirectories(mountPoint);
-					LOG.debug("Successfully created mount point: {}", mountPoint);
+					LOG.debug("Successfully created/checked mount point: {}", mountPoint);
 					return true;
 				}
 				case NONE -> {

+ 1 - 1
main/pom.xml

@@ -26,7 +26,7 @@
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
-		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
+		<cryptomator.fuse.version>1.2.4</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 

+ 1 - 0
main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java

@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Inject;
 
+//At the current point in time only the CustomMountPointChooser may cause this window to be shown.
 @UnlockScoped
 public class UnlockInvalidMountPointController implements FxController {