Skip to content

Commit 2c33358

Browse files
committed
🧹 pages: move remaining actions
1 parent 632a365 commit 2c33358

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

‎src/actions.rs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::pages::{Action, DialogMessage};
22
use crate::{fl, kwin_dbus, utils, PacmanWrapper};
33

4-
use std::fmt::Write;
54
use std::path::Path;
65

76
use gtk::glib::Sender;
@@ -226,3 +225,35 @@ pub fn install_needed_packages(
226225
let packages = packages_to_install.join(" ");
227226
let _ = utils::run_cmd_terminal(format!("pacman -S {packages}"), true);
228227
}
228+
229+
pub fn rankmirrors() {
230+
let _ = utils::run_cmd_terminal(String::from("cachyos-rate-mirrors"), true);
231+
}
232+
233+
pub fn install_gaming(dialog_tx: Sender<DialogMessage>) {
234+
const ALPM_PACKAGE_NAMES: [&str; 2] = ["cachyos-gaming-meta", "cachyos-gaming-applications"];
235+
install_needed_packages(
236+
&ALPM_PACKAGE_NAMES,
237+
fl!("gaming-package-installed"),
238+
Action::InstallGaming,
239+
dialog_tx,
240+
);
241+
}
242+
243+
pub fn install_snapper(dialog_tx: Sender<DialogMessage>) {
244+
install_needed_packages(
245+
&["cachyos-snapper-support"],
246+
fl!("snapper-package-installed"),
247+
Action::InstallSnapper,
248+
dialog_tx,
249+
);
250+
}
251+
252+
pub fn install_spoofdpi(dialog_tx: Sender<DialogMessage>) {
253+
install_needed_packages(
254+
&["spoofdpi"],
255+
fl!("spoof-dpi-package-installed"),
256+
Action::InstallSnapper,
257+
dialog_tx,
258+
);
259+
}

‎src/pages/mod.rs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -92,45 +92,28 @@ fn create_fixes_section(builder: &Builder) -> gtk::Box {
9292
rankmirrors_btn.connect_clicked(move |_| {
9393
// Spawn child process in separate thread.
9494
std::thread::spawn(move || {
95-
let _ = utils::run_cmd_terminal(String::from("cachyos-rate-mirrors"), true);
95+
actions::rankmirrors();
9696
});
9797
});
9898
install_gaming_btn.connect_clicked(move |_| {
9999
// Spawn child process in separate thread.
100100
let dialog_tx_gaming = dialog_tx_gaming.clone();
101101
std::thread::spawn(move || {
102-
const ALPM_PACKAGE_NAMES: [&str; 2] =
103-
["cachyos-gaming-meta", "cachyos-gaming-applications"];
104-
actions::install_needed_packages(
105-
&ALPM_PACKAGE_NAMES,
106-
fl!("gaming-package-installed"),
107-
Action::InstallGaming,
108-
dialog_tx_gaming,
109-
);
102+
actions::install_gaming(dialog_tx_gaming);
110103
});
111104
});
112105
install_snapper_btn.connect_clicked(move |_| {
113106
// Spawn child process in separate thread.
114107
let dialog_tx_snapper = dialog_tx_snapper.clone();
115108
std::thread::spawn(move || {
116-
actions::install_needed_packages(
117-
&["cachyos-snapper-support"],
118-
fl!("snapper-package-installed"),
119-
Action::InstallSnapper,
120-
dialog_tx_snapper,
121-
);
109+
actions::install_snapper(dialog_tx_snapper);
122110
});
123111
});
124112
install_spoof_dpi_btn.connect_clicked(move |_| {
125113
// Spawn child process in separate thread.
126114
let dialog_tx_spoof = dialog_tx_spoof.clone();
127115
std::thread::spawn(move || {
128-
actions::install_needed_packages(
129-
&["spoofdpi"],
130-
fl!("spoof-dpi-package-installed"),
131-
Action::InstallSnapper,
132-
dialog_tx_spoof,
133-
);
116+
actions::install_spoofdpi(dialog_tx_spoof);
134117
});
135118
});
136119

0 commit comments

Comments
 (0)