fix update interval action

.github/release-nest-v3

@@ -1 +1 @@
-9
+11

Cargo.lock

@@ -1736,7 +1736,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pikman-update-manager"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "async-channel",
  "async-trait",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pikman-update-manager"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

data/com.github.pikaos-linux.pikmanupdatemanager.gschema.xml

@@ -13,12 +13,13 @@
             <default>false</default>
             <summary>Default window maximized behaviour</summary>
         </key>
-        <key type="b" name="startup-show">
+        <key name="check-for-updates" type="b">
             <default>true</default>
-            <summary>Show PikaOS Welcome on startup.</summary>
+            <summary>Default window maximized behaviour</summary>
-            <description>
+        </key>
-                Show PikaOS Welcome on startup.
+        <key name="update-interval" type="i">
-            </description>
+            <default>22000000</default>
+            <summary>Update intervals in ms</summary>
         </key>
     </schema>
 </schemalist>

debian/changelog

@@ -1,4 +1,4 @@
-pikman-update-manager (1.0.0-100pika4) pikauwu; urgency=medium
+pikman-update-manager (1.0.1-100pika2) pikauwu; urgency=medium
 
   * initial release
 

main.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-VERSION="1.0.0"
+VERSION="1.0.1"
 
 source ./pika-build-config.sh
 

src/bin/gui/apt_manage_page/mod.rs

@@ -457,23 +457,25 @@ pub fn apt_manage_page(
                     let item = selection.downcast_ref::<BoxedAnyObject>().unwrap();
                     let apt_src: Ref<AptSourceConfig> = item.borrow();
                     match apt_src.deref() {
-                        AptSourceConfig::DEB822(src) => {
+                        AptSourceConfig::DEB822(src) => match &src.signed_by {
-                            match &src.signed_by {
+                            Some(t) => {
-                                Some(t) => _command = duct::cmd!(
+                                _command = duct::cmd!(
                                     "pkexec",
                                     "/usr/lib/pika/pikman-update-manager/scripts/modify_repo.sh",
                                     "delete_deb822",
                                     &src.filepath,
                                     t
-                                ),
+                                )
-                                None => _command = duct::cmd!(
+                            }
+                            None => {
+                                _command = duct::cmd!(
                                     "pkexec",
                                     "/usr/lib/pika/pikman-update-manager/scripts/modify_repo.sh",
                                     "delete_legacy",
                                     &src.filepath
-                                ),
+                                )
-                            }
                             }
+                        },
                         AptSourceConfig::Legacy(list) => {
                             _command = duct::cmd!(
                                 "pkexec",

src/bin/gui/build_ui/mod.rs

@@ -11,6 +11,9 @@ use ksni;
 use std::cell::RefCell;
 use std::process::Command;
 use std::rc::Rc;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+use std::sync::Mutex;
 use std::thread;
 
 #[derive(Debug)]
@@ -83,15 +86,30 @@ impl ksni::Tray for PikmanTray {
     }
 }
 
+enum ConstantLoopMessage {
+    InternetStatus(bool),
+    RefreshRequest,
+}
+
 pub fn build_ui(app: &Application) {
     // setup glib
     glib::set_prgname(Some(t!("application_name").to_string()));
     glib::set_application_name(&t!("application_name").to_string());
     let glib_settings = gio::Settings::new(APP_ID);
 
+    let automatically_check_for_updates_arc =
+        Arc::new(AtomicBool::new(glib_settings.boolean("check-for-updates")));
+    let update_interval_arc = Arc::new(Mutex::new(glib_settings.int("update-interval")));
     let internet_connected = Rc::new(RefCell::new(false));
-    let (internet_loop_sender, internet_loop_receiver) = async_channel::unbounded();
+
-    let internet_loop_sender = internet_loop_sender.clone();
+    let (constant_loop_sender, constant_loop_receiver) = async_channel::unbounded();
+    let constant_loop_sender_clone0 = constant_loop_sender.clone();
+    let constant_loop_sender_clone1 = constant_loop_sender.clone();
+
+    let refresh_button = gtk::Button::builder()
+        .icon_name("view-refresh-symbolic")
+        .tooltip_text(t!("refresh_button_tooltip_text"))
+        .build();
 
     // Systray
 
@@ -116,6 +134,8 @@ pub fn build_ui(app: &Application) {
     update_sys_tray.connect_activate(clone!(
         #[strong]
         tray_handle,
+        #[strong]
+        refresh_button,
         move |_, param| {
             let array: &[i32] = param.unwrap().fixed_array().unwrap();
             let vec = array.to_vec();
@@ -155,48 +175,68 @@ pub fn build_ui(app: &Application) {
                     .unwrap(),
                 );
             });
+            if apt_update_count == -1 || flatpak_update_count == -1 {
+                refresh_button.set_sensitive(false);
+                refresh_button.set_tooltip_text(Some(
+                    &t!("pikman_indicator_flatpak_item_label_calculating").to_string(),
+                ));
+            } else {
+                refresh_button.set_sensitive(true);
+                refresh_button
+                    .set_tooltip_text(Some(&t!("refresh_button_tooltip_text").to_string()));
+            }
         }
     ));
     update_sys_tray.activate(Some(&glib::Variant::array_from_fixed_array(&[-1, -1])));
 
+    // internet check loop
+    thread::spawn(move || {
+        let mut last_result = false;
+        loop {
+            if last_result == true {
+                std::thread::sleep(std::time::Duration::from_secs(60));
+            }
+
+            let check_internet_connection_cli = Command::new("ping")
+                .arg("iso.pika-os.com")
+                .arg("-c 1")
+                .output()
+                .expect("failed to execute process");
+            if check_internet_connection_cli.status.success() {
+                constant_loop_sender_clone0
+                    .send_blocking(ConstantLoopMessage::InternetStatus(true))
+                    .expect("The channel needs to be open.");
+                last_result = true
+            } else {
+                constant_loop_sender_clone0
+                    .send_blocking(ConstantLoopMessage::InternetStatus(false))
+                    .expect("The channel needs to be open.");
+                last_result = false
+            }
+        }
+    });
+
+    // update interval loop
     thread::spawn(move || loop {
-        match Command::new("ping").arg("google.com").arg("-c 1").output() {
+        let automatically_check_for_updates =
-            Ok(t) if t.status.success() => internet_loop_sender
+            automatically_check_for_updates_arc.load(std::sync::atomic::Ordering::Relaxed);
-                .send_blocking(true)
+        if automatically_check_for_updates {
-                .expect("The channel needs to be open"),
+            match update_interval_arc.lock() {
-            _ => internet_loop_sender
+                Ok(update_interval) => {
-                .send_blocking(false)
+                    std::thread::sleep(std::time::Duration::from_millis(*update_interval as u64));
-                .expect("The channel needs to be open"),
+                    constant_loop_sender_clone1
-        };
+                        .send_blocking(ConstantLoopMessage::RefreshRequest)
-        thread::sleep(std::time::Duration::from_secs(5));
+                        .expect("The channel needs to be open.");
+                }
+                Err(_) => {}
+            }
+        }
     });
 
     let window_banner = Banner::builder().revealed(false).build();
 
     let internet_connected_status = internet_connected.clone();
 
-    let internet_loop_context = MainContext::default();
-    // The main loop executes the asynchronous block
-    internet_loop_context.spawn_local(clone!(
-        #[weak]
-        window_banner,
-        async move {
-            while let Ok(state) = internet_loop_receiver.recv().await {
-                let banner_text = t!("banner_text_no_internet").to_string();
-                if state == true {
-                    *internet_connected_status.borrow_mut() = true;
-                    if window_banner.title() == banner_text {
-                        window_banner.set_revealed(false)
-                    }
-                } else {
-                    *internet_connected_status.borrow_mut() = false;
-                    window_banner.set_title(&banner_text);
-                    window_banner.set_revealed(true)
-                }
-            }
-        }
-    ));
-
     let window_headerbar = HeaderBar::builder()
         .title_widget(&WindowTitle::builder().title(t!("application_name")).build())
         .show_title(false)
@@ -204,8 +244,8 @@ pub fn build_ui(app: &Application) {
 
     let window_breakpoint = adw::Breakpoint::new(BreakpointCondition::new_length(
         BreakpointConditionLengthType::MaxWidth,
-        1100.0,
+        1140.0,
-        LengthUnit::Px,
+        LengthUnit::Sp,
     ));
 
     let window_adw_stack = gtk::Stack::builder()
@@ -298,7 +338,7 @@ pub fn build_ui(app: &Application) {
         .default_width(glib_settings.int("window-width"))
         .default_height(glib_settings.int("window-height"))
         //
-        .width_request(1000)
+        .width_request(900)
         .height_request(700)
         .content(&window_content_page_split_view)
         // Startup
@@ -326,11 +366,6 @@ pub fn build_ui(app: &Application) {
         .icon_name("dialog-information-symbolic")
         .build();
 
-    let refresh_button = gtk::Button::builder()
-        .icon_name("view-refresh-symbolic")
-        .tooltip_text(t!("refresh_button_tooltip_text"))
-        .build();
-
     let credits_window = AboutWindow::builder()
         .application_icon(APP_ICON)
         .application_name(t!("application_name"))
@@ -551,8 +586,7 @@ pub fn build_ui(app: &Application) {
                     .unwrap() as i32)
                     + 1) as usize;
                 if index > gtk_application_args.len() - 1 {
-                    flatpak_entry_signal_action
+                    flatpak_entry_signal_action.activate(Some(&glib::Variant::from("")));
-                    .activate(Some(&glib::Variant::from("")));
                 } else {
                     flatpak_entry_signal_action
                         .activate(Some(&glib::Variant::from(&gtk_application_args[index])));
@@ -601,6 +635,43 @@ pub fn build_ui(app: &Application) {
             }
         }
     ));
+
+    let constant_loop_context = MainContext::default();
+    // The main loop executes the asynchronous block
+    constant_loop_context.spawn_local(clone!(
+        #[weak]
+        window_banner,
+        #[strong]
+        update_sys_tray,
+        #[strong]
+        apt_retry_signal_action,
+        #[strong]
+        flatpak_retry_signal_action,
+        async move {
+            while let Ok(message) = constant_loop_receiver.recv().await {
+                let banner_text = t!("banner_text_no_internet").to_string();
+                match message {
+                    ConstantLoopMessage::InternetStatus(state) => {
+                        if state == true {
+                            *internet_connected_status.borrow_mut() = true;
+                            if window_banner.title() == banner_text {
+                                window_banner.set_revealed(false)
+                            }
+                        } else {
+                            *internet_connected_status.borrow_mut() = false;
+                            window_banner.set_title(&banner_text);
+                            window_banner.set_revealed(true)
+                        }
+                    }
+                    ConstantLoopMessage::RefreshRequest => {
+                        update_sys_tray.activate(Some(&glib::Variant::array_from_fixed_array(&[-1, -1])));
+                        apt_retry_signal_action.activate(None);
+                        flatpak_retry_signal_action.activate(None);
+                    }
+                }
+            }
+        }
+    ));
 }
 
 fn add_content_button(