mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-19 21:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed FuseVolume to choose a DriveLetter instead of a folder

Browse Source 
Changed FuseVolume to choose a DriveLetter instead of a folder if the the mountpoint is chosen by the app.
Reworked priorities when choosing
Changed DokanyVolume to use the new methods supplied by WindowsDriveLetters
This commit is contained in:
JaniruTEC
2020-07-29 22:15:12 +02:00
parent 570482521a
commit 32a810fe1d
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+4 -6
View File
@@ -68,12 +68,10 @@ public class DokanyVolume implements Volume {
return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
} else {
//auto assign drive letter
if (!windowsDriveLetters.getAvailableDriveLetters().isEmpty()) {
return Path.of(windowsDriveLetters.getAvailableDriveLetters().iterator().next() + ":\\");
} else {
//TODO: Error Handling
throw new VolumeException("No free drive letter available.");
}
return windowsDriveLetters.getAvailableDriveLetterPath().orElseThrow(() -> {
//TODO: Error Handling/Fallback (See: FUSE)
return new VolumeException("No free drive letter available.");
});
}
}
main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+36 -11
View File
@@ -1,6 +1,7 @@
package org.cryptomator.common.vaults;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.Environment;
import org.cryptomator.common.settings.VaultSettings;
@@ -34,32 +35,56 @@ public class FuseVolume implements Volume {
private final VaultSettings vaultSettings;
private final Environment environment;
private final WindowsDriveLetters windowsDriveLetters;
private Mount fuseMnt;
private Path mountPoint;
private boolean createdTemporaryMountPoint;
@Inject
public FuseVolume(VaultSettings vaultSettings, Environment environment) {
public FuseVolume(VaultSettings vaultSettings, Environment environment, WindowsDriveLetters windowsDriveLetters) {
this.vaultSettings = vaultSettings;
this.environment = environment;
this.windowsDriveLetters = windowsDriveLetters;
}
@Override
public void mount(CryptoFileSystem fs, String mountFlags) throws IOException, FuseNotSupportedException, VolumeException {
Optional<String> optionalCustomMountPoint = vaultSettings.getCustomMountPath();
if (optionalCustomMountPoint.isPresent()) {
Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
checkProvidedMountPoint(customMountPoint);
this.mountPoint = customMountPoint;
LOG.debug("Successfully checked custom mount point: {}", mountPoint);
} else {
this.mountPoint = prepareTemporaryMountPoint();
LOG.debug("Successfully created mount point: {}", mountPoint);
}
this.mountPoint = determineMountPoint();
mount(fs.getPath("/"), mountFlags);
}
private Path determineMountPoint() throws IOException, VolumeException {
Path mountPoint;
Optional<String> optionalCustomMountPoint = vaultSettings.getCustomMountPath();
//Is there a custom mountpoint?
if (optionalCustomMountPoint.isPresent()) {
mountPoint = Paths.get(optionalCustomMountPoint.get());
checkProvidedMountPoint(mountPoint);
LOG.debug("Successfully checked custom mount point: {}", this.mountPoint);
return mountPoint;
}
//No custom mounpoint -> Are we on Windows?
if (SystemUtils.IS_OS_WINDOWS) {
//Is there a chosen Driveletter?
if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
mountPoint = Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
return mountPoint;
}
mountPoint = windowsDriveLetters.getAvailableDriveLetterPath().orElseThrow(() -> {
//TODO: Error Handling/Fallback (replace Exception with Flow to folderbased?)
return new VolumeException("No free drive letter available.");
});
return mountPoint;
}
//Nothing worked so far or we are not using Windows - Choose and prepare a folder
mountPoint = prepareTemporaryMountPoint();
LOG.debug("Successfully created mount point: {}", mountPoint);
return mountPoint;
}
private void checkProvidedMountPoint(Path mountPoint) throws IOException {
//On Windows the target folder MUST NOT exist...
//https://github.com/billziss-gh/winfsp/issues/320