Skip to content

Commit

Permalink
rename UDisks2Message to Message
Browse files Browse the repository at this point in the history
  • Loading branch information
@zd4y
zd4y committed Mar 28, 2024
1 parent d2d8b8d commit 32b1330
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
26 changes: 13 additions & 13 deletions src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ pub struct App {
exit: bool,
exit_mount_point: Option<String>,
print_on_exit: bool,
sender: Sender<UDisks2Message>,
receiver: Receiver<UDisks2Message>,
sender: Sender<Message>,
receiver: Receiver<Message>,
runtime: Runtime,
tasks: VecDeque<JoinHandle<Result<()>>>,
}
Expand All @@ -57,7 +57,7 @@ pub struct GuiDevice {
state: DeviceState,
}

pub enum UDisks2Message {
pub enum Message {
Mounted(usize, String),
Unmounted(usize),
Locked(usize),
Expand Down Expand Up @@ -228,42 +228,42 @@ 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;
self.exit_mount_point = None;
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!(
Expand All @@ -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 {}",
Expand All @@ -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(())
Expand Down Expand Up @@ -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(())
});
Expand Down
22 changes: 11 additions & 11 deletions src/device.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};

Expand All @@ -29,7 +29,7 @@ impl Device {
})
}

pub async fn mount(&self, idx: usize, passphrase: Option<String>) -> Result<UDisks2Message> {
pub async fn mount(&self, idx: usize, passphrase: Option<String>) -> Result<Message> {
let object_path = if let BlockDeviceKind::Encrypted = self.block_device.kind {
let proxy = EncryptedProxy::builder(self.client.conn())
.path(&self.block_device.path)?
Expand All @@ -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()
Expand All @@ -60,25 +60,25 @@ 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<UDisks2Message> {
pub async fn unmount(&self, idx: usize) -> Result<Message> {
match self.block_device.kind {
BlockDeviceKind::Filesystem => {
let proxy = FilesystemProxy::builder(self.client.conn())
.path(&self.block_device.path)?
.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 => {
Expand All @@ -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))
}
}
}
Expand Down

0 comments on commit 32b1330

Please sign in to comment.