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

allow to store custom mount flags in the vault settings (required for #802)

Browse Source 
[ci skip]
This commit is contained in:
Sebastian Stenzel
2019-06-17 13:55:31 +02:00
parent af73dab795
commit f53f2d2ca4
5 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java
+15 -3
View File
@@ -9,6 +9,7 @@ import org.cryptomator.frontend.fuse.mount.EnvironmentVariables;
import org.cryptomator.frontend.fuse.mount.FuseMountFactory;
import org.cryptomator.frontend.fuse.mount.FuseNotSupportedException;
import org.cryptomator.frontend.fuse.mount.Mount;
import org.cryptomator.frontend.fuse.mount.Mounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,6 +21,7 @@ import java.nio.file.Files;
import java.nio.file.NotDirectoryException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Optional;
public class FuseVolume implements Volume {
@@ -96,16 +98,26 @@ public class FuseVolume implements Volume {
private void mount(Path root) throws VolumeException {
try {
Mounter mounter = FuseMountFactory.getMounter();
EnvironmentVariables envVars = EnvironmentVariables.create() //
.withMountName(vaultSettings.mountName().getValue()) //
.withMountPath(mountPoint) //
.withFlags(mountFlags(mounter))
.withMountPoint(mountPoint) //
.build();
this.fuseMnt = FuseMountFactory.getMounter().mount(root, envVars);
this.fuseMnt = mounter.mount(root, envVars);
} catch (CommandFailedException e) {
throw new VolumeException("Unable to mount Filesystem", e);
}
}
private String[] mountFlags(Mounter mounter) {
List<String> mountFlags = vaultSettings.mountFlags().get();
if (mountFlags.isEmpty()) {
return mounter.defaultMountFlags();
} else {
return mountFlags.toArray(String[]::new);
}
}
@Override
public void reveal() throws VolumeException {
try {