strips/darwin-apk
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/darwin-apk.git synced 2025-08-04 05:51:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prefer to print to stderr for console chatter

Browse Source
This commit is contained in:
a dinosaur
2024-11-17 02:59:13 +11:00
parent 20e76918fe
commit c239b8e424
9 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/apk/Index/ApkIndexReading.swift
View File

@ -45,6 +45,7 @@ public extension ApkIndex {
} }
local = URL(filePath: repository.localName) local = URL(filePath: repository.localName)
case .update: case .update:
//FIXME: Don't call print in the lib
print("Fetching \"\(repository.resolved)\"") print("Fetching \"\(repository.resolved)\"")
local = try await ApkIndexDownloader.fetch(repository: repository) local = try await ApkIndexDownloader.fetch(repository: repository)
} }

3
Sources/apk/Common/ApkRepositoriesConfig.swift → Sources/dpk-cli/ApkRepositoriesConfig.swift
View File

@ -5,6 +5,7 @@
import Foundation import Foundation
import ArgumentParser import ArgumentParser
import darwin_apk
public struct ApkRepositoriesConfig { public struct ApkRepositoriesConfig {
public let repositories: [ApkIndexRepository] public let repositories: [ApkIndexRepository]
@ -17,7 +18,7 @@ public struct ApkRepositoriesConfig {
} }
}.reduce(into: []) { $0.append($1) } }.reduce(into: []) { $0.append($1) }
} catch { } catch {
print("Failed to read repository configurations, \(error.localizedDescription)") eprint("Failed to read repository configurations, \(error.localizedDescription)")
throw .failure throw .failure
} }
} }

2
Sources/dpk-cli/RegexMatcher.swift
View File

@ -13,7 +13,7 @@ struct RegexMatcher: PatternMatcher {
do { do {
self._patterns = try patterns.map(Regex.init) self._patterns = try patterns.map(Regex.init)
} catch { } catch {
print("Bad pattern \(error.localizedDescription)") eprint("Bad pattern \(error.localizedDescription)")
throw .validationFailure throw .validationFailure
} }
} }

17
Sources/dpk-cli/StandardErrorPrint.swift Normal file
View File

@ -0,0 +1,17 @@
/*
* darwin-apk © 2024 Gay Pizza Specifications
* SPDX-License-Identifier: Apache-2.0
*/
import Foundation
internal func eprint(_ items: Any..., separator: String = " ", terminator: String = "\n") {
var stderr = FileHandle.standardError
print(items, separator: separator, terminator: terminator, to: &stderr)
}
extension FileHandle: @retroactive TextOutputStream {
public func write(_ string: String) {
self.write(Data(string.utf8))
}
}

2
Sources/dpk-cli/Subcommands/DpkInstallCommand.swift
View File

@ -15,6 +15,6 @@ struct DpkInstallCommand: ParsableCommand {
var packages: [String] var packages: [String]
func run() throws { func run() throws {
print("installing \"\(packages.joined(separator: "\", \""))\"") eprint("installing \"\(packages.joined(separator: "\", \""))\"")
} }
} }

2
Sources/dpk-cli/Subcommands/DpkRemoveCommand.swift
View File

@ -15,6 +15,6 @@ struct DpkRemoveCommand: ParsableCommand {
var packages: [String] var packages: [String]
func run() throws { func run() throws {
print("uninstalling \"\(packages.joined(separator: "\", \""))\"") eprint("uninstalling \"\(packages.joined(separator: "\", \""))\"")
} }
} }

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

@ -27,7 +27,7 @@ struct DpkSearchCommand: AsyncParsableCommand {
func run() async throws(ExitCode) { func run() async throws(ExitCode) {
if self.regex && self.exact { if self.regex && self.exact {
print("Only one of \(self._regex.description) and \(self._exact.description) is allowed") eprint("Only one of \(self._regex.description) and \(self._exact.description) is allowed")
throw .validationFailure throw .validationFailure
} }
@ -46,7 +46,7 @@ struct DpkSearchCommand: AsyncParsableCommand {
do { do {
index = try await ApkIndex.resolve(localRepositories, fetch: .local) index = try await ApkIndex.resolve(localRepositories, fetch: .local)
} catch { } catch {
print("Failed to build package index: \(error.localizedDescription)") eprint("Failed to build package index: \(error.localizedDescription)")
throw .failure throw .failure
} }

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

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

4
Sources/dpk-cli/Subcommands/DpkUpgradeCommand.swift
View File

@ -16,9 +16,9 @@ struct DpkUpgradeCommand: ParsableCommand {
func run() throws { func run() throws {
if packages.isEmpty { if packages.isEmpty {
print("upgrading system") eprint("upgrading system")
} else { } else {
print("upgrading invidual packages: \"\(packages.joined(separator: "\", \""))\"") eprint("upgrading individual packages: \"\(packages.joined(separator: "\", \""))\"")
} }
} }
} }