Backup renaming #950
Merged
Backup renaming #950
Conversation
This file contains 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
Previous solution was not working for Android because we needed to know image format for every manufacturer. We choose to use _conflict_<date> because it will be unique with the date, and we will be able to differentiate from Desktop conflict which use -conflict-<date>.
To avoid creating too much duplicate for next step about deduplication, we will compare only by name and creationDate. modificationDate is too much subject to change, and can't be trusted in some cases (shared iCloud albums for example).
zatteo
force-pushed
the
fix/renaming
branch
from
1269b7f
to
7bdac44
Compare
cozy-stack may not take into account ms from a date. So we decided to ignore ms in our date. But sometimes cozy-stack still add ms into server date. So we need to remove ms when received a date from the server.
Crash--
reviewed
Sep 22, 2023
| return ( | ||
| file.name === media.name && | ||
| new Date(file.created_at).getTime() === media.creationDate | ||
| file.name === media.name && creationDate.getTime() === media.creationDate | ||
| ) | ||
| } | ||
|
|
There was a problem hiding this comment.
@nono are you aware about the need to do that?
There was a problem hiding this comment.
I think I was a message about a precision issue (with milliseconds in one case, and without in the other case)
Crash--
approved these changes
Sep 22, 2023
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.
fix(backup): Change how we rename file when conflict
fix(backup): Use only name and creationDate to compare medias