mirror of
https://github.com/nachoparker/dutree
synced 2024-05-10 23:36:07 +02:00
use HashMap, and other optimizations
This commit is contained in:
parent
b65c3c0b51
commit
4128d49e16
|
@ -6,16 +6,10 @@ dependencies = [
|
|||
"memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dict"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "dutree"
|
||||
version = "0.2.3"
|
||||
version = "0.2.4"
|
||||
dependencies = [
|
||||
"dict 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"terminal_size 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
@ -133,7 +127,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
|
||||
[metadata]
|
||||
"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
|
||||
"checksum dict 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "372bf4a79fc1e54f87e2888e1bfb2eebc1a72c3941b49ef56744fcf656281957"
|
||||
"checksum getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "65922871abd2f101a2eb0eaebadc66668e54a87ad9c3dd82520b5f86ede5eff9"
|
||||
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
|
||||
"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
|
||||
|
|
|
@ -10,7 +10,6 @@ homepage = "https://ownyourbits.com/2018/03/25/analize-disk-usage-with-dutree/"
|
|||
exclude = ["test/*"]
|
||||
|
||||
[dependencies]
|
||||
dict = "0.1.4"
|
||||
getopts = "0.2"
|
||||
terminal_size = "0.1.7"
|
||||
regex = "0.2"
|
||||
|
|
71
src/lib.rs
71
src/lib.rs
|
@ -45,14 +45,12 @@ use terminal_size::{Width, Height, terminal_size};
|
|||
extern crate regex;
|
||||
use regex::Regex;
|
||||
|
||||
extern crate dict;
|
||||
use dict::{ Dict, DictIface };
|
||||
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::fs;
|
||||
use std::os::linux::fs::MetadataExt;
|
||||
use std::env;
|
||||
use std::collections::HashMap;
|
||||
|
||||
const VERSTR : &str = "v0.2.0";
|
||||
const DEF_WIDTH : u16 = 80;
|
||||
|
@ -64,17 +62,17 @@ pub enum XResult<T,S> {
|
|||
}
|
||||
use XResult::{XOk, XExit, XErr};
|
||||
|
||||
struct Entry {
|
||||
struct Entry<'a> {
|
||||
name : String,
|
||||
bytes : u64,
|
||||
color : Option<String>, // TODO reference
|
||||
color : Option<&'a str>,
|
||||
last : bool,
|
||||
entries : Option<Vec<Entry>>,
|
||||
entries : Option<Vec<Entry<'a>>>,
|
||||
}
|
||||
|
||||
pub struct Config {
|
||||
paths : Vec<PathBuf>,
|
||||
color_dict : Dict<String>,
|
||||
color_dict : HashMap<String, String>,
|
||||
depth : u8,
|
||||
depth_flag : bool,
|
||||
bytes_flag : bool,
|
||||
|
@ -249,8 +247,8 @@ fn print_io_error( path: &Path, err: io::Error ) {
|
|||
eprintln!( "Couldn't read {} ({:?})", file_name_from_path( path ), err.kind() )
|
||||
}
|
||||
|
||||
impl Entry {
|
||||
fn new( path: &Path, cfg : &Config, depth : u8 ) -> Entry {
|
||||
impl<'a> Entry<'a> {
|
||||
fn new( path: &Path, cfg : &'a Config, depth : u8 ) -> Entry<'a> {
|
||||
let name = file_name_from_path( path );
|
||||
|
||||
// recursively create directory tree of entries up to depth
|
||||
|
@ -259,7 +257,7 @@ impl Entry {
|
|||
let entries = if path.is_dir() && ( !cfg.depth_flag || depth > 0 ) {
|
||||
let mut aggr_bytes = 0;
|
||||
if let Some( dir_list ) = try_read_dir( path ) {
|
||||
let mut vec : Vec<Entry> = Vec::new();
|
||||
let mut vec : Vec<Entry> = Vec::with_capacity( dir_list.size_hint().0 );
|
||||
for entry in dir_list {
|
||||
if let Some( path ) = path_from_dentry( entry ) {
|
||||
let entry_name = &file_name_from_path(&path);
|
||||
|
@ -309,11 +307,7 @@ impl Entry {
|
|||
};
|
||||
|
||||
// calculate color
|
||||
let color = if !cfg.ascii_flag {
|
||||
if let Some( col ) = color_from_path(path, &cfg.color_dict) {
|
||||
Some( col.to_string() ) // TODO use references
|
||||
} else { None }
|
||||
} else { None };
|
||||
let color = if !cfg.ascii_flag {color_from_path(path, &cfg.color_dict)} else {None};
|
||||
|
||||
Entry { name, bytes, color, last: false, entries }
|
||||
}
|
||||
|
@ -457,14 +451,14 @@ fn get_bytes( path: &Path, usage_flag : bool ) -> u64 {
|
|||
}
|
||||
}
|
||||
|
||||
fn color_from_path<'a>( path : &Path, color_dict : &'a Dict<String> ) -> Option<&'a str> {
|
||||
fn color_from_path<'a>( path : &Path, color_dict : &'a HashMap<String, String> ) -> Option<&'a str> {
|
||||
if try_is_symlink( path ) {
|
||||
if path.read_link().unwrap().exists() {
|
||||
if let Some( col ) = color_dict.get( "ln" ) {
|
||||
if let Some( col ) = color_dict.get( &"ln".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
} else {
|
||||
if let Some( col ) = color_dict.get( "or" ) {
|
||||
if let Some( col ) = color_dict.get( &"or".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
}
|
||||
|
@ -474,37 +468,37 @@ fn color_from_path<'a>( path : &Path, color_dict : &'a Dict<String> ) -> Option<
|
|||
let mode = metadata.unwrap().st_mode();
|
||||
if path.is_dir() {
|
||||
if mode & 0o002 != 0 { // dir other writable
|
||||
if let Some( col ) = color_dict.get( "ow" ) {
|
||||
if let Some( col ) = color_dict.get( &"ow".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
}
|
||||
if let Some( col ) = color_dict.get( "di" ) {
|
||||
if let Some( col ) = color_dict.get( &"di".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
}
|
||||
if mode & 0o111 != 0 { // executable
|
||||
if let Some( col ) = color_dict.get( "ex" ) {
|
||||
if let Some( col ) = color_dict.get( &"ex".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
}
|
||||
}
|
||||
if let Some( ext_str ) = path.extension() {
|
||||
for col in color_dict {
|
||||
if &col.key[..2] != "*." { continue }
|
||||
let key = col.key.trim_left_matches( "*." );
|
||||
if ext_str == key {
|
||||
return Some( &color_dict.get( col.key.as_str() ).unwrap() );
|
||||
for ( key , _ ) in color_dict {
|
||||
if &key[..2] != "*." { continue }
|
||||
let k = key.trim_left_matches( "*." );
|
||||
if ext_str == k {
|
||||
return Some( &color_dict.get( key ).unwrap() );
|
||||
}
|
||||
}
|
||||
}
|
||||
if path.is_file() {
|
||||
if let Some( col ) = color_dict.get( "fi" ) {
|
||||
if let Some( col ) = color_dict.get( &"fi".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
else { return None }
|
||||
}
|
||||
// we are assuming it can only be a 'bd','cd'. can also be 'pi','so' or 'no'
|
||||
if let Some( col ) = color_dict.get( "bd" ) {
|
||||
if let Some( col ) = color_dict.get( &"bd".to_string() ) {
|
||||
return Some( &col );
|
||||
}
|
||||
None
|
||||
|
@ -515,10 +509,11 @@ fn print_usage( program: &str, opts: &Options ) {
|
|||
print!( "{}", opts.usage( &brief ) );
|
||||
}
|
||||
|
||||
fn create_color_dict() -> Dict<String> {
|
||||
let mut color_dict = Dict::<String>::new();
|
||||
fn create_color_dict() -> HashMap<String, String> {
|
||||
let env_str = env::var("LS_COLORS").unwrap_or( "".to_string() );
|
||||
for entry in env_str.split(':') {
|
||||
let colors = env_str.split(':');
|
||||
let mut color_dict = HashMap::with_capacity( colors.size_hint().0 );
|
||||
for entry in colors {
|
||||
if entry.len() == 0 { break; }
|
||||
|
||||
let line = entry.replace( "\"", "" );
|
||||
|
@ -526,7 +521,7 @@ fn create_color_dict() -> Dict<String> {
|
|||
let key = line.next().unwrap();
|
||||
let val = line.next().unwrap();
|
||||
|
||||
color_dict.add( key.to_string(), val.to_string() );
|
||||
color_dict.insert( key.to_string(), val.to_string() );
|
||||
}
|
||||
color_dict
|
||||
}
|
||||
|
@ -536,7 +531,7 @@ pub fn run( cfg: &Config ) {
|
|||
Entry::new( cfg.paths[0].as_path(), &cfg, cfg.depth + 1 )
|
||||
} else {
|
||||
let mut bytes = 0;
|
||||
let mut entries : Vec<Entry> = Vec::new();
|
||||
let mut entries : Vec<Entry> = Vec::with_capacity( cfg.paths.len() );
|
||||
|
||||
for path in &cfg.paths {
|
||||
let e = Entry::new( path.as_path(), &cfg, cfg.depth + 1 );
|
||||
|
@ -565,11 +560,11 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn parse_ls_colors() {
|
||||
let mut dict = Dict::<String>::new();
|
||||
dict.add( "di".to_string(), "dircode".to_string() );
|
||||
dict.add( "li".to_string(), "linkcod".to_string() );
|
||||
dict.add( "*.mp3".to_string(), "mp3code".to_string() );
|
||||
dict.add( "*.tar".to_string(), "tarcode".to_string() );
|
||||
let mut dict = HashMap::<String, String>::new();
|
||||
dict.insert( "di".to_string(), "dircode".to_string() );
|
||||
dict.insert( "li".to_string(), "linkcod".to_string() );
|
||||
dict.insert( "*.mp3".to_string(), "mp3code".to_string() );
|
||||
dict.insert( "*.tar".to_string(), "tarcode".to_string() );
|
||||
assert_eq!( "dircode", color_from_path( Path::new(".") , &dict ).unwrap() );
|
||||
assert_eq!( "mp3code", color_from_path( Path::new("test.mp3"), &dict ).unwrap() );
|
||||
assert_eq!( "tarcode", color_from_path( Path::new("test.tar"), &dict ).unwrap() );
|
||||
|
|
Loading…
Reference in New Issue