Use dirid file in orphan dir fix #127
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
overheadhunter
requested changes
Apr 5, 2022
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com> Co-authored-by: sonarcloud <sonarcloud@users.noreply.github.com>
overheadhunter
requested changes
Apr 6, 2022
src/main/java/org/cryptomator/cryptofs/health/dirid/OrphanDir.java
Outdated
Show resolved
Hide resolved
overheadhunter
approved these changes
Apr 7, 2022
|
I just noticed, this PR is not done yet: Since the stepparent dir is created manually, we do not add a dirid file to it, although we should. Because once the user moves the recovered directory, he won't be able to recover the files names again. |
|
Kudos, SonarCloud Quality Gate passed! |
overheadhunter
approved these changes
Apr 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #126.
This PR allows to restore also filenames of an orphaned directory, if the dirId file is present.
It is implemented in a failsafe way: If the dirId file does not exists, cannot be read or does not match, the orphan cipher dir is recovered without it.