simplify package collections model #3069
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
tomerd
requested review from
abertelrud,
aciidgh,
friedbunny and
neonichu
as code owners
tomerd
commented
Nov 19, 2020
| @@ -18,7 +18,21 @@ public struct PackageCollections: PackageCollectionsProtocol { | |||
| private let collectionProviders: [PackageCollectionsModel.CollectionSourceType: PackageCollectionProvider] | |||
| private let metadataProvider: PackageMetadataProvider | |||
|
|
|||
| init(configuration: Configuration, | |||
| // initialize with defaults | |||
| public init(configuration: Configuration = .init()) { | |||
yim-lee
reviewed
Nov 19, 2020
Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift
Show resolved
Hide resolved
Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift
Outdated
Show resolved
Hide resolved
Sources/PackageCollections/Storage/FilePackageCollectionsSourcesStorage.swift
Outdated
Show resolved
Hide resolved
Sources/PackageCollections/Storage/FilePackageCollectionsSourcesStorage.swift
Outdated
Show resolved
Hide resolved
Merged
motivation: simpler is nicer changes: * dedupe collection.package and package, and collection.package.version and pacakge.version as they ended up very similar * add keywords to package and package basic metadata * adjust code & tests
tomerd
force-pushed
the
feature/package-collections-8
branch
from
dd14382 to
347880c
Compare
|
@swift-ci please smoke test |
yim-lee
approved these changes
Nov 19, 2020
| @@ -154,7 +157,8 @@ struct GitHubPackageMetadataProvider: PackageMetadataProvider { | |||
| } | |||
|
|
|||
| enum Errors: Error, Equatable { | |||
| case unprocessable(PackageReference) | |||
| case invalidReferenceType(PackageReference) | |||
| case invalidGitUrl(String) | |||
| @@ -127,7 +130,7 @@ struct GitHubPackageMetadataProvider: PackageMetadataProvider { | |||
| let owner = String(url[ownerRange]) | |||
| let repo = String(url[repoRange]) | |||
|
|
|||
| return URL(string: "https://api.\(host)/\(owner)/\(repo)") | |||
| return URL(string: "https://api.\(host)/repos/\(owner)/\(repo)") | |||
abertelrud
approved these changes
Nov 19, 2020
| @@ -67,6 +70,7 @@ extension PackageCollectionsModel { | |||
| init( | |||
| repository: RepositorySpecifier, | |||
| description: String?, | |||
| keywords: [String]?, | |||
There was a problem hiding this comment.
Is there a semantic distinction to an empty vs a nil collection of keywords, or is it mainly to avoid a coded entry for an empty collection?
| @@ -61,7 +61,9 @@ struct GitHubPackageMetadataProvider: PackageMetadataProvider { | |||
| // get the main data | |||
| sync.enter() | |||
| let options = self.makeRequestOptions(validResponseCodes: [200]) | |||
| httpClient.get(metadataURL, options: options) { result in | |||
| var headers = HTTPClientHeaders() | |||
| headers.add(name: "Accept", value: "application/vnd.github.mercy-preview+json") | |||
There was a problem hiding this comment.
Is this a literal string or something that should be parameterized?
There was a problem hiding this comment.
are you asking about constants for the header name?
federicobucchi
pushed a commit
to federicobucchi/swift-package-manager
that referenced
this pull request
Jan 6, 2021
* simplify package collections model motivation: simpler is nicer changes: * dedupe collection.package and package, and collection.package.version and pacakge.version as they ended up very similar * add keywords to package and package basic metadata * adjust code & tests * fixup
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.
motivation: simpler is nicer
changes:
to be merged after #3068