strips/darwin-apk
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/darwin-apk.git synced 2025-11-04 07:59:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Read from repository configs instead of hardcoding repos/arch for update

Browse Source
This commit is contained in:
a dinosaur
2024-11-16 00:30:19 +11:00
parent 1b6883c9df
commit e8d101edb5
4 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Sources/dpk-cli/Subcommands/DpkSearchCommand.swift
View File

@ -41,25 +41,7 @@ struct DpkSearchCommand: AsyncParsableCommand {
let match: any PatternMatcher
match = try matcher.init(patterns: patterns, ignoreCase: !self.caseSensitive)
let repositories: [String], architectures: [String]
do {
repositories = try await PropertyFile.read(name: "repositories")
} catch {
print("Failed to read repositories: \(error.localizedDescription)")
throw .failure
}
do {
architectures = try await PropertyFile.read(name: "arch")
} catch {
print("Failed to read arch: \(error.localizedDescription)")
throw .failure
}
let localRepositories = repositories.flatMap { repo in
architectures.map { arch in
URL(filePath: ApkIndexRepository(name: repo, arch: arch).localName, directoryHint: .notDirectory)
}
}
let localRepositories = try await RepositoriesConfig().localRepositories
let index: ApkIndex
do {
index = ApkIndex.merge(try localRepositories.map(ApkIndex.init))
@ -75,12 +57,3 @@ struct DpkSearchCommand: AsyncParsableCommand {
}
}
}
struct PropertyFile {
static func read(name: String) async throws -> [String] {
try await URL(filePath: name, directoryHint: .notDirectory).lines
.map { $0.trimmingCharacters(in: .whitespaces) }
.filter { !$0.isEmpty && $0.first != "#" } // Ignore empty & commented lines
.reduce(into: [String]()) { $0.append($1) }
}
}

6
Sources/dpk-cli/Subcommands/DpkUpdateCommand.swift
View File

@ -7,15 +7,17 @@ import Foundation
import ArgumentParser
import darwin_apk
struct DpkUpdateCommand: ParsableCommand {
struct DpkUpdateCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "update",
abstract: "Update the system package repositories.",
aliases: [ "u" ])
func run() throws {
func run() async throws {
print("Updating package repositories")
let repositories = try await RepositoriesConfig().repositories
var updater = ApkIndexUpdater()
updater.repositories.append(contentsOf: repositories)
updater.update()
}
}