summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCanop <cano.petrole@gmail.com>2021-06-30 12:43:17 +0200
committerCanop <cano.petrole@gmail.com>2021-06-30 12:43:17 +0200
commiteb407eb95042d93a1baa1dabf384600ae9b3e25d (patch)
tree5690edea74de420e3ec8abeefadba4ed46f8556a
parentab8403eb3ccbe00318ed79ba3c9084461de2597a (diff)
fix disk not found for BTRFS filesystemsv0.7.3
Fix #11
-rw-r--r--CHANGELOG.md4
-rw-r--r--Cargo.lock6
-rw-r--r--Cargo.toml4
-rw-r--r--README.md2
-rw-r--r--doc/screenshot.pngbin169061 -> 164958 bytes
-rw-r--r--src/fmt_mount.rs6
6 files changed, 13 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ad3faa..2599000 100644
--- 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
index 00ced55..2a30d1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,7 +212,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lfs"
-version = "0.7.2"
+version = "0.7.3"
dependencies = [
"argh",
"crossterm",
@@ -226,9 +226,9 @@ dependencies = [
[[package]]
name = "lfs-core"
-version = "0.3.4"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf1759bfc99a5cbb7f47588b118578498c24c251982600829b0e1c5a5063801e"
+checksum = "a1aeaf01d7168e29564b220550a96f2fd717ea3c4b75c9a9fe8fe4ae4e9b05f8"
dependencies = [
"lazy-regex",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index 21ba1c2..83a24b2 100644
--- 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
index 1f20f21..c293907 100644
--- 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
index 90b85bd..9721482 100644
--- a/doc/screenshot.png
+++ b/doc/screenshot.png
Binary files differ
diff --git a/src/fmt_mount.rs b/src/fmt_mount.rs
index dd5f860..9f3a029 100644
--- 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) {