mirror of
https://github.com/docker/compose.git
synced 2026-10-12 02:13:08 +00:00
Nicolas De Loof
cccb9f1f7e
The display.Mode package global was left as "auto" on the most common path (auto mode with an interactive or redirected terminal), so readers like `up`'s NavigationMenu gate saw an unresolved value; that gate also compared against the string literal "plain" instead of the constant. applyDisplayMode wrote a mode that selectEventProcessor could then contradict (--ansi always with a redirected stderr rendered Plain while Mode said tty). selectEventProcessor becomes the single resolution point: every branch assigns the mode matching the renderer it returns, so after command setup the global never holds ModeAuto. applyDisplayMode loses its redundant writes and its misleading name (now applyAnsiMode); the contract is documented on the Mode variable, and the existing selectEventProcessor tests now pin the resolved mode for every branch. Side effect, deliberate: with stderr redirected (auto -> plain rendering) the navigation menu is no longer offered; it used to slip through because Mode still read "auto". Part of #14074 (section E). Signed-off-by: Nicolas De Loof <[email protected]>
40 lines
1.4 KiB
Go
40 lines
1.4 KiB
Go
/*
|
|
Copyright 2024 Docker Compose CLI 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
|
|
|
|
http://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.
|
|
*/
|
|
|
|
package display
|
|
|
|
// Mode is the effective progress rendering mode for the current command.
|
|
//
|
|
// It starts as ModeAuto and is resolved during command setup by
|
|
// selectEventProcessor (cmd/compose), which assigns the mode matching the
|
|
// renderer it returns — so code running after setup never observes ModeAuto.
|
|
// The only other writers are the `--quiet` flags of `run` and `build`, which
|
|
// force ModeQuiet from their PreRun hooks.
|
|
var Mode = ModeAuto
|
|
|
|
const (
|
|
// ModeAuto detect console capabilities
|
|
ModeAuto = "auto"
|
|
// ModeTTY use terminal capability for advanced rendering
|
|
ModeTTY = "tty"
|
|
// ModePlain dump raw events to output
|
|
ModePlain = "plain"
|
|
// ModeQuiet don't display events
|
|
ModeQuiet = "quiet"
|
|
// ModeJSON outputs a machine-readable JSON stream
|
|
ModeJSON = "json"
|
|
)
|