From 32b1330607e87356c1d5e62a1ddd41d9b7dec755 Mon Sep 17 00:00:00 2001 From: zd4y <59004538+zd4y@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:46:39 -0500 Subject: [PATCH] rename UDisks2Message to Message --- src/app.rs | 26 +++++++++++++------------- src/device.rs | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/app.rs b/src/app.rs index 3d71bdb..04b6348 100644 --- a/src/app.rs +++ b/src/app.rs @@ -43,8 +43,8 @@ pub struct App { exit: bool, exit_mount_point: Option, print_on_exit: bool, - sender: Sender, - receiver: Receiver, + sender: Sender, + receiver: Receiver, runtime: Runtime, tasks: VecDeque>>, } @@ -57,7 +57,7 @@ pub struct GuiDevice { state: DeviceState, } -pub enum UDisks2Message { +pub enum Message { Mounted(usize, String), Unmounted(usize), Locked(usize), @@ -228,9 +228,9 @@ impl App { } } - fn handle_udisks_message(&mut self, msg: UDisks2Message) -> Result<()> { + fn handle_udisks_message(&mut self, msg: Message) -> Result<()> { match msg { - UDisks2Message::Devices(devices) => { + Message::Devices(devices) => { self.gui_devices = devices; self.selected_device_index = 0; self.state_msg = None; @@ -238,32 +238,32 @@ impl App { self.print_on_exit = false; Ok(()) } - UDisks2Message::Mounted(idx, mount_point) => { + Message::Mounted(idx, mount_point) => { let device = &mut self.gui_devices[idx]; device.state = DeviceState::Mounted; self.state_msg = Some(format!("Mounted {} at {}", device.name, mount_point)); self.exit_mount_point = Some(mount_point); Ok(()) } - UDisks2Message::Unmounted(idx) => { + Message::Unmounted(idx) => { let device = &mut self.gui_devices[idx]; device.state = DeviceState::Unmounted; self.state_msg = Some(format!("Unmounted {}", device.name)); Ok(()) } - UDisks2Message::Locked(idx) => { + Message::Locked(idx) => { let device = &mut self.gui_devices[idx]; device.state = DeviceState::Locked; self.state_msg = Some(format!("Locked {}", device.name)); Ok(()) } - UDisks2Message::UnmountedAndLocked(idx) => { + Message::UnmountedAndLocked(idx) => { let device = &mut self.gui_devices[idx]; device.state = DeviceState::Locked; self.state_msg = Some(format!("Unmounted and locked {}", device.name)); Ok(()) } - UDisks2Message::UnlockedAndMounted(idx, mount_point) => { + Message::UnlockedAndMounted(idx, mount_point) => { let device = &mut self.gui_devices[idx]; device.state = DeviceState::Mounted; self.state_msg = Some(format!( @@ -273,7 +273,7 @@ impl App { self.exit_mount_point = Some(mount_point); Ok(()) } - UDisks2Message::AlreadyMounted(idx, mount_point) => { + Message::AlreadyMounted(idx, mount_point) => { let device = &self.gui_devices[idx]; self.state_msg = Some(format!( "Already mounted {} at {}", @@ -282,7 +282,7 @@ impl App { self.exit_mount_point = Some(mount_point); Ok(()) } - UDisks2Message::AlreadyUnmounted(idx) => { + Message::AlreadyUnmounted(idx) => { let device = &self.gui_devices[idx]; self.state_msg = Some(format!("Already unmounted {}", device.name)); Ok(()) @@ -359,7 +359,7 @@ impl App { let mut devices = devices_lock.write().await; devices.clear(); *devices = new_devices; - sender.send(UDisks2Message::Devices(gui_devices)).await?; + sender.send(Message::Devices(gui_devices)).await?; Ok(()) }); diff --git a/src/device.rs b/src/device.rs index 49ce34d..4d22c5f 100644 --- a/src/device.rs +++ b/src/device.rs @@ -2,7 +2,7 @@ use color_eyre::Result; use humansize::{format_size, DECIMAL}; use crate::{ - app::UDisks2Message, + app::Message, udisks2::{BlockDevice, BlockDeviceKind, BlockProxy, Client, EncryptedProxy, FilesystemProxy}, }; @@ -29,7 +29,7 @@ impl Device { }) } - pub async fn mount(&self, idx: usize, passphrase: Option) -> Result { + pub async fn mount(&self, idx: usize, passphrase: Option) -> Result { let object_path = if let BlockDeviceKind::Encrypted = self.block_device.kind { let proxy = EncryptedProxy::builder(self.client.conn()) .path(&self.block_device.path)? @@ -48,7 +48,7 @@ impl Device { .build() .await?; let mount_point = proxy.mount(Default::default()).await?; - return Ok(UDisks2Message::UnlockedAndMounted(idx, mount_point)); + return Ok(Message::UnlockedAndMounted(idx, mount_point)); } } else { self.block_device.path.clone() @@ -60,14 +60,14 @@ impl Device { .await?; if let Some(mount_point) = proxy.mount_points().await?.first() { let mount_point = dbus_u8_array_to_str(mount_point)?.to_string(); - Ok(UDisks2Message::AlreadyMounted(idx, mount_point)) + Ok(Message::AlreadyMounted(idx, mount_point)) } else { let mount_point = proxy.mount(Default::default()).await?; - Ok(UDisks2Message::Mounted(idx, mount_point)) + Ok(Message::Mounted(idx, mount_point)) } } - pub async fn unmount(&self, idx: usize) -> Result { + pub async fn unmount(&self, idx: usize) -> Result { match self.block_device.kind { BlockDeviceKind::Filesystem => { let proxy = FilesystemProxy::builder(self.client.conn()) @@ -75,10 +75,10 @@ impl Device { .build() .await?; if proxy.mount_points().await?.is_empty() { - Ok(UDisks2Message::AlreadyUnmounted(idx)) + Ok(Message::AlreadyUnmounted(idx)) } else { proxy.unmount(Default::default()).await?; - Ok(UDisks2Message::Unmounted(idx)) + Ok(Message::Unmounted(idx)) } } BlockDeviceKind::Encrypted => { @@ -95,13 +95,13 @@ impl Device { .await?; if filesystem_proxy.mount_points().await?.is_empty() { proxy.lock(Default::default()).await?; - return Ok(UDisks2Message::Locked(idx)); + return Ok(Message::Locked(idx)); } filesystem_proxy.unmount(Default::default()).await?; proxy.lock(Default::default()).await?; - Ok(UDisks2Message::UnmountedAndLocked(idx)) + Ok(Message::UnmountedAndLocked(idx)) } else { - Ok(UDisks2Message::AlreadyUnmounted(idx)) + Ok(Message::AlreadyUnmounted(idx)) } } }