Add *_with_name methods

This commit is contained in:
sharkdp 2020-04-22 22:41:25 +02:00 committed by David Peter
parent 53a973e9dd
commit 261a7ea154
5 changed files with 37 additions and 13 deletions

View File

@ -27,7 +27,9 @@ fn main() {
PrettyPrinter::new()
.language("yaml")
.line_numbers(true)
.input_from_bytes(&bytes)
.grid(true)
.header(true)
.input_from_bytes_with_name(&bytes, "person.yaml")
.print()
.unwrap();
}

View File

@ -311,8 +311,7 @@ mod tests {
}
fn syntax_for_stdin_with_content(&self, file_name: &str, content: &[u8]) -> String {
let mut input = Input::stdin();
input.set_provided_name(Some(OsStr::new(file_name)));
let input = Input::stdin().with_name(Some(OsStr::new(file_name)));
let mut opened_input = input.open(content).unwrap();
let syntax = self

View File

@ -246,8 +246,7 @@ impl App {
let files: Option<Vec<&OsStr>> = self.matches.values_of_os("FILE").map(|vs| vs.collect());
if files.is_none() {
let mut input = Input::stdin();
input.set_provided_name(filenames_or_none.nth(0).unwrap_or(None));
let input = Input::stdin().with_name(filenames_or_none.nth(0).unwrap_or(None));
return Ok(vec![input]);
}
let files_or_none: Box<dyn Iterator<Item = _>> = match files {
@ -259,13 +258,9 @@ impl App {
for (filepath, provided_name) in files_or_none.zip(filenames_or_none) {
if let Some(filepath) = filepath {
if filepath.to_str().unwrap_or_default() == "-" {
let mut input = Input::stdin();
input.set_provided_name(provided_name);
file_input.push(input);
file_input.push(Input::stdin().with_name(provided_name));
} else {
let mut input = Input::ordinary_file(filepath);
input.set_provided_name(provided_name);
file_input.push(input);
file_input.push(Input::ordinary_file(filepath).with_name(provided_name));
}
}
}

View File

@ -82,8 +82,9 @@ impl<'a> Input<'a> {
}
}
pub fn set_provided_name(&mut self, provided_name: Option<&OsStr>) {
pub fn with_name(mut self, provided_name: Option<&OsStr>) -> Self {
self.metadata.user_provided_name = provided_name.map(|n| n.to_owned());
self
}
pub(crate) fn open<R: BufRead + 'a>(self, stdin: R) -> Result<OpenedInput<'a>> {

View File

@ -79,17 +79,44 @@ impl<'a> PrettyPrinter<'a> {
self
}
/// Use a string as an input
/// Add STDIN as an input (with customized name)
pub fn input_stdin_with_name(&mut self, name: impl AsRef<OsStr>) -> &mut Self {
self.inputs
.push(Input::stdin().with_name(Some(name.as_ref())));
self
}
/// Add a byte string as an input
pub fn input_from_bytes(&mut self, content: &'a [u8]) -> &mut Self {
self.input_from_reader(content)
}
/// Add a byte string as an input (with customized name)
pub fn input_from_bytes_with_name(
&mut self,
content: &'a [u8],
name: impl AsRef<OsStr>,
) -> &mut Self {
self.input_from_reader_with_name(content, name)
}
/// Add a custom reader as an input
pub fn input_from_reader<R: Read + 'a>(&mut self, reader: R) -> &mut Self {
self.inputs.push(Input::from_reader(Box::new(reader)));
self
}
/// Add a custom reader as an input (with customized name)
pub fn input_from_reader_with_name<R: Read + 'a>(
&mut self,
reader: R,
name: impl AsRef<OsStr>,
) -> &mut Self {
self.inputs
.push(Input::from_reader(Box::new(reader)).with_name(Some(name.as_ref())));
self
}
/// Specify the syntax file which should be used (default: auto-detect)
pub fn language(&mut self, language: &'a str) -> &mut Self {
self.config.language = Some(language);