leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: more pedantic clippy suggestions

Browse source
This commit is contained in:
Cheong Lau 2025-10-26 16:20:51 +10:00
parent 5863671217
commit 5f729829d7
17 changed files with 1063 additions and 998 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/mounter/gvfs.rs
View file

@ -100,9 +100,10 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result<Vec<tab::Item>, String> {
let metadata = if !force_dir && !info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE) {
let mtime = info.attribute_uint64(gio::FILE_ATTRIBUTE_TIME_MODIFIED);
let is_dir = matches!(info.file_type(), gio::FileType::Directory);
let size_opt = match is_dir {
true => None,
false => Some(info.size() as u64),
let size_opt = if is_dir {
None
} else {
Some(info.size() as u64)
};
let mut children_opt = None;
@ -114,7 +115,7 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result<Vec<tab::Item>, String> {
children_opt = Some(entries.count());
}
Err(err) => {
log::warn!("failed to read directory {:?}: {}", path, err);
log::warn!("failed to read directory {}: {}", path.display(), err);
children_opt = Some(0);
}
}
@ -287,7 +288,7 @@ impl Item {
self.name.clone()
}
pub fn is_mounted(&self) -> bool {
pub const fn is_mounted(&self) -> bool {
self.is_mounted
}
@ -395,7 +396,7 @@ impl Gvfs {
continue;
}
log::info!("mount {}", name);
log::info!("mount {name}");
//TODO: do not use name as a URI for mount_op
let mount_op = mount_op(name.to_string(), event_tx.clone());
let event_tx = event_tx.clone();
@ -406,7 +407,7 @@ impl Gvfs {
Some(&mount_op),
gio::Cancellable::NONE,
move |res| {
log::info!("mount {}: result {:?}", name, res);
log::info!("mount {name}: result {res:?}");
event_tx.send(Event::MountResult(mounter_item, match res {
Ok(()) => {
_ = complete_tx.send(Ok(()));
@ -416,7 +417,7 @@ impl Gvfs {
_ = complete_tx.send(Err(anyhow::anyhow!("{err:?}")));
match err.kind::<gio::IOErrorEnum>() {
Some(gio::IOErrorEnum::FailedHandled) => Ok(false),
_ => Err(format!("{}", err))
_ => Err(format!("{err}"))
}}
})).unwrap();
},
@ -433,7 +434,7 @@ impl Gvfs {
Some(&mount_op),
gio::Cancellable::NONE,
move |res| {
log::info!("network drive {}: result {:?}", uri, res);
log::info!("network drive {uri}: result {res:?}");
event_tx.send(Event::NetworkResult(uri, match res {
Ok(()) => {
_ = result_tx.send(Ok(()));
@ -442,7 +443,7 @@ impl Gvfs {
_ = result_tx.send(Err(anyhow::anyhow!("{err:?}")));
match err.kind::<gio::IOErrorEnum>() {
Some(gio::IOErrorEnum::FailedHandled) => Ok(false),
_ => Err(format!("{}", err))
_ => Err(format!("{err}"))
}}
})).unwrap();
}
@ -475,7 +476,7 @@ impl Gvfs {
Some(&mount_op),
gio::Cancellable::NONE,
move |res| {
log::info!("network scan mounted {}: result {:?}", uri, res);
log::info!("network scan mounted {uri}: result {res:?}");
// FIXME sometimes a uri can be mounted and then not recognized as mounted...
// seems to be related to uri with a path
items_tx.blocking_send(network_scan(&original_uri, sizes)).unwrap();
@ -485,7 +486,7 @@ impl Gvfs {
},
Err(err) => match err.kind::<gio::IOErrorEnum>() {
Some(gio::IOErrorEnum::FailedHandled) => Ok(false),
_ => Err(format!("{}", err))
_ => Err(format!("{err}"))
}
})).unwrap();
}
@ -509,25 +510,25 @@ impl Gvfs {
}
if MountExt::can_eject(&mount) {
log::info!("eject {}", name);
log::info!("eject {name}");
MountExt::eject_with_operation(
&mount,
gio::MountUnmountFlags::NONE,
gio::MountOperation::NONE,
gio::Cancellable::NONE,
move |result| {
log::info!("eject {}: result {:?}", name, result);
log::info!("eject {name}: result {result:?}");
},
);
} else {
log::info!("unmount {}", name);
log::info!("unmount {name}");
MountExt::unmount_with_operation(
&mount,
gio::MountUnmountFlags::NONE,
gio::MountOperation::NONE,
gio::Cancellable::NONE,
move |result| {
log::info!("unmount {}: result {:?}", name, result);
log::info!("unmount {name}: result {result:?}");
},
);
}
@ -536,7 +537,7 @@ impl Gvfs {
}
}
});
main_loop.run()
main_loop.run();
});
Self {
command_tx,
@ -615,7 +616,7 @@ impl Mounter for Gvfs {
match event {
Event::Changed => command_tx.send(Cmd::Rescan).unwrap(),
Event::Items(items) => {
output.send(MounterMessage::Items(items)).await.unwrap()
output.send(MounterMessage::Items(items)).await.unwrap();
}
Event::MountResult(item, res) => output
.send(MounterMessage::MountResult(item, res))