mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generifyed #chooseMountPoint()

Browse Source
This commit is contained in:
JaniruTEC
2020-11-18 16:09:09 +01:00
parent 6c440dfbbb
commit 52cd560cb2
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/commons/src/main/java/org/cryptomator/common/mountpoint/MacVolumeMountChooser.java
View File

@@ -31,26 +31,30 @@ class MacVolumeMountChooser implements MountPointChooser {
@Override
public Optional<Path> chooseMountPoint(Volume caller) {
return Optional.of(VOLUME_PATH).map(this::choose);
}
private Path choose(Path parent) {
String basename = this.vaultSettings.mountName().get();
// regular
Path mountPoint = VOLUME_PATH.resolve(basename);
//regular
Path mountPoint = parent.resolve(basename);
if (Files.notExists(mountPoint)) {
return Optional.of(mountPoint);
return mountPoint;
}
// with id
mountPoint = VOLUME_PATH.resolve(basename + " (" + vaultSettings.getId() + ")");
//with id
mountPoint = parent.resolve(basename + " (" + vaultSettings.getId() + ")");
if (Files.notExists(mountPoint)) {
return Optional.of(mountPoint);
return mountPoint;
}
// with id and count
//with id and count
for (int i = 1; i < MAX_MOUNTPOINT_CREATION_RETRIES; i++) {
mountPoint = VOLUME_PATH.resolve(basename + "_(" + vaultSettings.getId() + ")_" + i);
mountPoint = parent.resolve(basename + "_(" + vaultSettings.getId() + ")_" + i);
if (Files.notExists(mountPoint)) {
return Optional.of(mountPoint);
return mountPoint;
}
}
LOG.error("Failed to find feasible mountpoint at /Volumes/{}_x. Giving up after {} attempts.", basename, MAX_MOUNTPOINT_CREATION_RETRIES);
return Optional.empty();
return null;
}
@Override