bootandy/archived-dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2026-06-08 11:29:05 +03:00
Code Issues 21 Packages Projects Releases 10 Wiki Activity

Fix obscure display bug

Browse Source 
When one directory was a substring of another with files in the files
could appear as children of the wrong directory

Fix: https://github.com/bootandy/dust/issues/25
This commit is contained in:
bootandy
2019-07-01 22:09:39 +01:00
parent 4906e9efda
commit 6e03dd77e6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/display.rs
+4 -2
View File
@@ -75,7 +75,8 @@ fn display_node<S: Into<String>>(
let mut is_biggest = true;
for &(ref k, _) in to_display.iter() {
if k.starts_with(ntp) && k.matches('/').count() == num_slashes + 1 {
let ntp_with_slash= String::from(ntp.to_owned() + "/");
if k.starts_with(ntp_with_slash.as_str()) && k.matches('/').count() == num_slashes + 1 {
num_siblings -= 1;
let has_children = has_children(to_display, new_depth, k, num_slashes + 1);
display_node(
@@ -122,7 +123,8 @@ fn has_children(
) -> bool {
if new_depth.is_none() || new_depth.unwrap() != 1 {
for &(ref k2, _) in to_display.iter() {
if k2.starts_with(ntp) && k2.matches('/').count() == num_slashes + 1 {
let ntp_with_slash= String::from(ntp.to_owned() + "/");
if k2.starts_with(ntp_with_slash.as_str()) && k2.matches('/').count() == num_slashes + 1 {
return true;
}
}