mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved handling of existing hideaways

Browse Source
This commit is contained in:
JaniruTEC
2023-07-10 15:42:49 +02:00
parent e484813233
commit 92b77baf40
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
View File

@@ -28,9 +28,7 @@ public final class MountWithinParentUtil {
var hideExists = Files.exists(hideaway, LinkOption.NOFOLLOW_LINKS);
//TODO: possible improvement by just deleting an _empty_ hideaway
if (mpExists && hideExists) { //both resources exist (whatever type)
throw new MountPointPreparationException(new FileAlreadyExistsException(hideaway.toString()));
} else if (!mpExists && !hideExists) { //neither mountpoint nor hideaway exist
if (!mpExists && !hideExists) { //neither mountpoint nor hideaway exist
throw new MountPointPreparationException(new NoSuchFileException(mountPoint.toString()));
} else if (!mpExists) { //only hideaway exists
checkIsDirectory(hideaway);
@@ -42,8 +40,13 @@ public final class MountWithinParentUtil {
} catch (IOException e) {
throw new MountPointPreparationException(e);
}
} else { //only mountpoint exists
} else { //mountpoint exists...
try {
if (hideExists) { //... with hideaway
removeResidualHideaway(hideaway);
}
//... (now) without hideaway
checkIsDirectory(mountPoint);
checkIsEmpty(mountPoint);
@@ -68,6 +71,16 @@ public final class MountWithinParentUtil {
}
}
private static void removeResidualHideaway(Path hideaway) throws IOException {
if (!Files.isDirectory(hideaway, LinkOption.NOFOLLOW_LINKS)) {
if (SystemUtils.IS_OS_WINDOWS) {
Files.setAttribute(hideaway, WIN_HIDDEN_ATTR, false);
}
throw new MountPointPreparationException(new NotDirectoryException(hideaway.toString()));
}
Files.delete(hideaway);
}
static void cleanup(Path mountPoint) {
Path hideaway = getHideaway(mountPoint);
try {