From 62505286b2aff9acd4db0ef486766a4fbff29aa4 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 19 Jun 2024 21:59:23 +0300 Subject: [PATCH] attempt 0: fixing json --- data/db_kernel_cachy.json | 4 ++-- src/kernel_pkg/mod.rs | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/data/db_kernel_cachy.json b/data/db_kernel_cachy.json index 0a015c4..4493119 100644 --- a/data/db_kernel_cachy.json +++ b/data/db_kernel_cachy.json @@ -5,13 +5,13 @@ "name": "CachyOS Default Kernel", "package": "kernel-cachyos", "description": "CachyOS Kernel with default scheduler.", - "min_x86_march": 3 + "min_x86_march": "3" }, { "name": "CachyOS LTS Kernel", "package": "kernel-cachyos-lts", "description": "CachyOS Long Term Support Kernel.", - "min_x86_march": 2 + "min_x86_march": "2" } ] } \ No newline at end of file diff --git a/src/kernel_pkg/mod.rs b/src/kernel_pkg/mod.rs index 8e1d6da..40eacf8 100644 --- a/src/kernel_pkg/mod.rs +++ b/src/kernel_pkg/mod.rs @@ -154,11 +154,10 @@ fn add_package_rows( .to_owned() .unwrap() .to_string(); - //let kernel_min_x86_march = kernel["min_x86_march"] - // .as_str() - // .to_owned() - // .unwrap() - // .to_string(); + let kernel_min_x86_march = kernel["min_x86_march"] + .as_u64() + .to_owned() + .unwrap() let kernel_package_version = match Command::new("/usr/lib/fedora-kernel-manager/scripts/get_version.sh") .args([&kernel_package]) .output() { @@ -384,7 +383,6 @@ fn add_package_rows( })); // //if kernel_needs_v3 = false || kernel_needs_v3 = true && cpu_feature_level = "x86-64-v3" - println!("{}", cpu_feature_level); boxedlist.append(&kernel_expander_row); } };