From cfa2cb6ec77f8faaab134c296350b982ff1ffe40 Mon Sep 17 00:00:00 2001
From: Kyle Criddle <criddle.kyle@gmail.com>
Date: Thu, 19 Mar 2020 20:46:19 -0600
Subject: [PATCH] --file-name for normal files. integration tests.

---
 src/printer.rs             |  17 ++++++++---
 tests/examples/test.binary | Bin 0 -> 4 bytes
 tests/integration_tests.rs |  57 +++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 tests/examples/test.binary

diff --git a/src/printer.rs b/src/printer.rs
index 203a125b..0c5f7fdc 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -228,9 +228,10 @@ impl<'a> Printer for InteractivePrinter<'a> {
         if !self.config.output_components.header() {
             if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable {
                 let input = match file {
-                    InputFile::Ordinary(filename) => {
-                        format!("file '{}'", filename.to_string_lossy())
-                    }
+                    InputFile::Ordinary(filename) => format!(
+                        "file '{}'",
+                        self.config.filename.unwrap_or(&filename.to_string_lossy())
+                    ),
                     _ => self.config.filename.unwrap_or("STDIN").to_owned(),
                 };
 
@@ -266,7 +267,15 @@ impl<'a> Printer for InteractivePrinter<'a> {
         }
 
         let (prefix, name) = match file {
-            InputFile::Ordinary(filename) => ("File: ", filename.to_string_lossy()),
+            InputFile::Ordinary(filename) => (
+                "File: ",
+                Cow::from(
+                    self.config
+                        .filename
+                        .unwrap_or(&filename.to_string_lossy())
+                        .to_owned(),
+                ),
+            ),
             _ => (
                 "File: ",
                 Cow::from(self.config.filename.unwrap_or("STDIN").to_owned()),
diff --git a/tests/examples/test.binary b/tests/examples/test.binary
new file mode 100644
index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4
GIT binary patch
literal 4
LcmZQzU|;|M00aO5

literal 0
HcmV?d00001

diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 0d5f4a3c..f2722339 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -541,3 +541,60 @@ fn empty_file_leads_to_empty_output_with_grid_enabled() {
         .success()
         .stdout("");
 }
+
+#[test]
+fn filename_basic() {
+    bat()
+        .arg("test.txt")
+        .arg("--decorations=always")
+        .arg("--style=header")
+        .arg("-r=0:0")
+        .arg("--file-name=foo")
+        .assert()
+        .success()
+        .stdout("File: foo\n")
+        .stderr("");
+}
+
+#[test]
+fn filename_binary() {
+    bat()
+        .arg("test.binary")
+        .arg("--decorations=always")
+        .arg("--style=header")
+        .arg("-r=0:0")
+        .arg("--file-name=foo")
+        .assert()
+        .success()
+        .stdout("File: foo   <BINARY>\n")
+        .stderr("");
+}
+
+#[test]
+fn filename_stdin() {
+    bat()
+        .arg("--decorations=always")
+        .arg("--style=header")
+        .arg("-r=0:0")
+        .arg("-")
+        .write_stdin("stdin\n")
+        .arg("--file-name=foo")
+        .assert()
+        .success()
+        .stdout("File: foo\n")
+        .stderr("");
+}
+
+#[test]
+fn filename_stdin_binary() {
+    let vec = vec![0; 1];
+    bat_with_config()
+        .arg("--decorations=always")
+        .arg("--style=header")
+        .write_stdin(vec)
+        .arg("--file-name=foo")
+        .assert()
+        .success()
+        .stdout("File: foo   <BINARY>\n")
+        .stderr("");
+}