Don't try to sync deleted collections #1064
Closed
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
|
Maybe deprecated by #1065? |
ArnyminerZ
requested changes
Oct 10, 2024
| @@ -96,15 +96,20 @@ abstract class Syncer<CollectionType: LocalCollection<*>>( | |||
|
|
|||
| // Find collections in database and provider which should be synced (are sync-enabled) | |||
| val dbCollections = getSyncEnabledCollections() | |||
| val localCollections = getLocalCollections(provider).toMutableList() | |||
| var localCollections = getLocalCollections(provider).toMutableList() | |||
sunkup
commented
Oct 10, 2024
|
|
||
| // Create new local collections for newly found remote collections | ||
| val newProviderCollections = createLocalCollections(provider, newDbCollections) | ||
| localCollections.addAll(newProviderCollections) // Add the newly created collections | ||
|
|
||
| // Don't sync deleted collections | ||
| deletedLocalCollections.forEach { deletedLocalCollection -> | ||
| localCollections.remove(deletedLocalCollection) |
There was a problem hiding this comment.
In order to have the actual deletion and the deletion from to-be-synced-list at the same place, deleting from the list too could happen inside of updateCollections too and we return the finished list.
sunkup
commented
Oct 10, 2024
| for (localCollection in localCollections) { | ||
| val dbCollection = dbCollections[localCollection.collectionUrl?.toHttpUrlOrNull()] | ||
| if (dbCollection == null) | ||
| if (dbCollection == null) { | ||
| // Collection not available in db = on server (anymore), delete obsolete local collection | ||
| localCollection.deleteCollection() |
There was a problem hiding this comment.
In order to have the actual deletion and the deletion from to-be-synced-list at the same place, this could happen outside of updateCollections where we delete from the list too.
|
Obsoleted by #1065 |
rfc2822
deleted the
1062-syncer-tries-to-sync-collections-that-it-just-has-deleted
branch
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.
Purpose
Syncertries to sync collections it deleted causing an exception. The sync algorithm is the heart of DAVx5 and so it should run flawlessly, be easy to understand and well documented.Short description
It would have been possible to simply get the collections anew from the database, after
updateCollectionshas run and possibly deleted some local collections. It would, however, not have been as explicit in the sense that we would have relied on a side effect ofupdateCollections.By returning a pair (which is ugly yes) it is more explicit. We also save a database query and made the deletion test stronger.
Actual changes:
updateCollectionsChecklist