extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 00:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove total from size command

Browse Source 
There is a plan to introduce general facility for subtotaling numeric
columns.
This commit is contained in:
Odin Dutton 2019-05-27 08:38:26 +10:00
parent 8464bcbb70
commit 4296466cd2
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/commands/size.rs
View File

@ -12,43 +12,25 @@ pub fn size(args: CommandArgs) -> Result<OutputStream, ShellError> {
let cwd = args.env.lock().unwrap().cwd().to_path_buf();
let mut contents = String::new();
let mut total_lines = 0;
let mut total_words = 0;
let mut total_chars = 0;
let mut total_bytes = 0;
let mut list = VecDeque::new();
for name in args.args {
let name = name.as_string()?;
let path = cwd.join(&name);
let mut file = File::open(path)?;
file.read_to_string(&mut contents)?;
let (lines, words, chars, bytes) = count(&contents);
total_lines += lines;
total_words += words;
total_chars += chars;
total_bytes += bytes;
list.push_back(dict(&name, lines, words, chars, bytes));
list.push_back(count(&name, &contents));
contents.clear();
}
list.push_back(dict(
&"total".to_string(),
total_lines,
total_words,
total_chars,
total_bytes,
));
Ok(list.boxed())
}
fn count(contents: &str) -> (i64, i64, i64, i64) {
fn count(name: &str, contents: &str) -> ReturnValue {
let mut lines: i64 = 0;
let mut words: i64 = 0;
let mut chars: i64 = 0;
let bytes = contents.len() as i64;
let mut end_of_word = true;
for c in contents.chars() {
@ -69,10 +51,6 @@ fn count(contents: &str) -> (i64, i64, i64, i64) {
}
}
(lines, words, chars, contents.len() as i64)
}
fn dict(name: &str, lines: i64, words: i64, chars: i64, bytes: i64) -> ReturnValue {
let mut dict = Dictionary::default();
dict.add("name", Value::string(name.to_owned()));
dict.add("lines", Value::int(lines));