mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-10 01:18:01 +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 -->
45 lines
1.4 KiB
Swift
45 lines
1.4 KiB
Swift
import XUtils
|
|
import XCLIUtils
|
|
import Foundation
|
|
import XKit
|
|
import ArgumentParser
|
|
|
|
struct ConnectionOptions: ParsableArguments {
|
|
struct WithoutSearchMode: ParsableArguments {
|
|
@Option(name: .shortAndLong) var udid: String?
|
|
}
|
|
|
|
@OptionGroup var base: WithoutSearchMode
|
|
@Flag var search: ClientDevice.SearchMode = .all
|
|
|
|
func client() async throws -> ClientDevice {
|
|
try await base.client(searchMode: search)
|
|
}
|
|
}
|
|
|
|
extension ConnectionOptions.WithoutSearchMode {
|
|
func client(searchMode search: ClientDevice.SearchMode) async throws -> ClientDevice {
|
|
d.out.print("Waiting for device to be connected...")
|
|
|
|
let stream = try await ClientDevice.search(mode: search)
|
|
for await devices in stream {
|
|
guard !devices.isEmpty else { continue }
|
|
if let udid {
|
|
guard let device = devices.first(where: { $0.udid == udid }) else {
|
|
continue
|
|
}
|
|
return device
|
|
} else {
|
|
return try await Console.choose(
|
|
from: devices,
|
|
onNoElement: { throw Console.Error("Device not found") },
|
|
multiPrompt: "Choose device",
|
|
formatter: { "\($0.deviceName) (\($0.connectionType), udid: \($0.udid))" }
|
|
)
|
|
}
|
|
}
|
|
|
|
throw CancellationError()
|
|
}
|
|
}
|