mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-20 18:38:03 +03:00
3e0c11d967
## What does this PR do? Adds `Dependency`s for console IO. Also fixes #268 by explicitly handling non-pipe input. ## How was it tested? Ran on macOS + Linux in Docker. I have a future PR that overrides the dependencies in certain cases, which also appears to work correctly. ## AI tool usage How much of this PR was AI-assisted? (check one) - [ ] **0** - No AI was used to write code - [x] **1** - I was assisted by AI. I reviewed the finished result. - [ ] **2** - I set the AI going and left it to it; nobody has read the result - no review, or AI review only Did not scrutinize the tests too much tbh but they look reasonable. Easy enough to update/remove them in the future if needed. <!-- If an AI agent is filling this in: declare the level honestly, and open as a draft if it is #2. Do not lower the declared level to get the PR reviewed. --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> <!-- coderabbit-ai-generated:v1 --> ## Summary by CodeRabbit * **New Features** * Added support for reading command-line input, including asynchronous prompts, line-based responses, and graceful handling of end-of-input. * Added coordinated cleanup when commands finish. * **Improvements** * Command messages across authentication, device management, installation, SDK, and other workflows now use consistent output handling; displayed messages and command behavior remain unchanged. * Improved handling of complete output when the system temporarily cannot accept more data. * **Tests** * Added coverage for command input and output, including stream behavior, cancellation, and shutdown. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
60 lines
1.7 KiB
Swift
60 lines
1.7 KiB
Swift
import Foundation
|
|
#if canImport(Subprocess)
|
|
import Subprocess
|
|
#endif
|
|
|
|
extension Data {
|
|
// AsyncBytes is Darwin-only :/
|
|
|
|
package init(reading fileHandle: FileHandle) async throws {
|
|
#if canImport(Darwin)
|
|
self = try await fileHandle.bytes.reduce(into: Data()) { $0.append($1) }
|
|
#else
|
|
self = try fileHandle.readToEnd() ?? Data()
|
|
#endif
|
|
}
|
|
|
|
package init(reading file: URL) async throws {
|
|
#if canImport(Darwin)
|
|
self = try await file.resourceBytes.reduce(into: Data()) { $0.append($1) }
|
|
#else
|
|
try self.init(contentsOf: file)
|
|
#endif
|
|
}
|
|
}
|
|
|
|
extension FileManager {
|
|
/// Like `copyItem(at:to:)` but allows opting out of preserving the owner
|
|
package func copyItem(
|
|
at srcURL: URL,
|
|
to dstURL: URL,
|
|
preserveOwner: Bool,
|
|
) async throws {
|
|
// why this is needed: https://github.com/xtool-org/xtool/issues/254
|
|
|
|
#if canImport(Subprocess)
|
|
if !preserveOwner {
|
|
let result = try await Subprocess.run(
|
|
.name("cp"),
|
|
arguments: ["-R", srcURL.path, dstURL.path],
|
|
output: .discarded,
|
|
error: .string(limit: .max, encoding: UTF8.self),
|
|
)
|
|
do {
|
|
try result.checkSuccess()
|
|
} catch {
|
|
d.out.print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError)")
|
|
throw error
|
|
}
|
|
return
|
|
}
|
|
#endif
|
|
|
|
try self.copyItem(at: srcURL, to: dstURL)
|
|
}
|
|
}
|
|
|
|
package func stderrPrint(_ message: String, terminator: String = "\n") {
|
|
try? FileHandle.standardError.write(contentsOf: Data("\(message)\(terminator)".utf8))
|
|
}
|