custom-gui-packages/pikman-update-manager
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apt transaction info

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-07-11 02:45:59 +03:00
parent 3d509b0afc
commit 5b7f096621
9 changed files with 261 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.idea/workspace.xml
View File

@ -8,11 +8,13 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="df2ca9e1-e07d-43f4-bc68-0a6113fc1fa2" name="Changes" comment=""> <list default="true" id="df2ca9e1-e07d-43f4-bc68-0a6113fc1fa2" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/lib/apt_install_progress_socket/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/bin/apt/apt_full_upgrade/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/apt/apt_full_upgrade/main.rs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/bin/apt/apt_full_upgrade/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/apt/apt_full_upgrade/main.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/bin/apt/apt_update/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/apt/apt_update/main.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/bin/gui/apt_update_page/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/gui/apt_update_page/mod.rs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/bin/gui/apt_update_page/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/gui/apt_update_page/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/bin/gui/apt_update_page/process.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/gui/apt_update_page/process.rs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/bin/gui/apt_update_page/process.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/bin/gui/apt_update_page/process.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/lib/apt_install_progress_socket/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/apt_install_progress_socket/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/lib/apt_update_progress_socket/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/apt_update_progress_socket/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/lib/lib.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/lib.rs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/lib/lib.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/lib.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/lib/pika_unixsocket_tools/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/pika_unixsocket_tools/mod.rs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/lib/pika_unixsocket_tools/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/pika_unixsocket_tools/mod.rs" afterDir="false" />
</list> </list>
@ -45,23 +47,23 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ASKED_ADD_EXTERNAL_FILES": "true", &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
"Cargo.Run apt_update.executor": "Run", &quot;Cargo.Run apt_update.executor&quot;: &quot;Run&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.rust.reset.selective.auto.import": "true", &quot;RunOnceActivity.rust.reset.selective.auto.import&quot;: &quot;true&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"last_opened_file_path": "/home/ward/RustroverProjects/pika-idk-manager/src/lib", &quot;last_opened_file_path&quot;: &quot;/home/ward/RustroverProjects/pika-idk-manager/src/lib&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"org.rust.cargo.project.model.PROJECT_DISCOVERY": "true", &quot;org.rust.cargo.project.model.PROJECT_DISCOVERY&quot;: &quot;true&quot;,
"org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "", &quot;org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon&quot;: &quot;&quot;,
"org.rust.disableDetachedFileInspection/home/ward/RustroverProjects/pika-idk-manager/src/apt_update_progress_socket/lib.rs": "true", &quot;org.rust.disableDetachedFileInspection/home/ward/RustroverProjects/pika-idk-manager/src/apt_update_progress_socket/lib.rs&quot;: &quot;true&quot;,
"org.rust.first.attach.projects": "true" &quot;org.rust.first.attach.projects&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/lib" /> <recent name="$PROJECT_DIR$/src/lib" />
@ -138,7 +140,8 @@
<workItem from="1720502207843" duration="3142000" /> <workItem from="1720502207843" duration="3142000" />
<workItem from="1720556059466" duration="12649000" /> <workItem from="1720556059466" duration="12649000" />
<workItem from="1720594302708" duration="52000" /> <workItem from="1720594302708" duration="52000" />
<workItem from="1720597532937" duration="6243000" /> <workItem from="1720597532937" duration="7050000" />
<workItem from="1720648284536" duration="6532000" />
</task> </task>
<servers /> <servers />
</component> </component>

22
src/bin/apt/apt_full_upgrade/main.rs
View File

@ -1,14 +1,28 @@
use pika_unixsocket_tools::apt_install_progress_socket::AptInstallProgressSocket;
use pika_unixsocket_tools::apt_update_progress_socket::AptUpdateProgressSocket;
use pika_unixsocket_tools::pika_unixsocket_tools::*;
use rust_apt::new_cache; use rust_apt::new_cache;
use rust_apt::progress::{AcquireProgress, InstallProgress}; use rust_apt::progress::{AcquireProgress, InstallProgress};
use std::fs::*;
use std::process::exit;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use pika_unixsocket_tools::apt_update_progress_socket::AptUpdateProgressSocket;
use pika_unixsocket_tools::apt_install_progress_socket::AptInstallProgressSocket;
use pika_unixsocket_tools::pika_unixsocket_tools::*;
fn main() { fn main() {
let cache = new_cache!().unwrap(); let cache = new_cache!().unwrap();
let percent_socket_path = "/tmp/pika_apt_upgrade_percent.sock"; let percent_socket_path = "/tmp/pika_apt_upgrade_percent.sock";
let status_socket_path = "/tmp/pika_apt_upgrade_status.sock"; let status_socket_path = "/tmp/pika_apt_upgrade_status.sock";
let json_file_path = "/tmp/pika-apt-exclusions.json";
let json: serde_json::Value = serde_json::from_str(
&std::fs::read_to_string(json_file_path).expect("Unable to read file"),
)
.expect("JSON was not well-formatted");
if let serde_json::Value::Array(exclusions) = &json["exclusions"] {
for exclusion in exclusions {
println!("{}", exclusion["package"])
}
}
let pkg = cache.get("neovim").unwrap(); let pkg = cache.get("neovim").unwrap();
let mut acquire_progress = AcquireProgress::new(AptUpdateProgressSocket::new( let mut acquire_progress = AcquireProgress::new(AptUpdateProgressSocket::new(
@ -24,6 +38,8 @@ fn main() {
pkg.protect(); pkg.protect();
cache.resolve(true).unwrap(); cache.resolve(true).unwrap();
exit(1);
match cache.get_archives(&mut acquire_progress) { match cache.get_archives(&mut acquire_progress) {
Ok(_) => { Ok(_) => {
Runtime::new() Runtime::new()

4
src/bin/apt/apt_update/main.rs
View File

@ -1,9 +1,9 @@
use pika_unixsocket_tools::apt_update_progress_socket::AptUpdateProgressSocket;
use pika_unixsocket_tools::pika_unixsocket_tools::*;
use rust_apt::new_cache; use rust_apt::new_cache;
use rust_apt::progress::{AcquireProgress, DynAcquireProgress}; use rust_apt::progress::{AcquireProgress, DynAcquireProgress};
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use pika_unixsocket_tools::apt_update_progress_socket::AptUpdateProgressSocket;
use pika_unixsocket_tools::pika_unixsocket_tools::*;
fn main() { fn main() {
let update_cache = new_cache!().unwrap(); let update_cache = new_cache!().unwrap();

38
src/bin/gui/apt_update_page/mod.rs
View File

@ -1,12 +1,12 @@
mod process; mod process;
use pika_unixsocket_tools::pika_unixsocket_tools::*;
use crate::apt_package_row::AptPackageRow; use crate::apt_package_row::AptPackageRow;
use adw::gio::{Action, SimpleAction}; use adw::gio::{Action, SimpleAction};
use adw::prelude::*; use adw::prelude::*;
use adw::ActionRow; use adw::ActionRow;
use gtk::glib::*; use gtk::glib::*;
use gtk::*; use gtk::*;
use pika_unixsocket_tools::pika_unixsocket_tools::*;
use rust_apt::cache::*; use rust_apt::cache::*;
use rust_apt::new_cache; use rust_apt::new_cache;
use rust_apt::records::RecordField; use rust_apt::records::RecordField;
@ -51,15 +51,17 @@ pub fn apt_update_page(
let excluded_updates_vec: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::new(Vec::new())); let excluded_updates_vec: Rc<RefCell<Vec<String>>> = Rc::new(RefCell::new(Vec::new()));
thread::spawn(move || { thread::spawn(move || {
Runtime::new() Runtime::new().unwrap().block_on(start_socket_server(
.unwrap() update_percent_sender,
.block_on(start_socket_server(update_percent_sender, "/tmp/pika_apt_update_percent.sock")); "/tmp/pika_apt_update_percent.sock",
));
}); });
thread::spawn(move || { thread::spawn(move || {
Runtime::new() Runtime::new().unwrap().block_on(start_socket_server(
.unwrap() update_status_sender,
.block_on(start_socket_server(update_status_sender, "/tmp/pika_apt_update_status.sock")); "/tmp/pika_apt_update_status.sock",
));
}); });
thread::spawn(move || { thread::spawn(move || {
@ -106,7 +108,6 @@ pub fn apt_update_page(
let rows_size_group = gtk::SizeGroup::new(SizeGroupMode::Both); let rows_size_group = gtk::SizeGroup::new(SizeGroupMode::Both);
let packages_viewport = gtk::ScrolledWindow::builder() let packages_viewport = gtk::ScrolledWindow::builder()
.hscrollbar_policy(PolicyType::Never)
.vexpand(true) .vexpand(true)
.hexpand(true) .hexpand(true)
.margin_bottom(15) .margin_bottom(15)
@ -203,9 +204,11 @@ pub fn apt_update_page(
.build(); .build();
update_button.add_css_class("destructive-action"); update_button.add_css_class("destructive-action");
update_button.connect_clicked(clone!(@weak window, @strong excluded_updates_vec => move |_| { update_button.connect_clicked(
process::apt_process_update(&excluded_updates_vec.borrow(), window); clone!(@weak window, @strong excluded_updates_vec => move |_| {
})); process::apt_process_update(&excluded_updates_vec.borrow(), window);
}),
);
bottom_bar.append(&select_button); bottom_bar.append(&select_button);
bottom_bar.append(&update_button); bottom_bar.append(&update_button);
@ -220,16 +223,21 @@ pub fn apt_update_page(
thread::spawn(move || { thread::spawn(move || {
// Create upgradable list cache // Create upgradable list cache
let upgradable_cache = new_cache!().unwrap(); let upgradable_cache = new_cache!().unwrap();
// Create pack sort from upgradable_cache //
let upgradable_sort = PackageSort::default().upgradable().names(); upgradable_cache.upgrade(Upgrade::FullUpgrade).unwrap();
let mut upgradeable_iter = upgradable_cache.packages(&upgradable_sort).peekable(); upgradable_cache.resolve(true).unwrap();
let mut upgradeable_iter = upgradable_cache.get_changes(false).peekable();
while let Some(pkg) = upgradeable_iter.next() { while let Some(pkg) = upgradeable_iter.next() {
let candidate_version_pkg = pkg.candidate().unwrap(); let candidate_version_pkg = pkg.candidate().unwrap();
let package_struct = AptPackageSocket { let package_struct = AptPackageSocket {
name: pkg.name().to_string(), name: pkg.name().to_string(),
arch: pkg.arch().to_string(), arch: pkg.arch().to_string(),
installed_version: pkg.installed().unwrap().version().to_string(), installed_version: match pkg.installed() {
Some(t) => t.version().to_string(),
_ => {t!("installed_version_to_be_installed").to_string()}
},
candidate_version: candidate_version_pkg.version().to_string(), candidate_version: candidate_version_pkg.version().to_string(),
description: match candidate_version_pkg.description() { description: match candidate_version_pkg.description() {
Some(s) => s, Some(s) => s,

261
src/bin/gui/apt_update_page/process.rs
View File

@ -1,25 +1,42 @@
use rust_apt::new_cache;
use rust_apt::cache::Upgrade;
use adw::prelude::*; use adw::prelude::*;
use gtk::glib::*; use gtk::glib::*;
use gtk::*; use gtk::*;
use pika_unixsocket_tools::pika_unixsocket_tools::start_socket_server;
use pretty_bytes::converter::convert; use pretty_bytes::converter::convert;
use serde_json::{Value}; use rust_apt::cache::Upgrade;
use std::{fs::*, thread}; use rust_apt::new_cache;
use serde::Serialize;
use serde_json::Value;
use std::path::Path; use std::path::Path;
use std::process::Command; use std::process::Command;
use std::{fs::*, thread};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use pika_unixsocket_tools::pika_unixsocket_tools::start_socket_server;
struct AptChangesInfo { struct AptChangesInfo {
package_count: u64, package_count_upgrade: u64,
package_count_install: u64,
package_count_downgrade: u64,
package_count_remove: u64,
total_download_size: u64, total_download_size: u64,
total_installed_size: u64 total_installed_size: i64,
}
#[derive(Serialize)]
struct Exclusions {
exclusions: Vec<Value>,
} }
impl AptChangesInfo { impl AptChangesInfo {
fn add_package(&mut self) { fn add_upgrade(&mut self) {
self.package_count += 1; self.package_count_upgrade += 1;
}
fn add_install(&mut self) {
self.package_count_install += 1;
}
fn add_downgrade(&mut self) {
self.package_count_downgrade += 1;
}
fn add_remove(&mut self) {
self.package_count_remove += 1;
} }
fn increase_total_download_size_by(&mut self, value: u64) { fn increase_total_download_size_by(&mut self, value: u64) {
@ -27,7 +44,11 @@ impl AptChangesInfo {
} }
fn increase_total_installed_size_by(&mut self, value: u64) { fn increase_total_installed_size_by(&mut self, value: u64) {
self.total_installed_size += value; self.total_installed_size += value as i64;
}
fn decrease_total_installed_size_by(&mut self, value: u64) {
self.total_installed_size -= value as i64;
} }
} }
@ -55,41 +76,93 @@ pub fn apt_process_update(excluded_updates_vec: &Vec<String>, window: adw::Appli
excluded_updates_alert_dialog.set_default_response(Some("excluded_updates_alert_continue")); excluded_updates_alert_dialog.set_default_response(Some("excluded_updates_alert_continue"));
let excluded_updates_alert_dialog_action = gio::SimpleAction::new("excluded_updates_alert_dialog_action", None); let excluded_updates_alert_dialog_action =
gio::SimpleAction::new("excluded_updates_alert_dialog_action", None);
excluded_updates_alert_dialog_action.connect_activate(clone!(@weak window, @strong excluded_updates_vec => move |_, _| { excluded_updates_alert_dialog_action.connect_activate(
apt_confirm_window(&excluded_updates_vec, window) clone!(@weak window, @strong excluded_updates_vec => move |_, _| {
})); apt_confirm_window(&excluded_updates_vec, window)
}),
);
if excluded_updates_vec.is_empty() { if excluded_updates_vec.is_empty() {
excluded_updates_alert_dialog_action.activate(None); excluded_updates_alert_dialog_action.activate(None);
} else { } else {
excluded_updates_alert_dialog excluded_updates_alert_dialog.choose(None::<&gio::Cancellable>, move |choice| {
.choose(None::<&gio::Cancellable>, move |choice| { if choice == "excluded_updates_alert_continue" {
if choice == "excluded_updates_alert_continue" { excluded_updates_alert_dialog_action.activate(None);
excluded_updates_alert_dialog_action.activate(None); }
} });
});
} }
} }
fn apt_confirm_window(excluded_updates_vec: &Vec<String>, window: adw::ApplicationWindow) { fn apt_confirm_window(excluded_updates_vec: &Vec<String>, window: adw::ApplicationWindow) {
// Emulate Apt Full Upgrade to get transaction info // Emulate Apt Full Upgrade to get transaction info
let mut apt_changes_struct = AptChangesInfo { let mut apt_changes_struct = AptChangesInfo {
package_count: 0, package_count_upgrade: 0,
package_count_install: 0,
package_count_downgrade: 0,
package_count_remove: 0,
total_download_size: 0, total_download_size: 0,
total_installed_size: 0 total_installed_size: 0,
}; };
let apt_cache = new_cache!().unwrap(); let apt_cache = new_cache!().unwrap();
let apt_upgrade_cache = new_cache!().unwrap();
apt_cache.upgrade(Upgrade::FullUpgrade).unwrap(); apt_cache.upgrade(Upgrade::FullUpgrade).unwrap();
for change in apt_cache.get_changes(false) { for change in apt_cache.get_changes(false) {
if !excluded_updates_vec.iter().any(|e| change.name().contains(e)) { if !excluded_updates_vec
apt_changes_struct.add_package(); .iter()
.any(|e| change.name().contains(e))
{
let pkg = apt_upgrade_cache.get(change.name()).unwrap();
if change.marked_upgrade() || change.marked_install() || change.marked_downgrade() {
pkg.mark_install(true, false);
} else if change.marked_delete() {
pkg.mark_delete(false);
}
}
}
apt_upgrade_cache.resolve(true).unwrap();
println!("{}", t!("gui_changes_emu_msg_0"));
for change in apt_upgrade_cache.get_changes(false) {
if change.is_installed() {
apt_changes_struct
.decrease_total_installed_size_by(change.installed().unwrap().installed_size());
}
if change.marked_upgrade() && change.is_installed() {
println!("{}: {}", t!("gui_changes_emu_msg_upgrading"), change.name());
apt_changes_struct.add_upgrade();
apt_changes_struct.increase_total_download_size_by(change.candidate().unwrap().size()); apt_changes_struct.increase_total_download_size_by(change.candidate().unwrap().size());
apt_changes_struct.increase_total_installed_size_by(change.candidate().unwrap().installed_size()); apt_changes_struct
.increase_total_installed_size_by(change.candidate().unwrap().installed_size());
} else if change.marked_install() || change.marked_upgrade() && !change.is_installed() {
println!(
"{}: {}",
t!("gui_changes_emu_msg_installing"),
change.name()
);
apt_changes_struct.add_install();
apt_changes_struct.increase_total_download_size_by(change.candidate().unwrap().size());
apt_changes_struct
.increase_total_installed_size_by(change.candidate().unwrap().installed_size());
} else if change.marked_downgrade() {
println!(
"{}: {}",
t!("gui_changes_emu_msg_downgrading"),
change.name()
);
apt_changes_struct.add_downgrade();
apt_changes_struct.increase_total_download_size_by(change.candidate().unwrap().size());
apt_changes_struct
.increase_total_installed_size_by(change.candidate().unwrap().installed_size());
} else if change.marked_delete() {
println!("{}: {}", t!("gui_changes_emu_msg_removing"), change.name());
apt_changes_struct.add_remove();
} }
} }
@ -101,39 +174,59 @@ fn apt_confirm_window(excluded_updates_vec: &Vec<String>, window: adw::Applicati
let apt_update_dialog_badges_size_group0 = gtk::SizeGroup::new(SizeGroupMode::Both); let apt_update_dialog_badges_size_group0 = gtk::SizeGroup::new(SizeGroupMode::Both);
let apt_update_dialog_badges_size_group1 = gtk::SizeGroup::new(SizeGroupMode::Both); let apt_update_dialog_badges_size_group1 = gtk::SizeGroup::new(SizeGroupMode::Both);
apt_confirm_dialog_child_box.append( apt_confirm_dialog_child_box.append(&create_color_badge(
&create_color_badge( &t!("package_count_upgrade_badge_label"),
&t!("package_count_badge_label"), &apt_changes_struct.package_count_upgrade.to_string(),
&apt_changes_struct.package_count.to_string(), "background-accent-bg",
"background-accent-bg", &apt_update_dialog_badges_size_group,
&apt_update_dialog_badges_size_group, &apt_update_dialog_badges_size_group0,
&apt_update_dialog_badges_size_group0, &apt_update_dialog_badges_size_group1,
&apt_update_dialog_badges_size_group1 ));
)
);
apt_confirm_dialog_child_box.append( apt_confirm_dialog_child_box.append(&create_color_badge(
&create_color_badge( &t!("package_count_install_badge_label"),
&t!("total_download_size_badge_label"), &apt_changes_struct.package_count_install.to_string(),
&convert(apt_changes_struct.total_download_size as f64), "background-accent-bg",
"background-accent-bg", &apt_update_dialog_badges_size_group,
&apt_update_dialog_badges_size_group, &apt_update_dialog_badges_size_group0,
&apt_update_dialog_badges_size_group0, &apt_update_dialog_badges_size_group1,
&apt_update_dialog_badges_size_group1 ));
)
);
apt_confirm_dialog_child_box.append(&create_color_badge(
&t!("package_count_downgrade_badge_label"),
&apt_changes_struct.package_count_downgrade.to_string(),
"background-accent-bg",
&apt_update_dialog_badges_size_group,
&apt_update_dialog_badges_size_group0,
&apt_update_dialog_badges_size_group1,
));
apt_confirm_dialog_child_box.append( apt_confirm_dialog_child_box.append(&create_color_badge(
&create_color_badge( &t!("package_count_remove_badge_label"),
&t!("total_installed_size_badge_label"), &apt_changes_struct.package_count_remove.to_string(),
&convert(apt_changes_struct.total_installed_size as f64), "background-accent-bg",
"background-accent-bg", &apt_update_dialog_badges_size_group,
&apt_update_dialog_badges_size_group, &apt_update_dialog_badges_size_group0,
&apt_update_dialog_badges_size_group0, &apt_update_dialog_badges_size_group1,
&apt_update_dialog_badges_size_group1 ));
)
); apt_confirm_dialog_child_box.append(&create_color_badge(
&t!("total_download_size_badge_label"),
&convert(apt_changes_struct.total_download_size as f64),
"background-accent-bg",
&apt_update_dialog_badges_size_group,
&apt_update_dialog_badges_size_group0,
&apt_update_dialog_badges_size_group1,
));
apt_confirm_dialog_child_box.append(&create_color_badge(
&t!("total_installed_size_badge_label"),
&convert(apt_changes_struct.total_installed_size as f64),
"background-accent-bg",
&apt_update_dialog_badges_size_group,
&apt_update_dialog_badges_size_group0,
&apt_update_dialog_badges_size_group1,
));
let apt_confirm_dialog = adw::MessageDialog::builder() let apt_confirm_dialog = adw::MessageDialog::builder()
.transient_for(&window) .transient_for(&window)
@ -159,26 +252,32 @@ fn apt_confirm_window(excluded_updates_vec: &Vec<String>, window: adw::Applicati
apt_confirm_dialog.set_default_response(Some("apt_confirm_dialog_confirm")); apt_confirm_dialog.set_default_response(Some("apt_confirm_dialog_confirm"));
if !excluded_updates_vec.is_empty() { if !excluded_updates_vec.is_empty() {
let excluded_updates_values: Vec<Value> = excluded_updates_vec.into_iter() let exclusions_array = Exclusions {
.map(|i| serde_json::from_str(format!("{{\"package\":\"{}\"}}", i).as_str())) exclusions: excluded_updates_vec
.collect::<Result<Vec<Value>,_>>() .into_iter()
.unwrap(); .map(|i| serde_json::from_str(format!("{{\"package\":\"{}\"}}", i).as_str()))
.collect::<Result<Vec<Value>, _>>()
let excluded_updates_values_json = Value::Array(excluded_updates_values); .unwrap(),
};
let json_file_path = "/tmp/pika-apt-exclusions.json"; let json_file_path = "/tmp/pika-apt-exclusions.json";
if Path::new(json_file_path).exists() { if Path::new(json_file_path).exists() {
std::fs::remove_file(json_file_path).expect("Failed to remove old json file"); std::fs::remove_file(json_file_path).expect("Failed to remove old json file");
} }
std::fs::write(
std::fs::write(json_file_path, serde_json::to_string_pretty(&excluded_updates_values_json).unwrap()).expect("Failed to write to json file"); json_file_path,
serde_json::to_string_pretty(&exclusions_array).unwrap(),
)
.expect("Failed to write to json file");
} }
//apt_confirm_dialog.present(); apt_confirm_dialog.choose(None::<&gio::Cancellable>, move |choice| {
apt_full_upgrade_from_socket(window); if choice == "apt_confirm_dialog_confirm" {
apt_full_upgrade_from_socket(window);
}
});
} }
fn apt_full_upgrade_from_socket(window: adw::ApplicationWindow) { fn apt_full_upgrade_from_socket(window: adw::ApplicationWindow) {
@ -189,15 +288,17 @@ fn apt_full_upgrade_from_socket(window: adw::ApplicationWindow) {
let upgrade_status_sender_clone0 = upgrade_status_sender.clone(); let upgrade_status_sender_clone0 = upgrade_status_sender.clone();
thread::spawn(move || { thread::spawn(move || {
Runtime::new() Runtime::new().unwrap().block_on(start_socket_server(
.unwrap() upgrade_percent_sender,
.block_on(start_socket_server(upgrade_percent_sender, "/tmp/pika_apt_upgrade_percent.sock")); "/tmp/pika_apt_upgrade_percent.sock",
));
}); });
thread::spawn(move || { thread::spawn(move || {
Runtime::new() Runtime::new().unwrap().block_on(start_socket_server(
.unwrap() upgrade_status_sender,
.block_on(start_socket_server(upgrade_status_sender, "/tmp/pika_apt_upgrade_status.sock")); "/tmp/pika_apt_upgrade_status.sock",
));
}); });
thread::spawn(move || { thread::spawn(move || {
@ -206,11 +307,9 @@ fn apt_full_upgrade_from_socket(window: adw::ApplicationWindow) {
.status() .status()
.unwrap(); .unwrap();
match apt_upgrade_command.code().unwrap() { match apt_upgrade_command.code().unwrap() {
0 => { 0 => upgrade_status_sender_clone0
upgrade_status_sender_clone0 .send_blocking("FN_OVERRIDE_SUCCESSFUL".to_owned())
.send_blocking("FN_OVERRIDE_SUCCESSFUL".to_owned()) .unwrap(),
.unwrap()
}
53 => {} 53 => {}
_ => { _ => {
upgrade_status_sender_clone0 upgrade_status_sender_clone0
@ -275,10 +374,10 @@ fn apt_full_upgrade_from_socket(window: adw::ApplicationWindow) {
apt_upgrade_dialog.close(); apt_upgrade_dialog.close();
} }
"FN_OVERRIDE_FAILED" => { "FN_OVERRIDE_FAILED" => {
apt_upgrade_dialog_child_box.set_visible(false); apt_upgrade_dialog_child_box.set_visible(false);
apt_upgrade_dialog.set_title(Some(&t!("apt_upgrade_dialog_status_failed").to_string())); apt_upgrade_dialog.set_title(Some(&t!("apt_upgrade_dialog_status_failed").to_string()));
apt_upgrade_dialog.set_response_enabled("apt_upgrade_dialog_ok", true); apt_upgrade_dialog.set_response_enabled("apt_upgrade_dialog_ok", true);
} }
_ => apt_upgrade_dialog.set_body(&state) _ => apt_upgrade_dialog.set_body(&state)
} }
} }

28
src/lib/apt_install_progress_socket/mod.rs
View File

@ -2,7 +2,7 @@ use crate::pika_unixsocket_tools::*;
use rust_apt::progress::{DynAcquireProgress, DynInstallProgress}; use rust_apt::progress::{DynAcquireProgress, DynInstallProgress};
use rust_apt::raw::{AcqTextStatus, ItemDesc, PkgAcquire}; use rust_apt::raw::{AcqTextStatus, ItemDesc, PkgAcquire};
use std::process::exit; use std::process::exit;
use tokio::io::{AsyncWriteExt}; use tokio::io::AsyncWriteExt;
use tokio::net::UnixStream; use tokio::net::UnixStream;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
@ -36,32 +36,20 @@ impl<'a> DynInstallProgress for AptInstallProgressSocket<'a> {
pkgname: String, pkgname: String,
steps_done: u64, steps_done: u64,
total_steps: u64, total_steps: u64,
action: String action: String,
) { ) {
let progress_percent: f32 = let progress_percent: f32 = (steps_done as f32 * 100.0) / total_steps as f32;
(steps_done as f32 * 100.0) / total_steps as f32;
Runtime::new().unwrap().block_on(send_progress_percent( Runtime::new().unwrap().block_on(send_progress_percent(
progress_percent, progress_percent,
self.percent_socket_path, self.percent_socket_path,
)); ));
Runtime::new().unwrap().block_on(send_progress_status( Runtime::new()
&action, .unwrap()
self.status_socket_path, .block_on(send_progress_status(&action, self.status_socket_path));
));
} }
fn error( fn error(&mut self, pkgname: String, steps_done: u64, total_steps: u64, error: String) {
&mut self, let message = format!("dpkg failure on {}: {}", pkgname, error);
pkgname: String,
steps_done: u64,
total_steps: u64,
error: String
) {
let message = format!(
"dpkg failure on {}: {}",
pkgname,
error
);
eprintln!("{}", &message); eprintln!("{}", &message);
Runtime::new() Runtime::new()
.unwrap() .unwrap()

4
src/lib/apt_update_progress_socket/mod.rs
View File

@ -1,8 +1,8 @@
use crate::pika_unixsocket_tools::*; use crate::pika_unixsocket_tools::*;
use rust_apt::progress::{DynAcquireProgress}; use rust_apt::progress::DynAcquireProgress;
use rust_apt::raw::{AcqTextStatus, ItemDesc, PkgAcquire}; use rust_apt::raw::{AcqTextStatus, ItemDesc, PkgAcquire};
use std::process::exit; use std::process::exit;
use tokio::io::{AsyncWriteExt}; use tokio::io::AsyncWriteExt;
use tokio::net::UnixStream; use tokio::net::UnixStream;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;

2
src/lib/lib.rs
View File

@ -1,3 +1,3 @@
pub mod pika_unixsocket_tools;
pub mod apt_install_progress_socket; pub mod apt_install_progress_socket;
pub mod apt_update_progress_socket; pub mod apt_update_progress_socket;
pub mod pika_unixsocket_tools;