RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Getting it to display the correct directory size

Browse source
This commit is contained in:
Derek Chiang 2013-12-08 01:36:36 -05:00
parent 661ac1be78
commit 5ab82df876
1 changed files with 102 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

124
du/du.rs
View file

@ -16,30 +16,47 @@ use std::io::stderr;
use std::io::fs;
use std::io::FileStat;
use std::path::Path;
use std::uint;
use std::comm::{Port, Chan, SharedChan, stream};
use extra::arc::Arc;
use extra::future::Future;
use extra::getopts::groups;
use extra::getopts::{groups, Matches};
static VERSION: &'static str = "1.0.0";
fn du(path: &Path) -> ~[Arc<FileStat>] {
fn du(path: &Path, matches_arc: Arc<Matches>) -> ~[Arc<FileStat>] {
let mut stats = ~[];
let mut futures = ~[];
stats.push(Arc::new(path.stat()));
let matches = matches_arc.get();
let mut my_stat = path.stat();
for f in fs::readdir(path).move_iter() {
match f.is_file() {
true => stats.push(Arc::new(f.stat())),
false => futures.push(do Future::spawn { du(&f) })
true => {
let stat = f.stat();
my_stat.size += stat.size;
if matches.opt_present("all") {
stats.push(Arc::new(stat))
}
}
false => {
let ma_clone = matches_arc.clone();
futures.push(do Future::spawn { du(&f, ma_clone) })
}
}
}
for future in futures.mut_iter() {
stats.push_all(future.get());
for stat_arc in future.get().move_rev_iter() {
let stat = stat_arc.get();
if stat.path.dir_path() == my_stat.path {
my_stat.size += stat.size;
}
stats.push(stat_arc.clone());
}
}
stats.push(Arc::new(my_stat));
return stats;
}
@ -47,13 +64,68 @@ fn main() {
let args = os::args();
let program = args[0].clone();
let opts = ~[
// In task
groups::optflag("a", "all", " write counts for all files, not just directories"),
groups::optflag("", "apparent-size", "print apparent sizes, rather than disk usage;
although the apparent size is usually smaller, it may be larger due to holes
in ('sparse') files, internal fragmentation, indirect blocks, and the like"),
groups::optopt("B", "block-size", "scale sizes by SIZE before printing them.
E.g., '-BM' prints sizes in units of 1,048,576 bytes. See SIZE format below.",
"SIZE"),
// // In main
// groups::optflag("", "apparent-size", "print apparent sizes, rather than disk usage;
// although the apparent size is usually smaller, it may be larger due to holes
// in ('sparse') files, internal fragmentation, indirect blocks, and the like"),
// In main
// groups::optopt("B", "block-size", "scale sizes by SIZE before printing them.
// E.g., '-BM' prints sizes in units of 1,048,576 bytes. See SIZE format below.",
// "SIZE"),
// // In main
// groups::optflag("b", "bytes", "equivalent to '--apparent-size --block-size=1'"),
// In main
groups::optflag("c", "total", "produce a grand total"),
// In task
// groups::optflag("D", "dereference-args", "dereference only symlinks that are listed
// on the command line"),
// In main
// groups::optopt("", "files0-from", "summarize disk usage of the NUL-terminated file
// names specified in file F;
// If F is - then read names from standard input", "F"),
// // In task
// groups::optflag("H", "", "equivalent to --dereference-args (-D)"),
// In main
groups::optflag("h", "human-readable", "print sizes in human readable format (e.g., 1K 234M 2G)"),
// In main
groups::optflag("", "si", "like -h, but use powers of 1000 not 1024"),
// In main
groups::optflag("k", "", "like --block-size=1K"),
// // In task
// groups::optflag("l", "count-links", "count sizes many times if hard linked"),
// // In main
// groups::optflag("m", "", "like --block-size=1M"),
// // In task
// groups::optflag("L", "dereference", "dereference all symbolic links"),
// // In task
// groups::optflag("P", "no-dereference", "don't follow any symbolic links (this is the default)"),
// // In main
groups::optflag("0", "null", "end each output line with 0 byte rather than newline"),
// In main?
groups::optflag("S", "separate-dirs", "do not include size of subdirectories"),
// In main
groups::optflag("s", "summarize", "display only a total for each argument"),
// // In task
// groups::optflag("x", "one-file-system", "skip directories on different file systems"),
// // In task
// groups::optopt("X", "exclude-from", "exclude files that match any pattern in FILE", "FILE"),
// // In task
// groups::optopt("", "exclude", "exclude files that match PATTERN", "PATTERN"),
// // In main
groups::optopt("d", "max-depth", "print the total for a directory (or file, with --all)
only if it is N or fewer levels below the command
line argument; --max-depth=0 is the same as --summarize", "N"),
// // In main
// groups::optflag("", "time", "show time of the last modification of any file in the
// directory, or any of its subdirectories"),
// // In main
// groups::optopt("", "time", "show time as WORD instead of modification time:
// atime, access, use, ctime or status", "WORD"),
// // In main
// groups::optopt("", "time-style", "show times using style STYLE:
// full-iso, long-iso, iso, +FORMAT FORMAT is interpreted like 'date'", "STYLE"),
groups::optflag("", "help", "display this help and exit"),
groups::optflag("", "version", "output version information and exit"),
];
@ -76,20 +148,28 @@ fn main() {
println!(" {0:s} [OPTION]... --files0-from=F", program);
println("");
println(groups::usage("Summarize disk usage of each FILE, recursively for directories.", opts));
return;
println("Display values are in units of the first available SIZE from
--block-size, and the DU_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environ‐
ment variables. Otherwise, units default to 1024 bytes (or 512 if
POSIXLY_CORRECT is set).
SIZE is an integer and optional unit (example: 10M is 10*1024*1024).
Units are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (pow‐
ers of 1000).");
return
}
if !matches.free.is_empty() {
}
let strs = match matches.free {
[] => ~[~"./"],
x => x
let strs = matches.free.clone();
let strs = match strs.is_empty() {
true => ~[~"./"],
false => strs
};
let matches_arc = Arc::new(matches);
for path_str in strs.iter() {
let path = Path::init(path_str.clone());
for stat_arc in du(&path).move_iter() {
for stat_arc in du(&path, matches_arc.clone()).move_iter() {
let stat = stat_arc.get();
println!("{:<10} {}", stat.size, stat.path.display());
}