Skip to content

[Collections] Removed local package collection comes back alive #3617

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

Merged
merged 1 commit into from
Jul 16, 2021
Merged

[Collections] Removed local package collection comes back alive #3617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/PackageCollections/PackageCollections.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,16 +454,16 @@ public struct PackageCollections: PackageCollectionsProtocol {
private func refreshCollectionFromSource(source: PackageCollectionsModel.CollectionSource,
trustConfirmationProvider: ((PackageCollectionsModel.Collection, @escaping (Bool) -> Void) -> Void)?,
callback: @escaping (Result<Model.Collection, Error>) -> Void) {
if let errors = source.validate()?.errors() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have the same logic in the provider. Removing this so we don't have to duplicate storage removal logic (i.e., L464-466) here.

return callback(.failure(MultipleErrors(errors)))
}
guard let provider = self.collectionProviders[source.type] else {
return callback(.failure(UnknownProvider(source.type)))
}
provider.get(source) { result in
switch result {
case .failure(let error):
callback(.failure(error))
// Remove the unavailable/invalid collection (if previously saved) from storage before calling back
self.storage.collections.remove(identifier: PackageCollectionsModel.CollectionIdentifier(from: source)) { _ in
callback(.failure(error))
}
case .success(let collection):
// If collection is signed and signature is valid, save to storage. `provider.get`
// would have failed if signature were invalid.
Expand Down