7779d9f · bat · git.iko.soy

git.iko.soy/bat

Allow for non-unicode filenames, closes #225

commit7779d9f6221b3e98c43a43ceb5596ba285fdf4f8 authorsharkdp <davidpeter@web.de> dateWed 12 Feb 2020, 23:23 (7 years ago) parente98f34b

6 files changed+16−11

compare with master

unifiedsplit

examples/simple.rs+1−1 src/bin/bat/app.rs+1−1 src/bin/bat/main.rs+2−1 src/diff.rs+4−2 src/inputfile.rs+4−3 src/printer.rs+4−3

examples/simple.rs+1−1

@@ -9,7 +9,7 @@ use console::Term;

99use std::process;

1010

1111fn main() {

12− let files = std::env::args().skip(1).collect::<Vec<_>>();

12+ let files = std::env::args_os().skip(1).collect::<Vec<_>>();

1313

1414 if files.is_empty() {

1515 eprintln!("No input files specified");

src/bin/bat/app.rs+1−1

@@ -227,7 +227,7 @@ impl App {

227227

228228 fn files(&self) -> Vec<InputFile> {

229229 self.matches

230− .values_of("FILE")

230+ .values_of_os("FILE")

231231 .map(|values| {

232232 values

233233 .map(|filename| {

src/bin/bat/main.rs+2−1

@@ -13,6 +13,7 @@ use std::io;

1313use std::io::Write;

1414use std::path::Path;

1515use std::process;

16+use std::ffi::OsStr;

1617

1718use ansi_term::Colour::Green;

1819use ansi_term::Style;

@@ -160,7 +161,7 @@ fn run() -> Result<bool> {

160161 Ok(true)

161162 } else {

162163 let mut config = app.config()?;

163− config.files = vec![InputFile::Ordinary(&"cache")];

164+ config.files = vec![InputFile::Ordinary(OsStr::new("cache"))];

164165

165166 run_controller(&config)

166167 }

src/diff.rs+4−2

@@ -1,7 +1,9 @@

1−use git2::{DiffOptions, IntoCString, Repository};

21use std::collections::HashMap;

32use std::fs;

43use std::path::Path;

4+use std::ffi::OsStr;

6+use git2::{DiffOptions, IntoCString, Repository};

68#[derive(Copy, Clone, Debug)]

79pub enum LineChange {

@@ -13,7 +15,7 @@ pub enum LineChange {

1315

1416pub type LineChanges = HashMap<u32, LineChange>;

1517

16−pub fn get_git_diff(filename: &str) -> Option<LineChanges> {

18+pub fn get_git_diff(filename: &OsStr) -> Option<LineChanges> {

1719 let repo = Repository::discover(&filename).ok()?;

1820

1921 let repo_path_absolute = fs::canonicalize(repo.workdir()?).ok()?;

src/inputfile.rs+4−3

@@ -1,5 +1,6 @@

11use std::fs::File;

22use std::io::{self, BufRead, BufReader};

3+use std::ffi::OsStr;

45use content_inspector::{self, ContentType};

@@ -54,7 +55,7 @@ impl<'a> InputFileReader<'a> {

5455#[derive(Debug, Clone, Copy, PartialEq)]

5556pub enum InputFile<'a> {

5657 StdIn,

57− Ordinary(&'a str),

58+ Ordinary(&'a OsStr),

5859 ThemePreviewFile,

5960}

6061

@@ -63,10 +64,10 @@ impl<'a> InputFile<'a> {

6364 match self {

6465 InputFile::StdIn => Ok(InputFileReader::new(stdin.lock())),

6566 InputFile::Ordinary(filename) => {

66− let file = File::open(filename).map_err(|e| format!("'{}': {}", filename, e))?;

67+ let file = File::open(filename).map_err(|e| format!("'{}': {}", filename.to_string_lossy(), e))?;

6768

6869 if file.metadata()?.is_dir() {

69− return Err(format!("'{}' is a directory.", filename).into());

70+ return Err(format!("'{}' is a directory.", filename.to_string_lossy()).into());

7071 }

7172

7273 Ok(InputFileReader::new(BufReader::new(file)))

src/printer.rs+4−3

@@ -1,5 +1,6 @@

11use std::io::Write;

22use std::vec::Vec;

3+use std::borrow::Cow;

45use ansi_term::Colour::{Fixed, Green, Red, Yellow};

56use ansi_term::Style;

@@ -225,7 +226,7 @@ impl<'a> Printer for InteractivePrinter<'a> {

225226 if !self.config.output_components.header() {

226227 if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable {

227228 let input = match file {

228− InputFile::Ordinary(filename) => format!("file '{}'", filename),

229+ InputFile::Ordinary(filename) => format!("file '{}'", filename.to_string_lossy()),

229230 _ => "STDIN".into(),

230231 };

231232

@@ -261,8 +262,8 @@ impl<'a> Printer for InteractivePrinter<'a> {

261262 }

262263

263264 let (prefix, name) = match file {

264− InputFile::Ordinary(filename) => ("File: ", filename),

265− _ => ("", "STDIN"),

265+ InputFile::Ordinary(filename) => ("File: ", filename.to_string_lossy()),

266+ _ => ("", Cow::from("STDIN")),

266267 };

267268

268269 let mode = match self.content_type {