bobwen-dev
/
hunter
mirror of https://github.com/bobwen-dev/hunter
1
0
Fork 0
Code Issues Releases Wiki Activity

fix crash when sorting 

Squashed commit of the following:

commit 353e97f4dcff04929cabd707275df193bdde2f31
Author: rabite <rabite@posteo.de>
Date:   Tue Apr 9 18:44:10 2019 +0200

	remove dbgs

commit 97e9cd3eadd259742f0f2a3a619c0eaa23112e54
Author: rabite <rabite@posteo.de>
Date:   Mon Apr 8 17:53:15 2019 +0200

	print names while sorting by name

commit 698fffc4b70255268befdbf5b90948e1ae218538
Author: rabite <rabite@posteo.de>
Date:   Mon Apr 8 17:50:59 2019 +0200

	possible fix for crash when sorting
This commit is contained in:
rabite 2019-04-09 18:45:41 +02:00
parent 0c6d657030
commit 0eedd7da7f
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/files.rs
View File

@ -19,6 +19,7 @@ use chrono::TimeZone;
use failure::Error;
use notify::DebouncedEvent;
use rayon::{ThreadPool, ThreadPoolBuilder};
use alphanumeric_sort::compare_str;
use crate::fail::{HResult, HError, ErrorLog};
use crate::dirty::{AsyncDirtyBit, DirtyBit, Dirtyable};
@ -266,23 +267,41 @@ impl Files {
match self.sort {
SortBy::Name => self
.files
.sort_by(|a, b| alphanumeric_sort::compare_str(&a.name, &b.name)),
.sort_by(|a, b| {
compare_str(&a.name, &b.name)
}),
SortBy::Size => {
self.meta_all_sync().log();
self.files.sort_by(|a, b| {
if a.meta().unwrap().size() == b.meta().unwrap().size() {
return alphanumeric_sort::compare_str(&b.name, &a.name);
match (a.meta(), b.meta()) {
(Ok(a_meta), Ok(b_meta)) => {
if a_meta.size() == b_meta.size() {
compare_str(&b.name, &a.name)
} else {
a_meta.size().cmp(&b_meta.size()).reverse()
}
}
_ => return std::cmp::Ordering::Equal
}
a.meta().unwrap().size().cmp(&b.meta().unwrap().size()).reverse()
});
}
SortBy::MTime => {
self.meta_all_sync().log();
self.files.sort_by(|a, b| {
if a.meta().unwrap().mtime() == b.meta().unwrap().mtime() {
return alphanumeric_sort::compare_str(&a.name, &b.name);
match (a.meta(), b.meta()) {
(Ok(a_meta), Ok(b_meta)) => {
if a_meta.mtime() == b_meta.mtime() {
compare_str(&b.name, &a.name)
} else {
a_meta.mtime().cmp(&b_meta.mtime()).reverse()
}
}
_ => return std::cmp::Ordering::Equal
}
a.meta().unwrap().mtime().cmp(&b.meta().unwrap().mtime())
});
}
};