diff --git a/src/mounter/gvfs.rs b/src/mounter/gvfs.rs index e96d484..801a93b 100644 --- a/src/mounter/gvfs.rs +++ b/src/mounter/gvfs.rs @@ -3,13 +3,7 @@ use cosmic::{ widget, Task, }; use gio::{glib, prelude::*}; -use std::{ - any::TypeId, - cell::Cell, - future::pending, - path::{Path, PathBuf}, - sync::Arc, -}; +use std::{any::TypeId, cell::Cell, future::pending, path::PathBuf, sync::Arc}; use tokio::sync::{mpsc, Mutex}; use super::{Mounter, MounterAuth, MounterItem, MounterItems, MounterMessage}; @@ -205,7 +199,6 @@ enum Cmd { NetworkScan( String, IconSizes, - Option, mpsc::Sender, String>>, ), Unmount(MounterItem), @@ -404,7 +397,7 @@ impl Gvfs { } ); } - Cmd::NetworkScan(uri, sizes, path, items_tx) => { + Cmd::NetworkScan(uri, sizes, items_tx) => { let file = gio::File::for_uri(&uri); let needs_mount = match file.find_enclosing_mount(gio::Cancellable::NONE) { Ok(_) => false, @@ -527,20 +520,10 @@ impl Mounter for Gvfs { ) } - fn network_scan( - &self, - uri: &str, - sizes: IconSizes, - path: Option<&Path>, - ) -> Option, String>> { + fn network_scan(&self, uri: &str, sizes: IconSizes) -> Option, String>> { let (items_tx, mut items_rx) = mpsc::channel(1); self.command_tx - .send(Cmd::NetworkScan( - uri.to_string(), - sizes, - path.map(|p| p.to_owned()), - items_tx, - )) + .send(Cmd::NetworkScan(uri.to_string(), sizes, items_tx)) .unwrap(); items_rx.blocking_recv() } diff --git a/src/mounter/mod.rs b/src/mounter/mod.rs index eb0d89d..9c0a5a3 100644 --- a/src/mounter/mod.rs +++ b/src/mounter/mod.rs @@ -1,11 +1,6 @@ use cosmic::{iced::Subscription, widget, Task}; use once_cell::sync::Lazy; -use std::{ - collections::BTreeMap, - fmt, - path::{Path, PathBuf}, - sync::Arc, -}; +use std::{collections::BTreeMap, fmt, path::PathBuf, sync::Arc}; use tokio::sync::mpsc; use crate::{config::IconSizes, tab}; @@ -108,12 +103,7 @@ pub trait Mounter: Send + Sync { //TODO: send result fn mount(&self, item: MounterItem) -> Task<()>; fn network_drive(&self, uri: String) -> Task<()>; - fn network_scan( - &self, - uri: &str, - sizes: IconSizes, - path: Option<&Path>, - ) -> Option, String>>; + fn network_scan(&self, uri: &str, sizes: IconSizes) -> Option, String>>; fn unmount(&self, item: MounterItem) -> Task<()>; fn subscription(&self) -> Subscription; } diff --git a/src/tab.rs b/src/tab.rs index 0617ca0..742ade9 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -1205,9 +1205,9 @@ pub fn scan_recents(sizes: IconSizes) -> Vec { recents.into_iter().take(50).map(|(item, _)| item).collect() } -pub fn scan_network(uri: &str, sizes: IconSizes, path: Option<&Path>) -> Vec { +pub fn scan_network(uri: &str, sizes: IconSizes) -> Vec { for (_key, mounter) in MOUNTERS.iter() { - match mounter.network_scan(uri, sizes, path) { + match mounter.network_scan(uri, sizes) { Some(Ok(items)) => return items, Some(Err(err)) => { log::warn!("failed to scan {:?}: {}", uri, err); @@ -1445,7 +1445,7 @@ impl Location { } Self::Trash => scan_trash(sizes), Self::Recents => scan_recents(sizes), - Self::Network(uri, _, path) => scan_network(uri, sizes, path.as_deref()), + Self::Network(uri, _, _) => scan_network(uri, sizes), }; let parent_item_opt = match self.path_opt() { Some(path) => match item_from_path(path, sizes) {