Consolidate update+reader & remove some dead code

This commit is contained in:
2024-11-22 21:01:01 +11:00
parent cc703ad0c5
commit be51934334
7 changed files with 108 additions and 170 deletions

View File

@ -31,8 +31,8 @@ public struct ApkRepositoriesConfig {
}
}
public extension ApkIndex {
@inlinable static func resolve(_ config: ApkRepositoriesConfig, fetch: ApkIndexFetchMode) async throws -> Self {
public extension ApkIndexReader {
@inlinable static func resolve(_ config: ApkRepositoriesConfig, fetch: FetchMode) async throws -> ApkIndex {
try await Self.resolve(config.repositories, fetch: fetch)
}
}

View File

@ -44,7 +44,7 @@ struct DpkSearchCommand: AsyncParsableCommand {
let localRepositories = try await ApkRepositoriesConfig()
let index: ApkIndex
do {
index = try await ApkIndex.resolve(localRepositories, fetch: .local)
index = try await ApkIndexReader.resolve(localRepositories, fetch: .local)
} catch {
eprint("Failed to build package index: \(error.localizedDescription)")
throw .failure

View File

@ -19,7 +19,7 @@ struct DpkUpdateCommand: AsyncParsableCommand {
func run() async throws {
let repositories = try await ApkRepositoriesConfig().repositories
eprint("Updating package repositories")
let index = try await ApkIndex.resolve(repositories, fetch: self.lazyDownload ? .lazy : .update)
let index = try await ApkIndexReader.resolve(repositories, fetch: self.lazyDownload ? .lazy : .update)
eprint("Indexed \(index.packages.count) package(s)")
}
}