From ea4c91fb3785466c19017fc3782edd0846d9cb4d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 6 Aug 2020 15:20:32 +0200 Subject: [PATCH] change meaning of mount name setting: * it is now considered the gerenal vault name * methods (except parsing) are renamed accordingly --- .../common/settings/VaultSettings.java | 22 +++++++++---------- .../settings/VaultSettingsJsonAdapter.java | 4 ++-- .../common/vaults/DokanyVolume.java | 2 +- .../org/cryptomator/common/vaults/Vault.java | 4 ++-- .../common/vaults/VaultModule.java | 2 +- .../common/vaults/WebDavVolume.java | 2 +- .../common/settings/SettingsTest.java | 2 +- .../VaultSettingsJsonAdapterTest.java | 4 ++-- .../common/vaults/VaultModuleTest.java | 2 +- .../vaultoptions/MountOptionsController.java | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 395b118dd..e31a361ff 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -42,7 +42,7 @@ public class VaultSettings { private final String id; private final ObjectProperty path = new SimpleObjectProperty(); - private final StringProperty mountName = new SimpleStringProperty(); + private final StringProperty displayName = new SimpleStringProperty(); private final StringProperty winDriveLetter = new SimpleStringProperty(); private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP); private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT); @@ -56,25 +56,25 @@ public class VaultSettings { public VaultSettings(String id) { this.id = Objects.requireNonNull(id); - EasyBind.subscribe(path, this::deriveMountNameFromPathOrUseDefault); + EasyBind.subscribe(path, this::deriveDisplayNameFromPathOrUseDefault); } Observable[] observables() { - return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock}; + return new Observable[]{path, displayName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock}; } - private void deriveMountNameFromPathOrUseDefault(Path newPath) { - final boolean mountNameSet = !StringUtils.isBlank(mountName.get()); + private void deriveDisplayNameFromPathOrUseDefault(Path newPath) { + final boolean mountNameSet = !StringUtils.isBlank(displayName.get()); final boolean dirnameExists = (newPath != null) && (newPath.getFileName() != null); if (!mountNameSet && dirnameExists) { - mountName.set(normalizeMountName(newPath.getFileName().toString())); + displayName.set(normalizeMountName(newPath.getFileName().toString())); } else if (!mountNameSet && !dirnameExists) { - mountName.set(DEFAULT_MOUNT_NAME + " " + id); + displayName.set(DEFAULT_MOUNT_NAME + " " + id); } else if (mountNameSet && dirnameExists) { - if (mountName.get().equals(DEFAULT_MOUNT_NAME + id)) { + if (displayName.get().equals(DEFAULT_MOUNT_NAME + id)) { //this is okay, since this function is only executed if the path changes (aka, the vault is created or added) - mountName.set(newPath.getFileName().toString()); + displayName.set(newPath.getFileName().toString()); } } } @@ -118,8 +118,8 @@ public class VaultSettings { return path; } - public StringProperty mountName() { - return mountName; + public StringProperty displayName() { + return displayName; } public StringProperty winDriveLetter() { diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java index d136ffaff..a8b940918 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java @@ -21,7 +21,7 @@ class VaultSettingsJsonAdapter { out.beginObject(); out.name("id").value(value.getId()); out.name("path").value(value.path().get().toString()); - out.name("mountName").value(value.mountName().get()); + out.name("mountName").value(value.displayName().get()); out.name("winDriveLetter").value(value.winDriveLetter().get()); out.name("unlockAfterStartup").value(value.unlockAfterStartup().get()); out.name("revealAfterMount").value(value.revealAfterMount().get()); @@ -73,7 +73,7 @@ class VaultSettingsJsonAdapter { in.endObject(); VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id); - vaultSettings.mountName().set(mountName); + vaultSettings.displayName().set(mountName); vaultSettings.path().set(Paths.get(path)); vaultSettings.winDriveLetter().set(winDriveLetter); vaultSettings.unlockAfterStartup().set(unlockAfterStartup); diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java index 1bfd813e3..f934bf25f 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java @@ -47,7 +47,7 @@ public class DokanyVolume implements Volume { @Override public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException, IOException { this.mountPoint = determineMountPoint(); - String mountName = vaultSettings.mountName().get(); + String mountName = vaultSettings.displayName().get(); try { this.mount = mountFactory.mount(fs.getPath("/"), mountPoint, mountName, FS_TYPE_NAME, mountFlags.strip()); } catch (MountFailedException e) { diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java index 5ee0ee931..ce49a564e 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -78,7 +78,7 @@ public class Vault { this.state = state; this.lastKnownException = lastKnownException; this.stats = stats; - this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.mountName()); + this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.displayName()); this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path()); this.locked = Bindings.createBooleanBinding(this::isLocked, state); this.processing = Bindings.createBooleanBinding(this::isProcessing, state); @@ -230,7 +230,7 @@ public class Vault { } public String getDisplayableName() { - return vaultSettings.mountName().get(); + return vaultSettings.displayName().get(); } public StringBinding accessPointProperty() { diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java index 1afd9d88b..d084be7bd 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java @@ -77,7 +77,7 @@ public class VaultModule { @DefaultMountFlags public StringBinding provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { ObjectProperty preferredVolumeImpl = settings.preferredVolumeImpl(); - StringProperty mountName = vaultSettings.mountName(); + StringProperty mountName = vaultSettings.displayName(); BooleanProperty readOnly = vaultSettings.usesReadOnlyMode(); return Bindings.createStringBinding(() -> { diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java index a12236230..5ad63dd7b 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java @@ -44,7 +44,7 @@ public class WebDavVolume implements Volume { if (!server.isRunning()) { server.start(); } - servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.mountName().get()); + servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.displayName().get()); servlet.start(); mount(); } diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java index 708578763..33d384cf8 100644 --- a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java +++ b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java @@ -29,7 +29,7 @@ public class SettingsTest { Mockito.verify(changeListener, Mockito.times(2)).accept(settings); // third change (to property of list item): - vaultSettings.mountName().set("asd"); + vaultSettings.displayName().set("asd"); Mockito.verify(changeListener, Mockito.times(3)).accept(settings); } diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java index 237b00904..4c684d5d6 100644 --- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java +++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java @@ -29,7 +29,7 @@ public class VaultSettingsJsonAdapterTest { VaultSettings vaultSettings = adapter.read(jsonReader); Assertions.assertEquals("foo", vaultSettings.getId()); Assertions.assertEquals(Paths.get("/foo/bar"), vaultSettings.path().get()); - Assertions.assertEquals("test", vaultSettings.mountName().get()); + Assertions.assertEquals("test", vaultSettings.displayName().get()); Assertions.assertEquals("X", vaultSettings.winDriveLetter().get()); Assertions.assertEquals("/home/test/crypto", vaultSettings.customMountPath().get()); Assertions.assertEquals("--foo --bar", vaultSettings.mountFlags().get()); @@ -41,7 +41,7 @@ public class VaultSettingsJsonAdapterTest { public void testSerialize() throws IOException { VaultSettings vaultSettings = new VaultSettings("test"); vaultSettings.path().set(Paths.get("/foo/bar")); - vaultSettings.mountName().set("mountyMcMountFace"); + vaultSettings.displayName().set("mountyMcMountFace"); vaultSettings.mountFlags().set("--foo --bar"); StringWriter buf = new StringWriter(); diff --git a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java index 1eb9a9d2f..0f4cbd102 100644 --- a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java +++ b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java @@ -28,7 +28,7 @@ public class VaultModuleTest { @BeforeEach public void setup(@TempDir Path tmpDir) { - Mockito.when(vaultSettings.mountName()).thenReturn(new SimpleStringProperty("TEST")); + Mockito.when(vaultSettings.displayName()).thenReturn(new SimpleStringProperty("TEST")); Mockito.when(vaultSettings.usesReadOnlyMode()).thenReturn(new SimpleBooleanProperty(true)); System.setProperty("user.home", tmpDir.toString()); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java index 81753d83a..dcff17836 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java @@ -63,7 +63,7 @@ public class MountOptionsController implements FxController { @FXML public void initialize() { - driveName.textProperty().bindBidirectional(vault.getVaultSettings().mountName()); + driveName.textProperty().bindBidirectional(vault.getVaultSettings().displayName()); // readonly: readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());