From 535bf9c792c4dc303a56a94cd10f0059458a8002 Mon Sep 17 00:00:00 2001 From: Honza Filipsky Date: Mon, 8 Apr 2024 13:26:53 +0200 Subject: [PATCH 1/3] Disk.fromLsblk parssing fix --- lib/src/models/disk.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/models/disk.dart b/lib/src/models/disk.dart index 2858e46..6572142 100644 --- a/lib/src/models/disk.dart +++ b/lib/src/models/disk.dart @@ -165,17 +165,17 @@ class Disk extends Equatable { final scsi = RegExp(r"/^(sata|scsi|ata|ide|pci)$/i").hasMatch(device["tran"] ?? ""); final usb = RegExp(r"/^(usb)$/i").hasMatch(device["tran"] ?? ""); - final readonly = device["ro"] == 1; - final removable = device["rm"] == 1 || device["hotplug"] == 1 || virtual; + final readonly = device["ro"]?.toString() == '1'; + final removable = device["rm"]?.toString() == '1'|| device["hotplug"]?.toString() == '1' || virtual; return Disk( busType: (device["tran"] ?? "UNKNOWN").toUpperCase(), device: name ?? "", raw: kname ?? name ?? "", description: getDescription(), - size: device["size"], - blockSize: device["phy-sec"] ?? 512, - logicalBlockSize: device["log-sec"] ?? 512, + size: int.tryParse(device["size"]?.toString()), + blockSize: int.tryParse(device["phy-sec"]?.toString()) ?? 512, + logicalBlockSize: int.tryParse(device["log-sec"]?.toString()) ?? 512, mountpoints: ((device["children"] ?? [device]) as List) .where((mountpoint) => mountpoint["mountpoint"] != null) .map((mountpoint) => Mountpoint.fromLsblk(mountpoint)) From 268ebabc1bfe829aadecb67a468b474d6efe2784 Mon Sep 17 00:00:00 2001 From: Honza Filipsky Date: Mon, 8 Apr 2024 13:36:35 +0200 Subject: [PATCH 2/3] fixed the code to compile --- lib/src/models/disk.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/models/disk.dart b/lib/src/models/disk.dart index 6572142..93d2aa8 100644 --- a/lib/src/models/disk.dart +++ b/lib/src/models/disk.dart @@ -174,8 +174,8 @@ class Disk extends Equatable { raw: kname ?? name ?? "", description: getDescription(), size: int.tryParse(device["size"]?.toString()), - blockSize: int.tryParse(device["phy-sec"]?.toString()) ?? 512, - logicalBlockSize: int.tryParse(device["log-sec"]?.toString()) ?? 512, + blockSize: int.tryParse(device["phy-sec"]?.toString() ?? '') ?? 512, + logicalBlockSize: int.tryParse(device["log-sec"]?.toString() ?? '') ?? 512, mountpoints: ((device["children"] ?? [device]) as List) .where((mountpoint) => mountpoint["mountpoint"] != null) .map((mountpoint) => Mountpoint.fromLsblk(mountpoint)) From 1905951da19b402902c34ea0a4d7cfe31e96883c Mon Sep 17 00:00:00 2001 From: Honza Filipsky Date: Mon, 8 Apr 2024 13:39:33 +0200 Subject: [PATCH 3/3] pushed forgotten line of code --- lib/src/models/disk.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/models/disk.dart b/lib/src/models/disk.dart index 93d2aa8..ca7046b 100644 --- a/lib/src/models/disk.dart +++ b/lib/src/models/disk.dart @@ -173,9 +173,9 @@ class Disk extends Equatable { device: name ?? "", raw: kname ?? name ?? "", description: getDescription(), - size: int.tryParse(device["size"]?.toString()), - blockSize: int.tryParse(device["phy-sec"]?.toString() ?? '') ?? 512, - logicalBlockSize: int.tryParse(device["log-sec"]?.toString() ?? '') ?? 512, + size: int.tryParse(device["size"]?.toString() ?? ""), + blockSize: int.tryParse(device["phy-sec"]?.toString() ?? "") ?? 512, + logicalBlockSize: int.tryParse(device["log-sec"]?.toString() ?? "") ?? 512, mountpoints: ((device["children"] ?? [device]) as List) .where((mountpoint) => mountpoint["mountpoint"] != null) .map((mountpoint) => Mountpoint.fromLsblk(mountpoint))