fix disk not found for BTRFS filesystems

Fix #11
Canop · Jun 30, 2021 · eb407eb · eb407eb
1 parent ab8403e
commit eb407eb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+<a name="v0.7.3"></a>
+### v0.7.3 - 2021/06/30
+* fix disk not found for BTRFS filesystems - Fix #11
+
 <a name="v0.7.2"></a>
 ### v0.7.2 - 2021/06/29
 * use termimad 0.13 for better support of narrow terminals and wide chars

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lfs"
-version = "0.7.2"
+version = "0.7.3"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 edition = "2018"
 keywords = ["linux", "filesystem", "fs"]
@@ -14,7 +14,7 @@ readme = "README.md"
 argh = "0.1.3"
 crossterm = "0.20.0"
 file-size = "1.0.3"
-lfs-core = "0.3.4"
+lfs-core = "0.4.0"
 minimad = "0.8.0"
 serde ="1.0"
 serde_json = "1.0"

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ A linux utility listing your filesystems.
 
 ![screenshot](doc/screenshot.png)
 
-Besides traditional columns, the `dsk` column helps you identify your "disk":
+Besides traditional columns, the `disk` column helps you identify your "disk":
 
 * `remov` : a removable device (such as an USB key)
 * `HDD` : a rotational disk

diff --git a/doc/screenshot.png b/doc/screenshot.png
diff --git a/src/fmt_mount.rs b/src/fmt_mount.rs
@@ -17,10 +17,10 @@ static BAR_WIDTH: usize = 5;
 
 static MD: &str = r#"
 |-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:
-|id|dev|filesystem|dsk|type|used|use%|avail|size|mount point
+|id|dev|filesystem|disk|type|used|use%|avail|size|mount point
 |-:|:-|:-|:-:|:-:|-:|-:|-:|:-
 ${mount-points
-|${id}|${dev-major}:${dev-minor}|${fs}|${dsk}|${fs-type}|`${used}`|`${use-percents}` ~~${bar}~~|*${available}*|**${size}**|${mount-point}
+|${id}|${dev-major}:${dev-minor}|${fs}|${disk}|${fs-type}|`${used}`|`${use-percents}` ~~${bar}~~|*${available}*|**${size}**|${mount-point}
 }
 |-:
 "#;
@@ -35,7 +35,7 @@ pub fn print(mounts: &[Mount]) -> Result<()> {
             .set("dev-major", format!("{}", mount.info.dev.major))
             .set("dev-minor", format!("{}", mount.info.dev.minor))
             .set("fs", &mount.info.fs)
-            .set("dsk", mount.disk.as_ref().map_or("", |d| d.disk_type()))
+            .set("disk", mount.disk.as_ref().map_or("", |d| d.disk_type()))
             .set("fs-type", &mount.info.fs_type)
             .set("mount-point", mount.info.mount_point.to_string_lossy());
         if let Some(stats) = mount.stats.as_ref().filter(|s| s.size() > 0) {