Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backup renaming #950

Merged
merged 3 commits into from
Sep 22, 2023
Merged

Backup renaming #950

merged 3 commits into from
Sep 22, 2023

Commits on Sep 22, 2023

  1. fix(backup): Change how we rename file when conflict 

    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>.
    @zatteo
    zatteo committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    e6ded25 View commit details
    Browse the repository at this point in the history

  2. fix(backup): Use only name and creationDate to compare medias 

    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
    zatteo committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    7bdac44 View commit details
    Browse the repository at this point in the history

  3. fix(backup): Remove ms from date received from stack 

    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.
    @zatteo
    zatteo committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    f826cc9 View commit details
    Browse the repository at this point in the history