mirror of
https://github.com/apple/container.git
synced 2026-07-13 13:07:06 +00:00
Nikunj Thakur
745134540e
- Adds a `plain` progress output mode (`--progress plain`) that outputs newline-separated progress lines without ANSI escape sequences. This is useful for CI environments, piped output, and non-TTY contexts where ANSI cursor control is not supported. Unlike `--progress ansi`, plain mode works even when stderr is not a TTY. - Closes #1365 - Related: #641, #808
55 lines
2.1 KiB
Swift
55 lines
2.1 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import ContainerAPIClient
|
|
import TerminalProgress
|
|
|
|
extension Flags.Progress {
|
|
/// Creates a `ProgressConfig` based on the selected progress type.
|
|
///
|
|
/// For `.none`, progress updates are disabled. For `.ansi`, the given parameters
|
|
/// are used as-is. For `.plain`, ANSI-incompatible features (spinner, clear on finish)
|
|
/// are disabled and the output mode is set to `.plain`.
|
|
func makeConfig(
|
|
description: String = "",
|
|
itemsName: String = "it",
|
|
showTasks: Bool = false,
|
|
showItems: Bool = false,
|
|
showSpeed: Bool = true,
|
|
ignoreSmallSize: Bool = false,
|
|
totalTasks: Int? = nil
|
|
) throws -> ProgressConfig {
|
|
switch progress {
|
|
case .none:
|
|
return try ProgressConfig(disableProgressUpdates: true)
|
|
case .ansi, .plain:
|
|
let isPlain = progress == .plain
|
|
return try ProgressConfig(
|
|
description: description,
|
|
itemsName: itemsName,
|
|
showSpinner: !isPlain,
|
|
showTasks: showTasks,
|
|
showItems: showItems,
|
|
showSpeed: showSpeed,
|
|
ignoreSmallSize: ignoreSmallSize,
|
|
totalTasks: totalTasks,
|
|
clearOnFinish: !isPlain,
|
|
outputMode: isPlain ? .plain : .ansi
|
|
)
|
|
}
|
|
}
|
|
}
|