From b464a7b24f190697076d725c80474187813fe687 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 1 Sep 2024 10:10:07 +0300 Subject: [PATCH] Dynamically find kernels --- .github/release-nest-v3 | 2 +- LICENSE | 393 ++------------------------------ data/locales/en_US.json | 2 +- data/scripts/get_kernel_pika.sh | 10 +- debian/changelog | 2 +- kernel-db.json | 25 -- src/build_ui/mod.rs | 3 - src/content/mod.rs | 117 ++-------- src/kernel_pkg/mod.rs | 29 ++- src/main.rs | 2 - 10 files changed, 67 insertions(+), 518 deletions(-) delete mode 100644 kernel-db.json diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index bf0d87a..7813681 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file diff --git a/LICENSE b/LICENSE index a612ad9..2596933 100644 --- a/LICENSE +++ b/LICENSE @@ -1,373 +1,24 @@ -Mozilla Public License Version 2.0 -================================== -1. Definitions --------------- + // + + let get_kernel_branches_loop_context = MainContext::default(); + // The main loop executes the asynchronous block + get_kernel_branches_loop_context.spawn_local(clone!(@strong loading_box, @strong window_banner, @strong kernel_db_refcell, @strong db_load_complete => async move { + while let Ok(data) = get_kernel_branches_receiver.recv().await { + match data { + Ok(t) => { + (*kernel_db_refcell.borrow_mut()) = t; + *db_load_complete.borrow_mut() = true; + println!("{} {}", "Pika Kernels",t!("db_load_complete")) + } + _ => { + window_banner.set_title(&t!("banner_text_url_error").to_string()); + window_banner.set_revealed(true); + loading_box.set_visible(false); + } + } + } + })); + + / -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/data/locales/en_US.json b/data/locales/en_US.json index 6a17023..722e2e2 100644 --- a/data/locales/en_US.json +++ b/data/locales/en_US.json @@ -21,7 +21,7 @@ "disabled": "Disabled", "get_current_scheduler_sched_ext_detected": "sched_ext is detected, getting scx scheduler", "kernel_badge_branch_label": "Kernel Branch", - "kernel_badge_latest_version_label": "Latest Version", + "kernel_badge_latest_version_label": "Latest Stable Version", "kernel_badge_running_version_label": "Running Version", "kernel_badge_running_kernel_label": "Running Kernel", "kernel_badge_running_sched_label": "Running Sched", diff --git a/data/scripts/get_kernel_pika.sh b/data/scripts/get_kernel_pika.sh index bd2b888..a1618e7 100755 --- a/data/scripts/get_kernel_pika.sh +++ b/data/scripts/get_kernel_pika.sh @@ -1,3 +1,11 @@ #! /bin/bash -apt show kernel-pika 2>&1 | grep Depends: | tr "," "\n" | cut -f2 -d":" | grep linux-image | tr -d ' ' \ No newline at end of file +if [[ "$1" == "version" ]] +then + apt show kernel-pika 2>&1 | grep -v "does not have a stable" | grep Depends: | head -n1 | cut -f2 -d":" | cut -f1 -d"," | cut -f3 -d"-" | tr -d ' ' +elif [[ "$1" == "list" ]] +then + apt list 2>&1 | cut -f1 -d'/' | grep -v dbg | grep -E "linux-image-.*-pikaos" | cut -f3- -d"-" | tr -d ' ' +else + apt show kernel-pika 2>&1 | grep Depends: | tr "," "\n" | cut -f2 -d":" | grep linux-image | tr -d ' ' +fi \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 01366da..88cfdf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-kernel-manager (0.1.3-101pika3) pika; urgency=low +pika-kernel-manager (0.1.3-101pika4) pika; urgency=low * Initial Release diff --git a/kernel-db.json b/kernel-db.json deleted file mode 100644 index 23306d0..0000000 --- a/kernel-db.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "latest_kernel_version": "6.11.0", - "kernels": [ - { - "name": "PikaOS Kernel 6.11.0 RC-5 (Experimental)", - "main_package": "linux-image-6.11.0-rc5-pikaos", - "packages": "linux-image-6.11.0-rc5-pikaos linux-headers-6.11.0-rc5-pikaos" - }, - { - "name": "PikaOS Kernel 6.10.7", - "main_package": "linux-image-6.10.7-pikaos", - "packages": "linux-image-6.10.7-pikaos linux-headers-6.10.7-pikaos" - }, - { - "name": "PikaOS Kernel 6.10.5", - "main_package": "linux-image-6.10.5-pikaos", - "packages": "linux-image-6.10.5-pikaos linux-headers-6.10.5-pikaos" - }, - { - "name": "PikaOS Kernel 6.10.0", - "main_package": "linux-image-6.10.0-pikaos", - "packages": "linux-image-6.10.0-pikaos linux-headers-6.10.0-pikaos" - } - ] - } diff --git a/src/build_ui/mod.rs b/src/build_ui/mod.rs index 1a3aca1..a56cd84 100644 --- a/src/build_ui/mod.rs +++ b/src/build_ui/mod.rs @@ -17,7 +17,6 @@ pub fn build_ui(app: &adw::Application) { glib::set_application_name(&t!("application_name").to_string()); let internet_connected = Rc::new(RefCell::new(false)); - let db_load_complete = Rc::new(RefCell::new(false)); let (internet_loop_sender, internet_loop_receiver) = async_channel::unbounded(); let internet_loop_sender = internet_loop_sender.clone(); @@ -85,9 +84,7 @@ pub fn build_ui(app: &adw::Application) { content_stack.add_named( &content::content( &content_stack, - &db_load_complete, &window, - &window_banner, ), Some("content_page"), ); diff --git a/src/content/mod.rs b/src/content/mod.rs index d151ee7..062b982 100644 --- a/src/content/mod.rs +++ b/src/content/mod.rs @@ -1,62 +1,21 @@ -use crate::{kernel_pkg, sched_ext, RunningKernelInfo, KERNEL_DB_JSON_URL}; +use crate::{kernel_pkg, sched_ext, RunningKernelInfo}; use adw::prelude::*; use duct::cmd; use glib::*; use gtk::*; -use std::cell::RefCell; use std::path::Path; use std::process::{Command, Stdio}; -use std::rc::Rc; use std::{fs, time}; use version_compare::Version; pub fn content( content_stack: >k::Stack, - db_load_complete: &Rc>, window: &adw::ApplicationWindow, - window_banner: &adw::Banner, ) -> gtk::Box { - let (get_kernel_branches_sender, get_kernel_branches_receiver) = async_channel::unbounded(); - let get_kernel_branches_sender = get_kernel_branches_sender.clone(); - - let kernel_db_refcell: Rc> = Rc::new(RefCell::new(Default::default())); - - std::thread::spawn(move || { - get_kernel_branches_sender - .send_blocking(get_kernel_db()) - .expect("channel needs to be open."); - }); - - let loading_spinner = gtk::Spinner::builder() - .hexpand(true) - .valign(Align::Start) - .halign(Align::Center) - .spinning(true) - .height_request(128) - .width_request(128) - .build(); - - let loading_label = gtk::Label::builder() - .hexpand(true) - .valign(Align::Start) - .halign(Align::Center) - .label(t!("loading_label_label")) - .build(); - - let loading_box = gtk::Box::builder() - .hexpand(true) - .vexpand(true) - .orientation(Orientation::Vertical) - .build(); - - loading_box.append(&loading_spinner); - loading_box.append(&loading_label); - let content_box = gtk::Box::builder() .hexpand(true) .vexpand(true) .orientation(Orientation::Vertical) - .sensitive(false) .build(); let tux_icon = gtk::Image::builder() @@ -107,8 +66,8 @@ pub fn content( browse_kernels_button.add_css_class("circular"); browse_kernels_button.connect_clicked( - clone!(@weak window, @weak content_stack, @strong kernel_db_refcell => move |_| { - kernel_pkg::kernel_pkg_page(&content_stack, &window, kernel_db_refcell.borrow().to_string()); + clone!(@weak window, @weak content_stack => move |_| { + kernel_pkg::kernel_pkg_page(&content_stack, &window); content_stack.set_visible_child_name("kernel_pkg_page") }), ); @@ -146,37 +105,6 @@ pub fn content( content_stack.set_visible_child_name("sched_ext_page") })); - button_box.append(&browse_kernels_button); - button_box.append(&config_kernel_button); - - content_box.append(&loading_box); - content_box.append(&kernel_badge_box); - content_box.append(&tux_icon); - content_box.append(&button_box); - - // - - let get_kernel_branches_loop_context = MainContext::default(); - // The main loop executes the asynchronous block - get_kernel_branches_loop_context.spawn_local(clone!(@strong loading_box, @strong window_banner, @strong kernel_db_refcell, @strong db_load_complete => async move { - while let Ok(data) = get_kernel_branches_receiver.recv().await { - match data { - Ok(t) => { - (*kernel_db_refcell.borrow_mut()) = t; - *db_load_complete.borrow_mut() = true; - println!("{} {}", "Pika Kernels",t!("db_load_complete")) - } - _ => { - window_banner.set_title(&t!("banner_text_url_error").to_string()); - window_banner.set_revealed(true); - loading_box.set_visible(false); - } - } - } - })); - - // - let (load_badge_async_sender, load_badge_async_receiver) = async_channel::unbounded(); let load_badge_async_sender = load_badge_async_sender.clone(); // The long running operation runs now in a separate thread @@ -189,18 +117,21 @@ pub fn content( let load_badge_async_context = MainContext::default(); // The main loop executes the asynchronous block - load_badge_async_context.spawn_local(clone!(@weak content_box, @weak loading_box, @weak kernel_badge_box, @strong kernel_db_refcell, @strong db_load_complete => async move { + load_badge_async_context.spawn_local(clone!(@weak content_box, @weak kernel_badge_box => async move { while let Ok(_state) = load_badge_async_receiver.recv().await { - if *db_load_complete.borrow() == true { let running_kernel_info = get_running_kernel_info(); - create_kernel_badges(&kernel_badge_box, &running_kernel_info, &kernel_db_refcell.borrow()); + create_kernel_badges(&kernel_badge_box, &running_kernel_info); create_current_sched_badge(&sched_ext_badge_box, &running_kernel_info); - loading_box.set_visible(false); - content_box.set_sensitive(true) - } } })); + button_box.append(&browse_kernels_button); + button_box.append(&config_kernel_button); + + content_box.append(&kernel_badge_box); + content_box.append(&tux_icon); + content_box.append(&button_box); + content_box } @@ -264,17 +195,6 @@ pub fn create_kernel_badge( boxedlist } -fn get_kernel_db() -> Result { - let branch_name = "Pika Kernels"; - println!("{} {}.",t!("db_downloading"), &branch_name); - let branch_db = - reqwest::blocking::get(KERNEL_DB_JSON_URL)? - .text() - .unwrap(); - println!("{} {}", &branch_name, t!("db_download_complete")); - - Ok(branch_db) -} pub fn get_running_kernel_info() -> RunningKernelInfo { let kernel = match Command::new("uname") .arg("-r") @@ -346,18 +266,19 @@ fn bore_check() -> bool { fn create_kernel_badges( badge_box: >k::Box, running_kernel_info: &RunningKernelInfo, - kernel_db: &str ) { let kernel_badges_size_group = gtk::SizeGroup::new(SizeGroupMode::Both); let kernel_badges_size_group0 = gtk::SizeGroup::new(SizeGroupMode::Both); let kernel_badges_size_group1 = gtk::SizeGroup::new(SizeGroupMode::Both); - let json: serde_json::Value = - serde_json::from_str(&kernel_db).expect("Unable to parse"); + let command_get_kernel_pika = Command::new("/usr/lib/pika/kernel-manager/scripts/get_kernel_pika.sh") + .arg("version") + .output() + .unwrap(); - let kernel_version = json["latest_kernel_version"].as_str().to_owned().unwrap().to_string(); + let kernel_version = String::from_utf8(command_get_kernel_pika.stdout).unwrap(); - let version_css_style = if &running_kernel_info.version == &kernel_version { + let version_css_style = if Version::from(&running_kernel_info.version).unwrap() >= Version::from(kernel_version.trim()).unwrap() { "background-green-bg" } else { "background-red-bg" @@ -393,7 +314,7 @@ fn create_kernel_badges( )); badge_box.append(&create_kernel_badge( &t!("kernel_badge_running_sched_label").to_string(), - &running_kernel_info.sched, + &running_kernel_info.sched.trim(), "background-accent-bg", &kernel_badges_size_group, &kernel_badges_size_group0, diff --git a/src/kernel_pkg/mod.rs b/src/kernel_pkg/mod.rs index 376e068..c3a6788 100644 --- a/src/kernel_pkg/mod.rs +++ b/src/kernel_pkg/mod.rs @@ -13,7 +13,6 @@ use std::time::*; pub fn kernel_pkg_page( content_stack: >k::Stack, window: &adw::ApplicationWindow, - kernel_db: String, ) { let parse_loading_dialog = adw::MessageDialog::builder() .transient_for(window) @@ -92,7 +91,6 @@ pub fn kernel_pkg_page( add_package_rows( &packages_boxedlist, - kernel_db, &window, &rows_size_group, &searchbar, @@ -146,7 +144,6 @@ pub fn kernel_pkg_page( fn add_package_rows( boxedlist: >k::ListBox, - data: String, window: &adw::ApplicationWindow, rows_size_group: >k::SizeGroup, searchbar: >k::SearchEntry, @@ -159,16 +156,17 @@ fn add_package_rows( let kernel_package_done_sender = kernel_package_done_sender.clone(); std::thread::spawn(move || { - let res: serde_json::Value = serde_json::from_str(&data).expect("Unable to parse"); - if let serde_json::Value::Array(kernels) = &res["kernels"] { + let command_get_kernel_pika = Command::new("/usr/lib/pika/kernel-manager/scripts/get_kernel_pika.sh") + .arg("list") + .output() + .unwrap(); + let kernel_string = String::from_utf8(command_get_kernel_pika.stdout).unwrap(); + let kernels = kernel_string.trim().lines(); for kernel in kernels { - let kernel_name = kernel["name"].as_str().to_owned().unwrap().to_string(); - let kernel_main_package = kernel["main_package"] - .as_str() - .to_owned() - .unwrap() - .to_string(); - let kernel_packages = kernel["packages"].as_str().to_owned().unwrap().to_string(); + let kernel_version = &kernel.trim_end_matches("-pikaos"); + let kernel_name = format!("PikaOS Linux Kernel {}", kernel_version); + let kernel_main_package = format!("linux-image-{}", &kernel); + let kernel_packages = format!("linux-image-{VERSION} linux-headers-{VERSION}", VERSION=kernel); let kernel_package_version = match Command::new( "/usr/lib/pika/kernel-manager/scripts/generate_package_info.sh", ) @@ -196,7 +194,7 @@ fn add_package_rows( description: kernel_description }; kernel_package_sender.send_blocking(kernel_package).expect("Kernel Package sender channel closed") - }}; + }; kernel_package_done_sender.send_blocking(true).expect("Kernel Package done sender channel closed") }); @@ -230,14 +228,15 @@ fn add_package_rows( .output() .unwrap(); let command_get_kernel_pika = Command::new("/usr/lib/pika/kernel-manager/scripts/get_kernel_pika.sh") + .arg("pkgname") .output() .unwrap(); let kernel_pika_pkg = String::from_utf8(command_get_kernel_pika.stdout).unwrap(); - if kernel_main_package_clone0.trim() == kernel_pika_pkg.trim() { + if kernel_main_package_clone0.trim() == kernel_pika_pkg.trim() && command_installed_status.status.success() { kernel_status_loop_sender .send_blocking(2) .expect("channel needs to be open") - } else if command_installed_status.status.success() { + } else if command_installed_status.status.success() && kernel_main_package_clone0.trim() != kernel_pika_pkg.trim() { kernel_status_loop_sender .send_blocking(0) .expect("channel needs to be open") diff --git a/src/main.rs b/src/main.rs index ac817dc..4b381d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -52,8 +52,6 @@ const APP_ID: &str = "com.github.pikaos-linux.pika-kernel-manager"; pub const VERSION: &str = env!("CARGO_PKG_VERSION"); pub const APP_ICON: &str = "com.github.pikaos-linux.pika-kernel-manager"; pub const APP_GITHUB: &str = "https://git.pika-os.com/custom-gui-packages/pika-kernel-manager"; -pub const KERNEL_DB_JSON_URL: &str = "https://git.pika-os.com/custom-gui-packages/pika-kernel-manager/raw/branch/main/kernel-db.json"; - #[derive(Clone)] struct RunningKernelInfo { kernel: String,