summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorrabite <rabite@posteo.de>2019-02-05 17:44:36 +0100
committerrabite <rabite@posteo.de>2019-02-05 18:30:02 +0100
commit1826fced28630d5b3d7db6db49198549fe45e168 (patch)
tree908202b0fca949c3eb32dcf076a9c18cb5eaa3de /src
parent89ffedad18f6a45874bf7ac98ba7a0ed69eb0685 (diff)
show correct file size
Diffstat (limited to 'src')
-rw-r--r--src/files.rs11
-rw-r--r--src/preview.rs1
-rw-r--r--src/textview.rs7
3 files changed, 10 insertions, 9 deletions
diff --git a/src/files.rs b/src/files.rs
index 0c01124..0c836ab 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -61,7 +61,7 @@ impl Files {
let kind = get_kind(&file);
let path = file.path();
let meta = file.metadata().unwrap();
- let size = meta.len() / 1024;
+ let size = meta.len();
let mtime = meta.modified().unwrap();
let color = get_color(&path, &meta);
@@ -203,7 +203,7 @@ impl File {
let kind = Kind::Directory; //get_kind(&path);
let meta = &path.metadata().unwrap();
- let size = meta.len() / 1024;
+ let size = meta.len();
let mtime = meta.modified().unwrap();
let color = get_color(&path, meta);
Ok(File::new(&name, pathbuf, kind, size as usize, mtime, color))
@@ -226,9 +226,10 @@ impl File {
let unit = match unit {
0 => "",
1 => " KB",
- 2 => " GB",
- 3 => " TB",
- 4 => "wtf are you doing",
+ 2 => " MB",
+ 3 => " GB",
+ 4 => " TB",
+ 5 => " wtf are you doing",
_ => "",
}
.to_string();
diff --git a/src/preview.rs b/src/preview.rs
index d5e7fde..ce64a99 100644
--- a/src/preview.rs
+++ b/src/preview.rs
@@ -47,7 +47,6 @@ impl Previewer {
//self.threads.install(|| {
std::thread::spawn(move || {
- dbg!(&file);
match &file.kind {
Kind::Directory => match Files::new_from_path(&file.path) {
Ok(files) => {
diff --git a/src/textview.rs b/src/textview.rs
index 888338f..694ab5a 100644
--- a/src/textview.rs
+++ b/src/textview.rs
@@ -53,9 +53,10 @@ impl Widget for TextView {
}
fn refresh(&mut self) {
let (xsize, ysize) = self.get_size().size();
- let (xpos, ypos) = self.get_position().position();
+ let (xpos, ypos) = self.get_coordinates().position().position();
- self.buffer = self
+ self.buffer = self.get_clearlist() +
+ &self
.lines
.par_iter()
.take(ysize as usize)
@@ -69,7 +70,7 @@ impl Widget for TextView {
xsize = xsize as usize
)
})
- .collect();
+ .collect::<String>();
}
fn get_drawlist(&self) -> String {