Merge branch 'master' into print

2024-11-22 07:43:39 +01:00 · 2024-10-31 15:04:14 +09:00 · 2024-10-31 15:04:14 +09:00 · ca43c7a8f8
commit ca43c7a8f8
parent c533a4aa14 50fa25db60
13 changed files with 146 additions and 22 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,6 +9,7 @@
 - Syntax highlighting for JavaScript files that start with `#!/usr/bin/env bun` #2913 (@sharunkumar)
 - `bat --strip-ansi={never,always,auto}` to remove ANSI escape sequences from bat's input, see #2999 (@eth-p)
 - Add or remove individual style components without replacing all styles #2929 (@eth-p)
+- Add option `--binary=as-text` for printing binary content, see issue #2974 and PR #2976 (@einfachIrgendwer0815)

 ## Bugfixes

@ -18,6 +19,7 @@
 - Fix handling of inputs with combined ANSI color and attribute sequences, see #2185 and #2856 (@eth-p)
 - Fix panel width when line 10000 wraps, see #2854 (@eth-p)
 - Fix compile issue of `time` dependency caused by standard library regression #3045 (@cyqsimon)
+- Fix override behavior of --plain and --paging, see issue #2731 and PR #3108 (@einfachIrgendwer0815)

 ## Other

@ -44,6 +46,7 @@
 - Use bat's ANSI iterator during tab expansion, see #2998 (@eth-p)
 - Support 'statically linked binary' for aarch64 in 'Release' page, see #2992 (@tzq0301)
 - Update options in shell completions and the man page of `bat`, see #2995 (@akinomyoga)
+- Update nix dev-dependency to v0.29.0, see #3112 (@decathorpe)

 ## Syntaxes

@ -61,6 +64,7 @@
 - Add support for [CFML](https://www.adobe.com/products/coldfusion-family.html), see #3031 (@brenton-at-pieces)
 - Map `*.mkd` files to `Markdown` syntax, see issue #3060 and PR #3061 (@einfachIrgendwer0815)
 - Add syntax mapping for kubernetes config files #3049 (@cyqsimon)
+- Add syntax mapping for `/etc/pacman.conf` #2961 (@cyqsimon)

 ## Themes

--- a/Cargo.lock
+++ b/Cargo.lock
@ -243,6 +243,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "clap"
 version = "4.4.12"
@ -688,9 +694,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"

 [[package]]
 name = "libgit2-sys"
@ -761,12 +767,13 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.26.4"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
 "cfg-if",
+ "cfg_aliases",
 "libc",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@ -98,7 +98,7 @@ tempfile = "3.8.1"
 serde = { version = "1.0", features = ["derive"] }

 [target.'cfg(unix)'.dev-dependencies]
-nix = { version = "0.26.4", default-features = false, features = ["term"] }
+nix = { version = "0.29", default-features = false, features = ["term"] }

 [build-dependencies]
 anyhow = "1.0.86"
--- a/doc/long-help.txt
+++ b/doc/long-help.txt
@ -20,6 +20,13 @@ Options:
            * unicode (␇, ␊, ␀, ..)
            * caret   (^G, ^J, ^@, ..)

+      --binary <behavior>
+          How to treat binary content. (default: no-printing)
+          
+          Possible values:
+            * no-printing: do not print any binary content
+            * as-text: treat binary content as normal text
+
  -p, --plain...
          Only show plain style, no decorations. This is an alias for '--style=plain'. When '-p' is
          used twice ('-pp'), it also disables automatic paging (alias for '--style=plain
--- a/doc/short-help.txt
+++ b/doc/short-help.txt
@ -11,6 +11,8 @@ Options:
          Show non-printable characters (space, tab, newline, ..).
      --nonprintable-notation <notation>
          Set notation for non-printable characters.
+      --binary <behavior>
+          How to treat binary content. (default: no-printing)
  -p, --plain...
          Show plain style (alias for '--style=plain').
  -l, --language <language>
--- a/src/bin/bat/app.rs
+++ b/src/bin/bat/app.rs
@ -9,6 +9,7 @@ use crate::{
    config::{get_args_from_config_file, get_args_from_env_opts_var, get_args_from_env_vars},
 };
 use bat::style::StyleComponentList;
+use bat::BinaryBehavior;
 use bat::StripAnsiMode;
 use clap::ArgMatches;

@ -97,12 +98,30 @@ impl App {
    pub fn config(&self, inputs: &[Input]) -> Result<Config> {
        let style_components = self.style_components()?;

+        let extra_plain = self.matches.get_count("plain") > 1;
+        let plain_last_index = self
+            .matches
+            .indices_of("plain")
+            .and_then(Iterator::max)
+            .unwrap_or_default();
+        let paging_last_index = self
+            .matches
+            .indices_of("paging")
+            .and_then(Iterator::max)
+            .unwrap_or_default();
+
        let paging_mode = match self.matches.get_one::<String>("paging").map(|s| s.as_str()) {
-            Some("always") => PagingMode::Always,
+            Some("always") => {
+                // Disable paging if the second -p (or -pp) is specified after --paging=always
+                if extra_plain && plain_last_index > paging_last_index {
+                    PagingMode::Never
+                } else {
+                    PagingMode::Always
+                }
+            }
            Some("never") => PagingMode::Never,
            Some("auto") | None => {
                // If we have -pp as an option when in auto mode, the pager should be disabled.
-                let extra_plain = self.matches.get_count("plain") > 1;
                if extra_plain || self.matches.get_flag("no-paging") {
                    PagingMode::Never
                } else if inputs.iter().any(Input::is_stdin) {
@ -193,6 +212,11 @@ impl App {
                Some("caret") => NonprintableNotation::Caret,
                _ => unreachable!("other values for --nonprintable-notation are not allowed"),
            },
+            binary: match self.matches.get_one::<String>("binary").map(|s| s.as_str()) {
+                Some("as-text") => BinaryBehavior::AsText,
+                Some("no-printing") => BinaryBehavior::NoPrinting,
+                _ => unreachable!("other values for --binary are not allowed"),
+            },
            wrapping_mode: if self.interactive_output || maybe_term_width.is_some() {
                if !self.matches.get_flag("chop-long-lines") {
                    match self.matches.get_one::<String>("wrap").map(|s| s.as_str()) {
--- a/src/bin/bat/clap_app.rs
+++ b/src/bin/bat/clap_app.rs
@ -77,11 +77,26 @@ pub fn build_app(interactive_output: bool) -> Command {
                    * caret   (^G, ^J, ^@, ..)",
                ),
        )
+        .arg(
+            Arg::new("binary")
+                .long("binary")
+                .action(ArgAction::Set)
+                .default_value("no-printing")
+                .value_parser(["no-printing", "as-text"])
+                .value_name("behavior")
+                .hide_default_value(true)
+                .help("How to treat binary content. (default: no-printing)")
+                .long_help(
+                    "How to treat binary content. (default: no-printing)\n\n\
+                    Possible values:\n  \
+                    * no-printing: do not print any binary content\n  \
+                    * as-text: treat binary content as normal text",
+                ),
+        )
        .arg(
            Arg::new("plain")
                .overrides_with("plain")
                .overrides_with("number")
-                .overrides_with("paging")
                .short('p')
                .long("plain")
                .action(ArgAction::Count)
@ -306,7 +321,6 @@ pub fn build_app(interactive_output: bool) -> Command {
                .long("paging")
                .overrides_with("paging")
                .overrides_with("no-paging")
-                .overrides_with("plain")
                .value_name("when")
                .value_parser(["auto", "never", "always"])
                .default_value("auto")
--- a/src/config.rs
+++ b/src/config.rs
@ -1,5 +1,5 @@
 use crate::line_range::{HighlightedLineRanges, LineRanges};
-use crate::nonprintable_notation::NonprintableNotation;
+use crate::nonprintable_notation::{BinaryBehavior, NonprintableNotation};
 #[cfg(feature = "paging")]
 use crate::paging::PagingMode;
 use crate::style::StyleComponents;
@ -44,6 +44,9 @@ pub struct Config<'a> {
    /// The configured notation for non-printable characters
    pub nonprintable_notation: NonprintableNotation,

+    /// How to treat binary content
+    pub binary: BinaryBehavior,
+
    /// The character width of the terminal
    pub term_width: usize,

--- a/src/lib.rs
+++ b/src/lib.rs
@ -52,7 +52,7 @@ mod terminal;
 mod vscreen;
 pub(crate) mod wrapping;

-pub use nonprintable_notation::NonprintableNotation;
+pub use nonprintable_notation::{BinaryBehavior, NonprintableNotation};
 pub use preprocessor::StripAnsiMode;
 pub use pretty_printer::{Input, PrettyPrinter, Syntax};
 pub use syntax_mapping::{MappingTarget, SyntaxMapping};
--- a/src/nonprintable_notation.rs
+++ b/src/nonprintable_notation.rs
@ -10,3 +10,15 @@ pub enum NonprintableNotation {
    #[default]
    Unicode,
 }
+
+/// How to treat binary content
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum BinaryBehavior {
+    /// Do not print any binary content
+    #[default]
+    NoPrinting,
+
+    /// Treat binary content as normal text
+    AsText,
+}
--- a/src/printer.rs
+++ b/src/printer.rs
@ -35,6 +35,7 @@ use crate::style::StyleComponent;
 use crate::terminal::{as_terminal_escaped, to_ansi_color};
 use crate::vscreen::{AnsiStyle, EscapeSequence, EscapeSequenceIterator};
 use crate::wrapping::WrappingMode;
+use crate::BinaryBehavior;
 use crate::StripAnsiMode;

 const ANSI_UNDERLINE_ENABLE: EscapeSequence = EscapeSequence::CSI {
@ -268,7 +269,8 @@ impl<'a> InteractivePrinter<'a> {
            .content_type
            .map_or(false, |c| c.is_binary() && !config.show_nonprintable);

-        let needs_to_match_syntax = !is_printing_binary
+        let needs_to_match_syntax = (!is_printing_binary
+            || matches!(config.binary, BinaryBehavior::AsText))
            && (config.colored_output || config.strip_ansi == StripAnsiMode::Auto);

        let (is_plain_text, highlighter_from_set) = if needs_to_match_syntax {
@ -458,7 +460,10 @@ impl<'a> Printer for InteractivePrinter<'a> {
        }

        if !self.config.style_components.header() {
-            if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable {
+            if Some(ContentType::BINARY) == self.content_type
+                && !self.config.show_nonprintable
+                && !matches!(self.config.binary, BinaryBehavior::AsText)
+            {
                writeln!(
                    handle,
                    "{}: Binary content from {} will not be printed to the terminal \
@ -539,7 +544,10 @@ impl<'a> Printer for InteractivePrinter<'a> {
            })?;

        if self.config.style_components.grid() {
-            if self.content_type.map_or(false, |c| c.is_text()) || self.config.show_nonprintable {
+            if self.content_type.map_or(false, |c| c.is_text())
+                || self.config.show_nonprintable
+                || matches!(self.config.binary, BinaryBehavior::AsText)
+            {
                self.print_horizontal_line(handle, '┼')?;
            } else {
                self.print_horizontal_line(handle, '┴')?;
@ -551,7 +559,9 @@ impl<'a> Printer for InteractivePrinter<'a> {

    fn print_footer(&mut self, handle: &mut OutputHandle, _input: &OpenedInput) -> Result<()> {
        if self.config.style_components.grid()
-            && (self.content_type.map_or(false, |c| c.is_text()) || self.config.show_nonprintable)
+            && (self.content_type.map_or(false, |c| c.is_text())
+                || self.config.show_nonprintable
+                || matches!(self.config.binary, BinaryBehavior::AsText))
        {
            self.print_horizontal_line(handle, '┴')
        } else {
@ -599,7 +609,9 @@ impl<'a> Printer for InteractivePrinter<'a> {
            .into()
        } else {
            let mut line = match self.content_type {
-                Some(ContentType::BINARY) | None => {
+                Some(ContentType::BINARY) | None
+                    if !matches!(self.config.binary, BinaryBehavior::AsText) =>
+                {
                    return Ok(());
                }
                Some(ContentType::UTF_16LE) => UTF_16LE.decode_with_bom_removal(line_buffer).0,
--- a/src/syntax_mapping/builtins/linux/50-pacman.toml
+++ b/src/syntax_mapping/builtins/linux/50-pacman.toml
@ -1,3 +1,8 @@
 [mappings]
-# pacman hooks
-"INI" = ["/usr/share/libalpm/hooks/*.hook", "/etc/pacman.d/hooks/*.hook"]
+"INI" = [
+    # config
+    "/etc/pacman.conf",
+    # hooks
+    "/usr/share/libalpm/hooks/*.hook",
+    "/etc/pacman.d/hooks/*.hook",
+]
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@ -9,7 +9,6 @@ use tempfile::tempdir;
 mod unix {
    pub use std::fs::File;
    pub use std::io::{self, Write};
-    pub use std::os::unix::io::FromRawFd;
    pub use std::path::PathBuf;
    pub use std::process::Stdio;
    pub use std::thread;
@ -416,8 +415,8 @@ fn no_args_doesnt_break() {
    // not exit, because in this case it is safe to read and write to the same fd, which is why
    // this test exists.
    let OpenptyResult { master, slave } = openpty(None, None).expect("Couldn't open pty.");
-    let mut master = unsafe { File::from_raw_fd(master) };
-    let stdin_file = unsafe { File::from_raw_fd(slave) };
+    let mut master = File::from(master);
+    let stdin_file = File::from(slave);
    let stdout_file = stdin_file.try_clone().unwrap();
    let stdin = Stdio::from(stdin_file);
    let stdout = Stdio::from(stdout_file);
@ -1020,6 +1019,31 @@ fn enable_pager_if_pp_flag_comes_before_paging() {
        .stdout(predicate::eq("pager-output\n").normalize());
 }

+#[test]
+fn paging_does_not_override_simple_plain() {
+    bat()
+        .env("PAGER", "echo pager-output")
+        .arg("--decorations=always")
+        .arg("--plain")
+        .arg("--paging=never")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout(predicate::eq("hello world\n"));
+}
+
+#[test]
+fn simple_plain_does_not_override_paging() {
+    bat()
+        .env("PAGER", "echo pager-output")
+        .arg("--paging=always")
+        .arg("--plain")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout(predicate::eq("pager-output\n"));
+}
+
 #[test]
 fn pager_failed_to_parse() {
    bat()
@ -1939,6 +1963,16 @@ fn show_all_with_unicode() {
        .stderr("");
 }

+#[test]
+fn binary_as_text() {
+    bat()
+        .arg("--binary=as-text")
+        .arg("control_characters.txt")
+        .assert()
+        .stdout("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F")
+        .stderr("");
+}
+
 #[test]
 fn no_paging_arg() {
    bat()