cli: make --quiet also suppress ConsoleOutput

bastimeyer · bastimeyer · commit 3a33046e5ecd · 2025-03-15T16:10:37.000+01:00
diff --git a/src/streamlink_cli/argparser.py b/src/streamlink_cli/argparser.py
@@ -412,9 +412,7 @@ def build_parser():
         "--quiet",
         action="store_true",
         help="""
-            Hide all log output.
-
-            Alias for --loglevel=none.
+            Suppress all console and log output, and also disable user prompts.
         """,
     )
     logging.add_argument(
diff --git a/src/streamlink_cli/main.py b/src/streamlink_cli/main.py
@@ -852,7 +852,9 @@ def setup_console() -> None:
     global console
 
     console_output: TextIO | None
-    if args.stdout or args.output == "-" or args.record == "-" or args.record_and_pipe:
+    if args.quiet:
+        console_output = None
+    elif args.stdout or args.output == "-" or args.record == "-" or args.record_and_pipe:
         # Console output should be on stderr if we are outputting a stream to stdout
         console_output = sys.stderr
     else:
diff --git a/tests/cli/main/test_logging.py b/tests/cli/main/test_logging.py
@@ -43,6 +43,7 @@ def _no_debug_logs(self, monkeypatch: pytest.MonkeyPatch):
         ("argv", "stream"),
         [
             pytest.param([], "stdout", id="default"),
+            pytest.param(["--quiet"], None, id="--quiet"),
             pytest.param(["--stdout"], "stderr", id="--stdout"),
             pytest.param(["--output=file"], "stdout", id="--output=file"),
             pytest.param(["--output=-"], "stderr", id="--output=-"),
@@ -52,18 +53,26 @@ def _no_debug_logs(self, monkeypatch: pytest.MonkeyPatch):
         ],
         indirect=["argv"],
     )
-    def test_streams(self, capsys: pytest.CaptureFixture, parser: ArgumentParser, argv: list, stream: str):
+    def test_streams(self, capsys: pytest.CaptureFixture, parser: ArgumentParser, argv: list, stream: str | None):
         streamlink_cli.main.setup(parser)
 
         rootlogger = logging.getLogger("streamlink")
         clilogger = streamlink_cli.main.log
-        streamobj = getattr(sys, stream)
+        streamobj = {
+            None: None,
+            "stdout": sys.stdout,
+            "stderr": sys.stderr,
+        }.get(stream)
 
-        assert clilogger.parent is rootlogger
-        assert isinstance(rootlogger.handlers[0], logging.StreamHandler)
-        assert rootlogger.handlers[0].stream is streamobj
         assert streamlink_cli.main.console.console_output is streamobj
         assert streamlink_cli.main.console.file_output is None
+        assert clilogger.parent is rootlogger
+        if stream is None:
+            assert not rootlogger.handlers
+        else:
+            handler = rootlogger.handlers[0]
+            assert isinstance(handler, logging.StreamHandler)
+            assert handler.stream is streamobj
 
     @pytest.mark.parametrize(
         ("argv", "stdout", "stderr"),
@@ -479,20 +488,29 @@ def logpath(self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path):
 
     # noinspection PyUnresolvedReferences
     @pytest.mark.parametrize(
-        ("argv", "stdout", "stderr"),
+        ("argv", "stream", "stdout", "stderr"),
         [
             pytest.param(
                 [],
+                "stdout",
                 "[cli][info] a\nb\n",
                 "",
                 id="no-logfile",
             ),
             pytest.param(
                 ["--logfile=file", "--loglevel=none"],
+                "stdout",
                 "b\n",
                 "",
                 id="logfile-loglevel-none",
             ),
+            pytest.param(
+                ["--logfile=file", "--quiet"],
+                None,
+                "",
+                "",
+                id="logfile-quiet",
+            ),
         ],
         indirect=["argv"],
     )
@@ -502,20 +520,32 @@ def test_no_logfile(
         capsys: pytest.CaptureFixture,
         parser: ArgumentParser,
         argv: list,
+        stream: str | None,
         stdout: str,
         stderr: str,
     ):
         mock_open = Mock()
         monkeypatch.setattr("builtins.open", mock_open)
 
+        streamobj = {
+            None: None,
+            "stdout": sys.stdout,
+            "stderr": sys.stderr,
+        }.get(stream)
+
         streamlink_cli.main.setup(parser)
 
-        rootlogger = logging.getLogger("streamlink")
-        assert isinstance(rootlogger.handlers[0], logging.StreamHandler)
-        assert rootlogger.handlers[0].stream is sys.stdout
-        assert streamlink_cli.main.console.console_output is sys.stdout
+        assert streamlink_cli.main.console.console_output is streamobj
         assert streamlink_cli.main.console.file_output is None
 
+        rootlogger = logging.getLogger("streamlink")
+        if stream is None:
+            assert not rootlogger.handlers
+        else:
+            handler = rootlogger.handlers[0]
+            assert isinstance(handler, logging.StreamHandler)
+            assert handler.stream is streamobj
+
         streamlink_cli.main.log.info("a")
         streamlink_cli.main.console.msg("b")
         out, err = capsys.readouterr()
