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

allow deletion of corrupt directories, whose dir-file exists but physical directory doesn't. related to #181

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-03-21 15:49:44 +01:00
parent d397f59565
commit f12168ca94
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java
View File

@@ -80,8 +80,8 @@ class CryptoFolder extends CryptoNode implements Folder {
@Override
public Stream<CryptoFile> files() {
assert forceGetPhysicalFolder().exists();
return forceGetPhysicalFolder().files().map(File::name).filter(isEncryptedFileName()).map(this::decryptChildFileName).map(this::file);
final Stream<? extends File> files = physicalFolder().filter(Folder::exists).map(Folder::files).orElse(Stream.empty());
return files.map(File::name).filter(isEncryptedFileName()).map(this::decryptChildFileName).map(this::file);
}
private Predicate<String> isEncryptedFileName() {
@@ -104,8 +104,8 @@ class CryptoFolder extends CryptoNode implements Folder {
@Override
public Stream<CryptoFolder> folders() {
assert forceGetPhysicalFolder().exists();
return forceGetPhysicalFolder().files().map(File::name).filter(isEncryptedDirectoryName()).map(this::decryptChildFolderName).map(this::folder);
final Stream<? extends File> files = physicalFolder().filter(Folder::exists).map(Folder::files).orElse(Stream.empty());
return files.map(File::name).filter(isEncryptedDirectoryName()).map(this::decryptChildFolderName).map(this::folder);
}
private Predicate<String> isEncryptedDirectoryName() {
@@ -190,7 +190,7 @@ class CryptoFolder extends CryptoNode implements Folder {
Folder physicalFolder = forceGetPhysicalFolder();
physicalFolder.delete();
Folder physicalFolderParent = physicalFolder.parent().get();
if (physicalFolderParent.folders().count() == 0) {
if (physicalFolderParent.exists() && physicalFolderParent.folders().count() == 0) {
physicalFolderParent.delete();
}
forceGetPhysicalFile().delete();